Skip to content

Commit

Permalink
don't install dependencies inside package directory (#355)
Browse files Browse the repository at this point in the history
  • Loading branch information
rmudambi authored Aug 2, 2024
1 parent b34fbe0 commit a76a294
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 27 deletions.
22 changes: 4 additions & 18 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@ jobs:
else
echo "upstream_vivarium_exist=false" >> $GITHUB_ENV
fi
- name: check for upstream vivarium_public_health
run: |
if git ls-remote --exit-code --heads https://github.com/ihmeuw/vivarium_public_health.git ${branch_name} == "0"; then
echo "upstream_vivarium_public_health_exist=true" >> $GITHUB_ENV
else
echo "upstream_vivarium_public_health_exist=false" >> $GITHUB_ENV
fi
- name: check for upstream gbd_mapping
run: |
if git ls-remote --exit-code --heads https://github.com/ihmeuw/gbd_mapping.git ${branch_name} == "0"; then
Expand All @@ -74,27 +67,20 @@ jobs:
if: env.upstream_vivarium_exist == 'true'
run: |
echo "Cloning vivarium upstream branch: ${branch_name}"
pushd ..
git clone --branch=${branch_name} https://github.com/ihmeuw/vivarium.git
pushd vivarium
pip install .
popd
- name: Retrieve upstream vivarium_public_health
if: env.upstream_vivarium_public_health_exist == 'true'
run: |
echo "Cloning vivarium_public_health upstream branch: ${branch_name}"
git clone --branch=${branch_name} https://github.com/ihmeuw/vivarium_public_health.git
pushd vivarium_public_health
pip install .
popd
popd && popd
- name: Retrieve upstream gbd_mapping
if: env.upstream_gbd_mapping_exist == 'true'
run: |
echo "Cloning upstream gbd_mapping branch: ${branch_name}"
pushd ..
git clone --branch=${branch_name} https://github.com/ihmeuw/gbd_mapping.git
pushd gbd_mapping
pip install .
popd
popd && popd
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
**5.0.5 - 08/02/24**

- Fix CI bug when installing upstream dependencies

**5.0.4 - 07/16/24**

- Fix bug in processing locations when pulling disability weights
Expand Down
9 changes: 0 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
[tool.black]
line_length = 94
exclude = '''
/(
vivarium
| vivarium_public_health
| gbd_mapping
)/
'''

[tool.isort]
profile = "black"
skip = ["vivarium", "vivarium_public_health", "gbd_mapping"]
known_third_party = ["vivarium", "vivarium_public_health", "gbd_mapping"]

0 comments on commit a76a294

Please sign in to comment.