vivarium-public-health 2.3.1__py3-none-any.whl → 2.3.3__py3-none-any.whl

vivarium_public_health/_version.py

@@ -1 +1 @@
-__version__ = "2.3.1"
+__version__ = "2.3.3"

vivarium_public_health/metrics/mortality.py

@@ -54,6 +54,17 @@ class MortalityObserver(Component):
         }
     }
 
+    def __init__(self):
+        super().__init__()
+        self.causes_of_death = ["other_causes"]
+        self.required_death_columns = ["alive", "exit_time"]
+        self.required_yll_columns = [
+            "alive",
+            "cause_of_death",
+            "exit_time",
+            "years_of_life_lost",
+        ]
+
     ##############
     # Properties #
     ##############
@@ -75,18 +86,11 @@ class MortalityObserver(Component):
     def setup(self, builder: Builder) -> None:
         self.clock = builder.time.clock()
         self.config = builder.configuration.stratification.mortality
-        self._cause_components = builder.components.get_components_by_type(
+        cause_components = builder.components.get_components_by_type(
             (DiseaseState, RiskAttributableDisease)
         )
-        self.causes_of_death = ["other_causes"] + [
-            cause.state_id for cause in self._cause_components if cause.has_excess_mortality
-        ]
-        self.required_death_columns = ["alive", "exit_time"]
-        self.required_yll_columns = [
-            "alive",
-            "cause_of_death",
-            "exit_time",
-            "years_of_life_lost",
+        self.causes_of_death += [
+            cause.state_id for cause in cause_components if cause.has_excess_mortality
         ]
         if not self.config.aggregate:
             for cause_of_death in self.causes_of_death:

{vivarium_public_health-2.3.1.dist-info → vivarium_public_health-2.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vivarium_public_health
-Version: 2.3.1
+Version: 2.3.3
 Summary: Components for modelling diseases, risks, and interventions with ``vivarium``
 Home-page: https://github.com/ihmeuw/vivarium_public_health
 Author: The vivarium developers
@@ -28,7 +28,7 @@ Classifier: Topic :: Software Development :: Libraries
 License-File: LICENSE.txt
 Requires-Dist: vivarium >=2.0.0
 Requires-Dist: loguru
-Requires-Dist: numpy
+Requires-Dist: numpy <2.0.0
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: tables

{vivarium_public_health-2.3.1.dist-info → vivarium_public_health-2.3.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 vivarium_public_health/__about__.py,sha256=RgWycPypKZS80TpSX7o41cREnG8PfguNHDHLuLyl820,487
 vivarium_public_health/__init__.py,sha256=tomMOl3PI7O8GdxDWGBiBjT0Bwd31GpyQTYTzwIv108,361
-vivarium_public_health/_version.py,sha256=neZxeMmEfjhVZM6xetRikrBdHWt5T5ehL72ZYdPtJ-E,22
+vivarium_public_health/_version.py,sha256=s0EEVOzZFl_WT6PzFxk9cgtfsNGRuqeXrX3fgGq9Ogs,22
 vivarium_public_health/utilities.py,sha256=_X9sZQ7flsi2sVWQ9zrf8GJw8QwZsPZm3NUjx1gu7bM,2555
 vivarium_public_health/disease/__init__.py,sha256=RuuiRcvAJfX9WQGt_WZZjxN7Cu3E5rMTmuaRS-UaFPM,419
 vivarium_public_health/disease/model.py,sha256=9Ru3mg3UUp3h1W0y-1xkWjQBgxqSq-LXM0ByiEcNmGA,8332
@@ -11,7 +11,7 @@ vivarium_public_health/disease/transition.py,sha256=Or5nucRzeGG-UuE_CGkPZ9qE35-E
 vivarium_public_health/metrics/__init__.py,sha256=bWAvvdCm_7RPIazo12qFohA2x5-_EV6ceV8IhKS37sk,209
 vivarium_public_health/metrics/disability.py,sha256=zm0vAG00wj44CHjYGdT2_pebgARa3XXIerrR06t80rc,3984
 vivarium_public_health/metrics/disease.py,sha256=_WQYjd6FRrxRs1Oj8NR9ZmcbXVvsHqX_hods10hwHzU,4546
-vivarium_public_health/metrics/mortality.py,sha256=uidsbB7q_NmavxcQEsNFrJQj6pUa7koLnVytye_spx8,4756
+vivarium_public_health/metrics/mortality.py,sha256=B1AX-N4aO1Jd2NEJ_yMC1NHaDr4pEXmQxNm5kXoLz8w,4826
 vivarium_public_health/metrics/risk.py,sha256=ANwgwpasX-5t0OHMQysV8p_cM86NL2bV6za1FM0JR88,3201
 vivarium_public_health/metrics/stratification.py,sha256=_ChQy8yeP09wFKne4UPPiUEfCKDM6UGfHl4moKCjoNQ,4612
 vivarium_public_health/mslt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -42,8 +42,8 @@ vivarium_public_health/treatment/__init__.py,sha256=wONElu9aJbBYwpYIovYPYaN_GYfV
 vivarium_public_health/treatment/magic_wand.py,sha256=iPKFN3VjfiMy_XvN94UqM-FUrGuI0ULwmOdAGdOepYQ,1979
 vivarium_public_health/treatment/scale_up.py,sha256=EkuEAmKaW7AvPWDqDa9WJ2Iy_yiKFytsJu8HVli5Lrg,7078
 vivarium_public_health/treatment/therapeutic_inertia.py,sha256=VwZ7t90zzfGoBusduIvcE4lDe5zTvzmHiUNB3u2I52Y,2339
-vivarium_public_health-2.3.1.dist-info/LICENSE.txt,sha256=mN4bNLUQNcN9njYRc_3jCZkfPySVpmM6MRps104FxA4,1548
-vivarium_public_health-2.3.1.dist-info/METADATA,sha256=CnzHPtrXVMBRZZbkCSz_edTuTsvhWCmkl8ByBbcMfr8,3590
-vivarium_public_health-2.3.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-vivarium_public_health-2.3.1.dist-info/top_level.txt,sha256=VVInlpzCFD0UNNhjOq_j-a29odzjwUwYFTGfvqbi4dY,23
-vivarium_public_health-2.3.1.dist-info/RECORD,,
+vivarium_public_health-2.3.3.dist-info/LICENSE.txt,sha256=mN4bNLUQNcN9njYRc_3jCZkfPySVpmM6MRps104FxA4,1548
+vivarium_public_health-2.3.3.dist-info/METADATA,sha256=KPeMMgLVCQbINIyZatOBh7gOpOqWIxOSpa7144Oocuo,3597
+vivarium_public_health-2.3.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+vivarium_public_health-2.3.3.dist-info/top_level.txt,sha256=VVInlpzCFD0UNNhjOq_j-a29odzjwUwYFTGfvqbi4dY,23
+vivarium_public_health-2.3.3.dist-info/RECORD,,