vivarium-public-health 4.3.11__tar.gz → 4.3.12__tar.gz

{vivarium_public_health-4.3.11 → vivarium_public_health-4.3.12}/CHANGELOG.rst

@@ -1,3 +1,7 @@
+**4.3.12 - 10/06/25**
+
+  - Register event_year as a stratification in the ResultsStratifier
+
 **4.3.11 - 09/24/25**
 
   - Refactor: Simplify LBWSG parsing logic

{vivarium_public_health-4.3.11/src/vivarium_public_health.egg-info → vivarium_public_health-4.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vivarium_public_health
-Version: 4.3.11
+Version: 4.3.12
 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-4.3.12/src/vivarium_public_health/_version.py

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

{vivarium_public_health-4.3.11 → vivarium_public_health-4.3.12}/src/vivarium_public_health/results/stratification.py

@@ -62,15 +62,14 @@ class ResultsStratifier(Component):
             is_vectorized=True,
             requires_columns=["current_time"],
         )
-        # TODO [MIC-4232]: simulants occasionally have event year of end_year_year+1 if the end time plus step size
-        #  lands in the next year. possible solution detailed in ticket
-        # builder.results.register_stratification(
-        #     "event_year",
-        #     [str(year) for year in range(self.start_year, self.end_year + 1)],
-        #     mapper=self.map_year,
-        #     is_vectorized=True,
-        #     requires_columns=["event_time"],
-        # )
+        builder.results.register_stratification(
+            "event_year",
+            [str(year) for year in range(self.start_year, self.end_year + 2)],
+            excluded_categories=[str(self.end_year + 1)],
+            mapper=self.map_year,
+            is_vectorized=True,
+            requires_columns=["event_time"],
+        )
         # TODO [MIC-3892]: simulants occasionally have entrance year of start_year-1 if the start time minus step size
         #  lands in the previous year. possible solution detailed in ticket
         # builder.results.register_stratification(

{vivarium_public_health-4.3.11 → vivarium_public_health-4.3.12/src/vivarium_public_health.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vivarium_public_health
-Version: 4.3.11
+Version: 4.3.12
 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-4.3.11 → vivarium_public_health-4.3.12}/tests/results/test_stratification.py

@@ -104,13 +104,14 @@ def test_results_stratifier_register_stratifications(mocker):
         is_vectorized=True,
         requires_columns=["current_time"],
     )
-    # builder.results.register_stratification.assert_any_call(
-    #     "event_year",
-    #     years_list,
-    #     mapper=rs.map_year,
-    #     is_vectorized=True,
-    #     requires_columns=["event_time"],
-    # )
+    builder.results.register_stratification.assert_any_call(
+        "event_year",
+        years_list + [str(int(years_list[-1]) + 1)],
+        excluded_categories=[str(int(years_list[-1]) + 1)],
+        mapper=rs.map_year,
+        is_vectorized=True,
+        requires_columns=["event_time"],
+    )
     # builder.results.register_stratification.assert_any_call(
     #     "entrance_year",
     #     years_list,
@@ -129,7 +130,7 @@ def test_results_stratifier_register_stratifications(mocker):
     builder.results.register_stratification.assert_any_call(
         "sex", ["Female", "Male"], requires_columns=["sex"]
     )
-    assert builder.results.register_stratification.call_count == 3
+    assert builder.results.register_stratification.call_count == 4
 
 
 def test_results_stratifier_map_age_groups():

vivarium_public_health-4.3.11/src/vivarium_public_health/_version.py

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