vivarium-public-health 3.0.1__tar.gz → 3.0.2__tar.gz

{vivarium_public_health-3.0.1 → vivarium_public_health-3.0.2}/.github/workflows/build.yml

@@ -41,21 +41,13 @@ jobs:
         run: |
           pip install .[dev]
           git checkout ${branch_name}
-      - name: check for upstream branch
+      - name: check for dependency branches and install if needed
         run: |
-          sh get_upstream_branch.sh ${branch_name}
+          sh install_dependency_branch.sh layered_config_tree ${branch_name}
+          sh install_dependency_branch.sh vivarium ${branch_name}
       - name: print environment values
         run: |
           cat $GITHUB_ENV
-      - name: Retrieve vivarium branch
-        if: env.vivarium_branch_name != 'main'
-        run: |
-          echo "Cloning upstream branch: ${vivarium_branch_name}"
-          pushd ..
-          git clone --branch=${vivarium_branch_name} https://github.com/ihmeuw/vivarium.git
-          pushd vivarium
-          pip install .
-          popd && popd
       - name: Lint
         run: |
           pip install black==22.3.0 isort

{vivarium_public_health-3.0.1 → vivarium_public_health-3.0.2}/CHANGELOG.rst

@@ -1,3 +1,7 @@
+**3.0.12- 08/19/24**
+
+ - Parameterize the script to find matching dependency branches
+
 **3.0.1 - 08/19/24**
 
  - Fix bug in build script when the upstream vivarium branch should be main

{vivarium_public_health-3.0.1/src/vivarium_public_health.egg-info → vivarium_public_health-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vivarium_public_health
-Version: 3.0.1
+Version: 3.0.2
 Summary: Components for modelling diseases, risks, and interventions with ``vivarium``
 Home-page: https://github.com/ihmeuw/vivarium_public_health
 Author: The vivarium developers

vivarium_public_health-3.0.2/install_dependency_branch.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Define variables
+dependency_name=$1
+branch_name=$2
+
+root_dir=$(pwd)
+dependency_branch_name='main'
+branch_name_to_check=${branch_name}
+iterations=0
+
+while [ "$branch_name_to_check" != "$dependency_branch_name" ] && [ $iterations -lt 20 ]
+do
+  echo "Checking for ${dependency_name} branch: '${branch_name_to_check}'"
+  if
+    git ls-remote --exit-code \
+    --heads https://github.com/ihmeuw/"${dependency_name}".git "${branch_name_to_check}" == "0"
+  then
+    dependency_branch_name=${branch_name_to_check}
+    echo "Found matching branch: ${dependency_branch_name}"
+  else
+    echo "Could not find ${dependency_name} branch '${branch_name_to_check}'. Finding parent branch."
+    branch_name_to_check="$( \
+      git show-branch -a \
+      | grep '\*' \
+      | grep -v "${branch_name_to_check}" \
+      | head -n1 \
+      | sed 's/[^\[]*//' \
+      | awk 'match($0, /\[[a-zA-Z0-9\/.-]+\]/) { print substr( $0, RSTART+1, RLENGTH-2 )}' \
+      | sed 's/^origin\///' \
+    )"
+    if [ -z "$branch_name_to_check" ]; then
+      echo "Could not find parent branch. Will use released version of ${dependency_name}."
+      branch_name_to_check="main"
+    fi
+    echo "Checking out branch: ${branch_name_to_check}"
+    git checkout "${branch_name_to_check}"
+    iterations=$((iterations+1))
+  fi
+  done
+  git checkout "${branch_name}"
+
+echo "${dependency_name}_branch_name=${dependency_branch_name}" >> "$GITHUB_ENV"
+
+if [ "$dependency_branch_name" != "main" ]; then
+  echo "Cloning ${dependency_name} branch: ${dependency_branch_name}"
+  cd ..
+  git clone --branch="${dependency_branch_name}" https://github.com/ihmeuw/"${dependency_name}".git
+  cd "${dependency_name}" || exit
+  pip install .
+  cd "$root_dir" || exit
+fi

vivarium_public_health-3.0.2/src/vivarium_public_health/_version.py

@@ -0,0 +1 @@
+__version__ = "3.0.2"

{vivarium_public_health-3.0.1 → vivarium_public_health-3.0.2/src/vivarium_public_health.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vivarium_public_health
-Version: 3.0.1
+Version: 3.0.2
 Summary: Components for modelling diseases, risks, and interventions with ``vivarium``
 Home-page: https://github.com/ihmeuw/vivarium_public_health
 Author: The vivarium developers

{vivarium_public_health-3.0.1 → vivarium_public_health-3.0.2}/src/vivarium_public_health.egg-info/SOURCES.txt

@@ -13,7 +13,7 @@ LICENSE.txt
 MANIFEST.in
 Makefile
 README.rst
-get_upstream_branch.sh
+install_dependency_branch.sh
 pyproject.toml
 setup.py
 tox.ini

vivarium_public_health-3.0.1/get_upstream_branch.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# Define variables
-branch_name=$1
-
-vivarium_branch_name='main'
-branch_name_to_check=${branch_name}
-iterations=0
-
-while [ "$branch_name_to_check" != "$vivarium_branch_name" ] && [ $iterations -lt 20 ]
-do
-  echo "Checking for vivarium branch: '${branch_name_to_check}'"
-  if
-    git ls-remote --exit-code \
-    --heads https://github.com/ihmeuw/vivarium.git ${branch_name_to_check} == "0"
-  then
-    vivarium_branch_name=${branch_name_to_check}
-    echo "Found matching branch: ${vivarium_branch_name}"
-  else
-    echo "Could not find upstream branch '${branch_name_to_check}'. Finding parent branch."
-    branch_name_to_check="$( \
-      git show-branch -a \
-      | grep '\*' \
-      | grep -v `git rev-parse --abbrev-ref HEAD` \
-      | head -n1 \
-      | sed 's/[^\[]*//' \
-      | awk 'match($0, /\[[a-zA-Z0-9\/.-]+\]/) { print substr( $0, RSTART+1, RLENGTH-2 )}' \
-      | sed 's/^origin\///' \
-    )"
-    if [ -z "$branch_name_to_check" ]; then
-      echo "Could not find upstream branch. Will use released version."
-      branch_name_to_check="main"
-    fi
-    echo "Checking out branch: ${branch_name_to_check}"
-    git checkout ${branch_name_to_check}
-    iterations=$((iterations+1))
-  fi
-  done
-  echo "vivarium_branch_name=${vivarium_branch_name}" >> $GITHUB_ENV
-  git checkout ${branch_name}

vivarium_public_health-3.0.1/src/vivarium_public_health/_version.py

@@ -1 +0,0 @@
-__version__ = "3.0.1"