Skip to content

Commit 1df6c42

Browse files
authored
Merge pull request #379 from hubmapconsortium/yuanzhou/dependency-version-update
Yuanzhou/dependency version update
2 parents 41c664b + 2bcc95b commit 1df6c42

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

docker/docker-compose.development.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ services:
99
# Will also need to use the 'git+https://github.com/hubmapconsortium/commons.git@${COMMONS_BRANCH}#egg=hubmap-commons'
1010
# in src/requirements.txt accordingly
1111
# args:
12-
# # The commons github branch to be used during image build (default to master if not set or null)
13-
# - COMMONS_BRANCH=${COMMONS_BRANCH:-master}
12+
# # The commons github branch to be used during image build (default to main if not set or null)
13+
# - COMMONS_BRANCH=${COMMONS_BRANCH:-main}
1414
# Build the image with name and tag
1515
# Exit with an error message containing err if unset or empty in the environment
1616
image: hubmap/entity-api:${ENTITY_API_VERSION:?err}

src/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ PyYAML==5.4.1
2525

2626
# Use the published package from PyPI as default
2727
# Use the branch name of commons from github for testing new changes made in commons from different branch
28-
# Default is master branch specified in docker-compose.development.yml if not set
28+
# Default is main branch specified in docker-compose.development.yml if not set
2929
# git+https://github.com/hubmapconsortium/commons.git@${COMMONS_BRANCH}#egg=hubmap-commons
30-
hubmap-commons==2.0.14
30+
hubmap-commons==2.0.15
3131

3232
# For unit test
3333
nose2==0.10.0

0 commit comments

Comments
 (0)