policyengine-us 1.370.1__py3-none-any.whl → 1.370.2__py3-none-any.whl

policyengine_us/data/__init__.py

@@ -0,0 +1 @@
+from .zip_code_dataset import ZIP_CODE_DATASET

policyengine_us/data/zip_code_dataset.py

@@ -0,0 +1,11 @@
+from pathlib import Path
+import pandas as pd
+import os
+
+ZIP_CODE_DATASET_PATH = Path(__file__).parent / "zip_codes.csv.gz"
+
+# Avoid circular import error when -us-data is initialized
+if os.path.exists(ZIP_CODE_DATASET_PATH):
+    ZIP_CODE_DATASET = pd.read_csv(ZIP_CODE_DATASET_PATH, compression="gzip")
+else:
+    ZIP_CODE_DATASET = None

policyengine_us/system.py

@@ -27,7 +27,6 @@ from policyengine_core.parameters.operations.uprate_parameters import (
     uprate_parameters,
 )
 from .tools.default_uprating import add_default_uprating
-from policyengine_us_data import DATASETS, CPS_2024
 
 from typing import Annotated
 
@@ -37,6 +36,8 @@ COUNTRY_DIR = Path(__file__).parent
 CURRENT_YEAR = 2024
 DEFAULT_START_DATE = str(CURRENT_YEAR) + "-01-01"
 
+DEFAULT_DATASET = "hf://policyengine/policyengine-us-data/enhanced_cps_2024.h5"
+
 
 class CountryTaxBenefitSystem(TaxBenefitSystem):
     """
@@ -131,7 +132,6 @@ class Simulation(CoreSimulation):
     default_role = "member"
     default_calculation_period = CURRENT_YEAR
     default_input_period = CURRENT_YEAR
-    datasets = DATASETS
 
     def __init__(self, *args, **kwargs):
         start_instant: Annotated[str, "ISO date format YYYY-MM-DD"] = (
@@ -198,12 +198,11 @@ class Microsimulation(CoreMicrosimulation):
 
     default_tax_benefit_system = CountryTaxBenefitSystem
     default_tax_benefit_system_instance = system
-    default_dataset = CPS_2024
+    default_dataset = DEFAULT_DATASET
     default_dataset_year = CURRENT_YEAR
     default_role = "member"
     default_calculation_period = CURRENT_YEAR
     default_input_period = CURRENT_YEAR
-    datasets = DATASETS
 
     def __init__(self, *args, **kwargs):
         start_instant: Annotated[str, "ISO date format YYYY-MM-DD"] = (
@@ -281,7 +280,7 @@ class Microsimulation(CoreMicrosimulation):
 class IndividualSim(CoreIndividualSim):  # Deprecated
     tax_benefit_system = CountryTaxBenefitSystem
     entities = {entity.key: entity for entity in entities}
-    default_dataset = CPS_2024
+    default_dataset = DEFAULT_DATASET
     default_roles = dict(
         tax_unit="member",
         spm_unit="member",

policyengine_us/tools/taxsim/generate_taxsim_tests.py

@@ -5,7 +5,6 @@ import pandas as pd
 import subprocess
 import stat
 from io import StringIO
-from policyengine_us_data import CPS_2024
 from policyengine_core.data import Dataset
 from policyengine_core.taxbenefitsystems import TaxBenefitSystem
 from policyengine_us import Microsimulation
@@ -284,6 +283,9 @@ class TaxSim35:
         return test_str
 
 
+DEFAULT_DATASET = "hf://policyengine/policyengine-us-data/enhanced_cps_2024.h5"
+
+
 if __name__ == "__main__":
     parser = ArgumentParser(description="Generate tests from TAXSIM35")
     parser.add_argument(
@@ -299,6 +301,6 @@ if __name__ == "__main__":
     taxsim = TaxSim35()
     taxsim.OUTPUT_VARIABLES = args.outputs
     result = taxsim.generate_from_microsimulation(
-        CPS_2024, args.year, number=args.num
+        DEFAULT_DATASET, args.year, number=args.num
     )
     print(result)

policyengine_us/variables/household/demographic/geographic/county/county.py

@@ -6,7 +6,7 @@ from policyengine_us.tools.geography.county_helpers import (
 from policyengine_us.variables.household.demographic.geographic.county.county_enum import (
     County,
 )
-from policyengine_us_data import ZIP_CODE_DATASET
+from policyengine_us.data import ZIP_CODE_DATASET
 from policyengine_us.tools.geography.county_helpers import (
     load_county_fips_dataset,
 )

policyengine_us/variables/household/demographic/geographic/zip_code/zip_code.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-from policyengine_us_data import ZIP_CODE_DATASET
+from policyengine_us.data import ZIP_CODE_DATASET
 
 
 class zip_code(Variable):

{policyengine_us-1.370.1.dist-info → policyengine_us-1.370.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: policyengine-us
-Version: 1.370.1
+Version: 1.370.2
 Summary: Add your description here.
 Author-email: PolicyEngine <hello@policyengine.org>
 License-File: LICENSE
@@ -16,7 +16,6 @@ Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Requires-Python: <3.14,>=3.10
 Requires-Dist: microdf-python>=1.0.0
 Requires-Dist: policyengine-core>=3.19.0
-Requires-Dist: policyengine-us-data>=1.17.0
 Requires-Dist: tqdm>=4.67.1
 Provides-Extra: dev
 Requires-Dist: build>=1.2.2.post1; extra == 'dev'

{policyengine_us-1.370.1.dist-info → policyengine_us-1.370.2.dist-info}/RECORD

@@ -3,8 +3,10 @@ policyengine_us/conftest.py,sha256=E-KY6D7beTAWH40keL5E3q6NzHfiNTCQnNh3YSH-LcE,8
 policyengine_us/entities.py,sha256=uRrrYvpoZhAV8y_Byb8itTAMDJhZ6JdmckIMtkr2dBI,2052
 policyengine_us/model_api.py,sha256=0NaBw2MTB32T3SrG6uMMeZwwL-wGasWu5U-igV4jq24,1261
 policyengine_us/modelled_policies.yaml,sha256=rbDP6Nzsu5ml2Vdwoo9oSum0msm11NMgK75E9d_FZGU,4773
-policyengine_us/system.py,sha256=dMF6QFl7xYW3zKOmakyTqS-ClA6CtnVPnDQwC0wkOCk,10771
+policyengine_us/system.py,sha256=dzMk0_3YNcxX5e9DFVyNvXMujjZ3WGCcMTVrdfjO4Yc,10766
 policyengine_us/typing.py,sha256=ixLAOFjSnepNEAZ63DhhBZHRw0rBgjH81y_z4hTjhEE,298
+policyengine_us/data/__init__.py,sha256=TuwzfG1RS1KzvMptMbpbEfiaRG5RPCXQK5gYBwzDkBc,47
+policyengine_us/data/zip_code_dataset.py,sha256=PvA4Jldyu21XEuJMGRAcNLxjlJnDSJ7iVTBdy2c1Mp8,337
 policyengine_us/parameters/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 policyengine_us/parameters/calibration/gov/aca/enrollment/state.yaml,sha256=NjN2M7pJxG6q78KR3-I3cIZCVjDayrswc65RISZmetY,1794
 policyengine_us/parameters/calibration/gov/aca/spending/state.yaml,sha256=1kvJIiu-cYEbXPAaBQcOqSE3ShXfALag-1Pdw3sdEes,2018
@@ -5167,7 +5169,7 @@ policyengine_us/tools/variables.py,sha256=AcJMnvPyfCK6to2BIRNODcVcPObCbxQ8UFc8Td
 policyengine_us/tools/geography/README.md,sha256=fxMEj9_GC9Evh1mkTTtf8WKNjZ51lbd1A2--pZKrCsY,155
 policyengine_us/tools/geography/county_helpers.py,sha256=z-WqWQ5CwlnZBA2w0_LuIuU9F0zsdoHykXoWZ50jhM8,2077
 policyengine_us/tools/geography/download_50_state_census_block_data.py,sha256=LFwAAufn6YpOiIMwGNbTslzh7ZjTrDT8l7FuaUqEn_c,2730
-policyengine_us/tools/taxsim/generate_taxsim_tests.py,sha256=v8eaDVXZBKy69IMobu176o5jDVaiJmR-bXB9c-Mycqc,10692
+policyengine_us/tools/taxsim/generate_taxsim_tests.py,sha256=8XTQgP2rvdgR5utAjDrS0tPnZQQI0gPx9gZ082GG0KU,10739
 policyengine_us/variables/contrib/congress/wftca/bonus_guaranteed_deduction.py,sha256=5WWTeo4A8aSbw1vTg9jZofepvjn54LSjCnfTTVJXEWQ,896
 policyengine_us/variables/contrib/taxsim/taxsim_age1.py,sha256=nlbRCCARxV5aXe7trb3d88cDwE3pZ143RBwU6eOICgs,963
 policyengine_us/variables/contrib/taxsim/taxsim_age2.py,sha256=-O1GFMG7AS1L-SIlYHOzdHn9NHWp52AThv_Lf4rYa0s,552
@@ -7796,7 +7798,7 @@ policyengine_us/variables/household/demographic/geographic/state_group.py,sha256
 policyengine_us/variables/household/demographic/geographic/state_group_str.py,sha256=YVapmNgz-QhCZXVfVnU72_G_fijilHLJ1kBDThX9IUE,359
 policyengine_us/variables/household/demographic/geographic/state_name.py,sha256=tfpURwlCmHRJkk4m0_NVPInByKbWY0Upq7sbZUobZIs,1495
 policyengine_us/variables/household/demographic/geographic/tax_unit_state.py,sha256=yQCj1TgJplNL7EGOx59C9av7isbHsyThaWheZMCjSFg,282
-policyengine_us/variables/household/demographic/geographic/county/county.py,sha256=MPPzpU7ZciOgm3paZRne4w5s7zAljGl2MkI3Xdyi5pw,2374
+policyengine_us/variables/household/demographic/geographic/county/county.py,sha256=F1gZbt5DEteQZQIe5xV-UPbWgfgCicO5BUrAZdY8HAE,2374
 policyengine_us/variables/household/demographic/geographic/county/county_enum.py,sha256=2-SIpjp72QWPhQQUs8hzxrLcE2baWSkLTdCVRwKOXXw,145769
 policyengine_us/variables/household/demographic/geographic/county/county_str.py,sha256=UDWJ8YqH4Ef_JTscy8LMwLAMQ_o-Zan13hziZBY3XPs,339
 policyengine_us/variables/household/demographic/geographic/county/first_county_in_state.py,sha256=yXCj-LVjxPeILIg42ijefTmi_j4NxJwX0kMtoE47xic,1578
@@ -7806,7 +7808,7 @@ policyengine_us/variables/household/demographic/geographic/ucgid/ucgid.py,sha256
 policyengine_us/variables/household/demographic/geographic/ucgid/ucgid_enum.py,sha256=dkeusTBI1j4xAGmRFkfSsyT3Hq5gHZwRUkSeISeNbx0,15636
 policyengine_us/variables/household/demographic/geographic/ucgid/ucgid_str.py,sha256=GnIRg2tc0376YazPX7wm7YQgMQaYPm2Au47vc1E5JcM,914
 policyengine_us/variables/household/demographic/geographic/zip_code/three_digit_zip_code.py,sha256=7q0FQRahTOINiK2vlAyHEa5xIKowM5Kgl60-kR3ZuWU,426
-policyengine_us/variables/household/demographic/geographic/zip_code/zip_code.py,sha256=PZiLb84BgKQ_Suvd6iUiEnzySu3Vtiv8FOlfB4rnagQ,1691
+policyengine_us/variables/household/demographic/geographic/zip_code/zip_code.py,sha256=3J8RfnIIsmw4_5gF5yZHmATt2cNskyKQR0lncCvOQx0,1691
 policyengine_us/variables/household/demographic/household/bedrooms.py,sha256=4ltdIRLdmeuTKAskn4pdgxZuxEE-4rz0ffPnIKobc-o,164
 policyengine_us/variables/household/demographic/household/household_count.py,sha256=f6dIPWyCtWlZ-qTSCPDrzCfINSzoJOE5Tw1ynBKYfGA,211
 policyengine_us/variables/household/demographic/household/household_size.py,sha256=DR5PS9bylHlPphL3-Y0ySR4E0cavAf6qyMpNJG2N3ig,263
@@ -8253,8 +8255,8 @@ policyengine_us/variables/input/farm_income.py,sha256=BEKxYmHNNnWJAAvULl5qZJigy5
 policyengine_us/variables/input/geography.py,sha256=XmBlgXhzBoLRKk6R8taVZHqUw1eU8MbNeGS9iJ7_l44,4506
 policyengine_us/variables/input/self_employment_income.py,sha256=PwsGz8R4lRikKWUYOhsC0qosNNLXq4f5SQmfw4S3mk8,511
 policyengine_us/variables/input/self_employment_income_before_lsr.py,sha256=E8fcX9Nlyqz8dziHhQv_euutdmoIwFMMWePUwbbwv_w,379
-policyengine_us-1.370.1.dist-info/METADATA,sha256=xxMUTLf1RLHtBProzP-yF1mCoreZgxmvAGT-GkpNIP4,1693
-policyengine_us-1.370.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-policyengine_us-1.370.1.dist-info/entry_points.txt,sha256=MLaqNyNTbReALyKNkde85VkuFFpdPWAcy8VRG1mjczc,57
-policyengine_us-1.370.1.dist-info/licenses/LICENSE,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
-policyengine_us-1.370.1.dist-info/RECORD,,
+policyengine_us-1.370.2.dist-info/METADATA,sha256=UN5NKnYjQDD3hl66gF272fF_53IvjcIE0C2QiSiSBVM,1649
+policyengine_us-1.370.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+policyengine_us-1.370.2.dist-info/entry_points.txt,sha256=MLaqNyNTbReALyKNkde85VkuFFpdPWAcy8VRG1mjczc,57
+policyengine_us-1.370.2.dist-info/licenses/LICENSE,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
+policyengine_us-1.370.2.dist-info/RECORD,,