From a76a29420a168d24182a7ffcfb57f5e36399548f Mon Sep 17 00:00:00 2001
From: Rajan Mudambi <11376379+rmudambi@users.noreply.github.com>
Date: Fri, 2 Aug 2024 11:27:25 -0700
Subject: [PATCH] don't install dependencies inside package directory (#355)

---
 .github/workflows/build.yml | 22 ++++------------------
 CHANGELOG.rst               |  4 ++++
 pyproject.toml              |  9 ---------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a02000d3..fdaac411 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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
@@ -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        
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 78dd8399..01981b94 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -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
diff --git a/pyproject.toml b/pyproject.toml
index cf9f2461..d2bb45e4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -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"]