vivarium-public-health 4.2.2__tar.gz → 4.2.4__tar.gz

{vivarium_public_health-4.2.2 → vivarium_public_health-4.2.4}/CHANGELOG.rst

@@ -1,3 +1,11 @@
+**4.2.4 - 07/16/25**
+
+  - Support pinning of vivarium_build_utils; pin vivarium_build_utils>=1.1.0,<2.0.0
+
+**4.2.3 - 07/11/25**
+
+  - Bugfix: Update FertilityCrudeBirthRate to properly check deprecated age_end configuration key
+
 **4.2.2 - 07/03/25**
 
   - Update deprecated layered config tree method from get_from_layer() to get()

vivarium_public_health-4.2.4/Jenkinsfile

@@ -0,0 +1,34 @@
+/* This Jenkinsfile simply loads the `reusable_pipeline` pipeline from the
+vivariu_build_utils repository (https://github.com/ihmeuw/vivarium_build_utils).
+
+vivarium_build_utils is loaded as a Jenkins shared library 
+(https://www.jenkins.io/doc/book/pipeline/shared-libraries/).
+Jenkins shared library convention dictates that importable modules must be stored
+in the 'vars' folder.
+
+Jenkins shared libraries can be configured in the Jenkins UI:
+* Manage Jenkins
+  * Configure System
+    * Global Pipeline Libraries section
+      * Library subsection
+        * Name: The Name for the lib
+        * Version: The branch you want to use. Throws an error
+                   for nonexistent branches.
+        * Project Repository: Url to the shared lib
+        * Credentials: SSH key to access the repo
+
+Note that updating the shared repo will take affect on the next pipeline invocation.
+*/ 
+
+// Load the get_vbu_version function from vivarium_build_utils/bootstrap/
+// (the directory to load from is defined in the Jenkins shared library configuration)
+@Library("get_vbu_version@main") _
+
+// Load the full vivarium_build_utils library at the expected version
+library("vivarium_build_utils@${get_vbu_version()}")
+
+reusable_pipeline(
+    scheduled_branches: ["main"], 
+    upstream_repos: ["vivarium", "layered_config_tree", "risk_distributions"],
+    run_mypy: false,
+)

{vivarium_public_health-4.2.2 → vivarium_public_health-4.2.4}/Makefile

@@ -3,11 +3,12 @@ ifdef JENKINS_URL
 	# Files are already in workspace from shared library
 	MAKE_INCLUDES := .
 else
-	# For local dev, search in parent directory
-	MAKE_INCLUDES := ../vivarium_build_utils/resources/makefiles
+	# For local dev, use the installed vivarium_build_utils package
+	MAKE_INCLUDES := $(shell python -c "from vivarium_build_utils.resources import get_makefiles_path; print(get_makefiles_path())")
 endif
 
 PACKAGE_NAME = vivarium_public_health
 
+# Include makefiles from vivarium_build_utils
 include $(MAKE_INCLUDES)/base.mk
 include $(MAKE_INCLUDES)/test.mk

{vivarium_public_health-4.2.2 → vivarium_public_health-4.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vivarium_public_health
-Version: 4.2.2
+Version: 4.2.4
 Summary: Components for modelling diseases, risks, and interventions with ``vivarium``
 Home-page: https://github.com/ihmeuw/vivarium_public_health
 Author: The vivarium developers
@@ -26,6 +26,7 @@ Classifier: Topic :: Scientific/Engineering :: Medical Science Apps.
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries
 License-File: LICENSE.txt
+Requires-Dist: vivarium_build_utils<2.0.0,>=1.1.0
 Requires-Dist: vivarium>=3.4.3
 Requires-Dist: layered_config_tree>=3.2.0
 Requires-Dist: loguru

{vivarium_public_health-4.2.2 → vivarium_public_health-4.2.4}/setup.py

@@ -42,6 +42,7 @@ if __name__ == "__main__":
         long_description = f.read()
 
     install_requirements = [
+        "vivarium_build_utils>=1.1.0,<2.0.0",
         "vivarium>=3.4.3",
         "layered_config_tree>=3.2.0",
         "loguru",

vivarium_public_health-4.2.4/src/vivarium_public_health/_version.py

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

{vivarium_public_health-4.2.2 → vivarium_public_health-4.2.4}/src/vivarium_public_health/population/data_transformations.py

@@ -577,8 +577,10 @@ def rescale_final_age_bin(builder, population_data):
 
 
 def validate_crude_birth_rate_data(builder, data_year_max):
-    untracking_age = builder.configuration.population.to_dict().get("untracking_age", None)
-    if untracking_age and builder.configuration.population.age_end != untracking_age:
+    population_config = builder.configuration.population.to_dict()
+    untracking_age = population_config.get("untracking_age", None)
+    age_end = population_config.get("age_end", None)
+    if untracking_age and age_end and age_end != untracking_age:
         raise ValueError(
             "If you specify an exit age, the initial population age end must be the same "
             "for the crude birth rate calculation to work."

{vivarium_public_health-4.2.2 → vivarium_public_health-4.2.4}/src/vivarium_public_health.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vivarium_public_health
-Version: 4.2.2
+Version: 4.2.4
 Summary: Components for modelling diseases, risks, and interventions with ``vivarium``
 Home-page: https://github.com/ihmeuw/vivarium_public_health
 Author: The vivarium developers
@@ -26,6 +26,7 @@ Classifier: Topic :: Scientific/Engineering :: Medical Science Apps.
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries
 License-File: LICENSE.txt
+Requires-Dist: vivarium_build_utils<2.0.0,>=1.1.0
 Requires-Dist: vivarium>=3.4.3
 Requires-Dist: layered_config_tree>=3.2.0
 Requires-Dist: loguru

{vivarium_public_health-4.2.2 → vivarium_public_health-4.2.4}/src/vivarium_public_health.egg-info/requires.txt

@@ -1,3 +1,4 @@
+vivarium_build_utils<2.0.0,>=1.1.0
 vivarium>=3.4.3
 layered_config_tree>=3.2.0
 loguru

vivarium_public_health-4.2.2/Jenkinsfile

@@ -1,6 +0,0 @@
-@Library("vivarium_build_utils") _
-reusable_pipeline(
-    scheduled_branches: ["main"], 
-    upstream_repos: ["vivarium", "layered_config_tree", "risk_distributions"],
-    run_mypy: false,
-)

vivarium_public_health-4.2.2/src/vivarium_public_health/_version.py

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