Skip to content

Remove PE-US from dependencies #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikhilwoodruff merged 5 commits into from
Sep 29, 2024
Merged

Remove PE-US from dependencies #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9fd897
Fix Move PolicyEngine US out of dev dependencies #93
nikhilwoodruff Sep 29, 2024
5865bc0
Change to minor bump
nikhilwoodruff Sep 29, 2024
2d3a426
Move URLs up
nikhilwoodruff Sep 29, 2024
f302759
Add microdf to dependencies
nikhilwoodruff Sep 29, 2024
e160019
Use `make install` over `pip`
nikhilwoodruff Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions changelog_entry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- bump: minor
changes:
fixed:
- Moved PolicyEngine US out of setup.py dependencies.
2 changes: 1 addition & 1 deletion policyengine_us_data/datasets/acs/acs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
4 changes: 2 additions & 2 deletions policyengine_us_data/datasets/cps/cps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion policyengine_us_data/datasets/cps/enhanced_cps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
6 changes: 3 additions & 3 deletions policyengine_us_data/datasets/puf/puf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 = {
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ dependencies = [
dev = [
"black",
"pytest",
"policyengine_us==1.100.0",
"quantile-forest",
"torch",
"tables",
Expand Down