Remove PE-US from dependencies (#94)

* Fix Move PolicyEngine US out of dev dependencies #93

* Change to minor bump

* Move URLs up

* Add microdf to dependencies

* Use `make install` over `pip`

Author: nikhilwoodruff

.github/workflows/pull_request.yaml

@@ -60,7 +60,7 @@ jobs:
         with:
           python-version: 3.12
       - name: Install package
-        run: pip install -e ".[dev]"
+        run: make install
       - name: Download data inputs
         run: make download
         env:

.github/workflows/push.yaml

@@ -38,7 +38,7 @@ jobs:
         with:
           python-version: 3.12
       - name: Install package
-        run: pip install -e ".[dev]"
+        run: make install
       - name: Download data inputs
         run: make download
         env:
@@ -73,7 +73,7 @@ jobs:
         with:
           python-version: 3.12
       - name: Install package
-        run: pip install -e ".[dev]"
+        run: make install
       - name: Build package
         run: python -m build
       - name: Publish a git tag

Makefile

@@ -10,6 +10,7 @@ test:
 
 install:
 	pip install -e ".[dev]"
+	pip install policyengine-us==1.100.0
 
 changelog:
 	build-changelog changelog.yaml --output changelog.yaml --update-last-date --start-from 1.0.0 --append-file changelog_entry.yaml

changelog_entry.yaml

@@ -0,0 +1,4 @@
+- bump: minor
+  changes:
+    fixed:
+    - Moved PolicyEngine US out of setup.py dependencies.

policyengine_us_data/datasets/acs/acs.py

@@ -111,7 +111,7 @@ class ACS_2022(ACS):
     time_period = 2022
     file_path = STORAGE_FOLDER / "acs_2022.h5"
     census_acs = CensusACS_2022
-    url = "release://PolicyEngine/policyengine-us-data/1.7.0/acs_2022.h5"
+    url = "release://PolicyEngine/policyengine-us-data/1.8.0/acs_2022.h5"
 
 
 if __name__ == "__main__":

policyengine_us_data/datasets/cps/cps.py

@@ -622,7 +622,7 @@ class CPS_2024(CPS):
     label = "CPS 2024 (2022-based)"
     file_path = STORAGE_FOLDER / "cps_2024.h5"
     time_period = 2024
-    url = "release://policyengine/policyengine-us-data/1.7.0/cps_2024.h5"
+    url = "release://policyengine/policyengine-us-data/1.8.0/cps_2024.h5"
 
 
 class PooledCPS(Dataset):
@@ -681,7 +681,7 @@ class Pooled_3_Year_CPS_2023(PooledCPS):
         CPS_2023,
     ]
     time_period = 2023
-    url = "release://PolicyEngine/policyengine-us-data/1.7.0/pooled_3_year_cps_2023.h5"
+    url = "release://PolicyEngine/policyengine-us-data/1.8.0/pooled_3_year_cps_2023.h5"
 
 
 if __name__ == "__main__":

policyengine_us_data/datasets/cps/enhanced_cps.py

@@ -177,7 +177,7 @@ class EnhancedCPS_2024(EnhancedCPS):
     name = "enhanced_cps_2024"
     label = "Enhanced CPS 2024"
     file_path = STORAGE_FOLDER / "enhanced_cps_2024.h5"
-    url = "release://policyengine/policyengine-us-data/1.7.0/enhanced_cps_2024.h5"
+    url = "release://policyengine/policyengine-us-data/1.8.0/enhanced_cps_2024.h5"
 
 
 if __name__ == "__main__":

policyengine_us_data/datasets/puf/puf.py

@@ -1,7 +1,7 @@
 from tqdm import tqdm
 import numpy as np
 import pandas as pd
-from microdf import MicroDataFrame
+from policyengine_core.weighting import MicroDataFrame
 from policyengine_core.data import Dataset
 from policyengine_us_data.storage import STORAGE_FOLDER
 from policyengine_us_data.datasets.puf.uprate_puf import uprate_puf
@@ -493,15 +493,15 @@ class PUF_2021(PUF):
     name = "puf_2021"
     time_period = 2021
     file_path = STORAGE_FOLDER / "puf_2021.h5"
-    url = "release://policyengine/irs-soi-puf/1.7.0/puf_2021.h5"
+    url = "release://policyengine/irs-soi-puf/1.8.0/puf_2021.h5"
 
 
 class PUF_2024(PUF):
     label = "PUF 2024 (2015-based)"
     name = "puf_2024"
     time_period = 2024
     file_path = STORAGE_FOLDER / "puf_2024.h5"
-    url = "release://policyengine/irs-soi-puf/1.7.0/puf_2024.h5"
+    url = "release://policyengine/irs-soi-puf/1.8.0/puf_2024.h5"
 
 
 MEDICAL_EXPENSE_CATEGORY_BREAKDOWNS = {

pyproject.toml

@@ -22,7 +22,6 @@ dependencies = [
 dev = [
     "black",
     "pytest",
-    "policyengine_us==1.100.0",
     "quantile-forest",
     "torch",
     "tables",