vivarium-public-health 4.2.1__py3-none-any.whl → 4.2.3__py3-none-any.whl

vivarium_public_health/_version.py

@@ -1 +1 @@
-__version__ = "4.2.1"
+__version__ = "4.2.3"

vivarium_public_health/population/base_population.py

@@ -183,7 +183,7 @@ class BasePopulation(Component):
             provided_new_key = False
             for layer in ["override", "model_override"]:
                 try:
-                    new_key_value = self.config.get_from_layer(mapper[key], layer=layer)
+                    new_key_value = self.config.get(mapper[key], layer=layer)
                     provided_new_key = True
                     break
                 except ConfigurationKeyError:

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.1.dist-info → vivarium_public_health-4.2.3.dist-info}/METADATA

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

{vivarium_public_health-4.2.1.dist-info → vivarium_public_health-4.2.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 vivarium_public_health/__about__.py,sha256=RgWycPypKZS80TpSX7o41cREnG8PfguNHDHLuLyl820,487
 vivarium_public_health/__init__.py,sha256=GDeeP-7OlCBwPuv_xQoB1wNmvCaFsqfTB7qnnYApm0w,1343
-vivarium_public_health/_version.py,sha256=VOZQXJJgKJWk3sL90fY4DfBIyLB4nT1vLtvU5G_1lSo,22
+vivarium_public_health/_version.py,sha256=MoxmxdSxeGEknKNgNuSVukRLQF7wGD3OGdttUMerYqw,22
 vivarium_public_health/utilities.py,sha256=QNXQ6fhAr1HcV-GwKw7wQLz6QyuNxqNvMA-XujKjTgs,3035
 vivarium_public_health/disease/__init__.py,sha256=VUJHDLlE6ngo2qHNQUtZ8OWH5H_T7_ao-xsYKDkRmHw,443
 vivarium_public_health/disease/exceptions.py,sha256=vb30IIV82OiDf2cNZCs_E2rF6mdDDHbnZSND60no5CU,97
@@ -20,8 +20,8 @@ vivarium_public_health/plugins/__init__.py,sha256=oBW_zfgG_LbwfgTDjUe0btfy9FaDvA
 vivarium_public_health/plugins/parser.py,sha256=WoUisq0d-PfJtSzKYZ6C-s-fYdQpNiRBE14vKaYE27Y,32921
 vivarium_public_health/population/__init__.py,sha256=x_9rB93q64Krw-kbBDI1-_U_JsPO1_QrL03AwiFlwXI,243
 vivarium_public_health/population/add_new_birth_cohorts.py,sha256=x6A60GE_F3I8AgLABNJ-2ziiUj52lAd66uX5yc2vIDI,9038
-vivarium_public_health/population/base_population.py,sha256=kBE0WVSV0aElTJNBmOBqowZlsjhDfnFn2IzNxb3X8CA,18909
-vivarium_public_health/population/data_transformations.py,sha256=CEID0uLIJc0xXijlHwnC9Kt8vJMKiIkJtUYcLQbbRRY,22304
+vivarium_public_health/population/base_population.py,sha256=Wu797AL13KRLhXkYni_XocJBLfhfvCVgGeas08U3tCM,18898
+vivarium_public_health/population/data_transformations.py,sha256=J5FUW_pQKrhMcveYvTGgNUTkK_sFdmhu1JcAZ97hAKQ,22378
 vivarium_public_health/population/mortality.py,sha256=Mtv45FENNY0GlPIoVd3d3pRq01aEh4cjzNXIgEe6hMo,10364
 vivarium_public_health/results/__init__.py,sha256=rKUZGlRXJgEyFY4a_WJeg3XnC0l34S5guYZ0N9JJS4E,319
 vivarium_public_health/results/columns.py,sha256=V-L3JgTcsk51Zx9PcUwSgaE1iZjuGyfZ8aShPjynadU,495
@@ -43,8 +43,8 @@ vivarium_public_health/treatment/__init__.py,sha256=wONElu9aJbBYwpYIovYPYaN_GYfV
 vivarium_public_health/treatment/magic_wand.py,sha256=zg4I48G-l9fC6-qjvApbM1zNACJimZlX9ZZ9fdHKwvc,1985
 vivarium_public_health/treatment/scale_up.py,sha256=_bsf9c_yVc7-q_-yBcXimISTUfYzPps1auH0uEf7sfQ,7048
 vivarium_public_health/treatment/therapeutic_inertia.py,sha256=ZIHnpuszZwA_BkS53JbSLvpcnX_bqG2knwCUyUgkA9M,2362
-vivarium_public_health-4.2.1.dist-info/licenses/LICENSE.txt,sha256=mN4bNLUQNcN9njYRc_3jCZkfPySVpmM6MRps104FxA4,1548
-vivarium_public_health-4.2.1.dist-info/METADATA,sha256=s11Zjm_ryoYhshKG5hnArhV1LLhnFOzjIqhM0FAmnBI,4237
-vivarium_public_health-4.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vivarium_public_health-4.2.1.dist-info/top_level.txt,sha256=VVInlpzCFD0UNNhjOq_j-a29odzjwUwYFTGfvqbi4dY,23
-vivarium_public_health-4.2.1.dist-info/RECORD,,
+vivarium_public_health-4.2.3.dist-info/licenses/LICENSE.txt,sha256=mN4bNLUQNcN9njYRc_3jCZkfPySVpmM6MRps104FxA4,1548
+vivarium_public_health-4.2.3.dist-info/METADATA,sha256=IHYsE9iX8IK2CJSsYu93raZducaj4S-2Yg6OtPLU6yw,4237
+vivarium_public_health-4.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vivarium_public_health-4.2.3.dist-info/top_level.txt,sha256=VVInlpzCFD0UNNhjOq_j-a29odzjwUwYFTGfvqbi4dY,23
+vivarium_public_health-4.2.3.dist-info/RECORD,,