Skip to content

Commit aaf9291

Browse files
MaxGhenisMaxGhenis
authored
Merge pull request #90 from PolicyEngine/issue88
Bump to policyengine-us 1.100.0
2 parents f109959 + b1c033a commit aaf9291

15 files changed

Lines changed: 123 additions & 143 deletions

File tree

‎.github/workflows/pull_request.yaml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,9 @@ jobs:
6767
POLICYENGINE_US_DATA_GITHUB_TOKEN: ${{ secrets.POLICYENGINE_US_DATA_GITHUB_TOKEN }}
6868
- name: Build datasets
6969
run: make data
70+
env:
71+
LITE_MODE: true
7072
- name: Run tests
7173
run: pytest
7274
- name: Test documentation builds
7375
run: make documentation
74-
- name: Upload ECPS 2024
75-
uses: actions/upload-artifact@v4
76-
with:
77-
name: enhanced_cps_2024.h5
78-
path: policyengine_us_data/storage/enhanced_cps_2024.h5

.github/workflows/push_2.yaml renamed to .github/workflows/push.yaml

Lines changed: 12 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# After successful versioning, this script runs various
22
# parts of the push process
3-
name: Push 2
3+
name: Push
44

55
on:
66
workflow_run:
7-
workflows: ["Push 1"]
7+
workflows: ["Update versioning"]
88
types: [completed]
99

1010
jobs:
@@ -46,11 +46,19 @@ jobs:
4646
- name: Build datasets
4747
run: make data
4848
env:
49-
TEST_LITE: true
49+
LITE_MODE: true
5050
- name: Run tests
5151
run: pytest
5252
- name: Test documentation builds
5353
run: make documentation
54+
- name: Build Jupyter Book
55+
run: make documentation
56+
- name: Deploy documentation
57+
uses: JamesIves/github-pages-deploy-action@releases/v4
58+
with:
59+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60+
BRANCH: gh-pages
61+
FOLDER: docs/_build/html
5462
publish-to-pypi:
5563
name: Publish to PyPI
5664
runs-on: ubuntu-latest
@@ -92,63 +100,4 @@ jobs:
92100
- name: Build container
93101
run: docker build . -f docker/policyengine_us_data.Dockerfile -t ghcr.io/policyengine/policyengine-us-data:latest
94102
- name: Push container
95-
run: docker push ghcr.io/policyengine/policyengine-us-data:latest
96-
publish-docs:
97-
name: Publish documentation
98-
runs-on: ubuntu-latest
99-
if: ${{ github.event.workflow_run.conclusion == 'success' }}
100-
steps:
101-
- name: Checkout code
102-
uses: actions/checkout@v4
103-
with:
104-
fetch-depth: 0 # Fetch all history for all tags and branches
105-
- name: Set up Python
106-
uses: actions/setup-python@v5
107-
with:
108-
python-version: 3.12
109-
- name: Install package
110-
run: pip install -e ".[dev]"
111-
- name: Build Jupyter Book
112-
run: make documentation
113-
- name: Deploy documentation
114-
uses: JamesIves/github-pages-deploy-action@releases/v4
115-
with:
116-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
117-
BRANCH: gh-pages
118-
FOLDER: docs/_build/html
119-
upload:
120-
name: Upload data
121-
runs-on: ubuntu-latest
122-
needs: [lint, test]
123-
if: ${{ github.event.workflow_run.conclusion == 'success' }}
124-
steps:
125-
- name: Checkout code
126-
uses: actions/checkout@v4
127-
with:
128-
fetch-depth: 0 # Fetch all history for all tags and branches
129-
- name: Set up Python
130-
uses: actions/setup-python@v5
131-
with:
132-
python-version: 3.12
133-
- name: Install package
134-
run: pip install -e ".[dev]"
135-
- name: Download data inputs
136-
run: make download
137-
env:
138-
POLICYENGINE_US_DATA_GITHUB_TOKEN: ${{ secrets.POLICYENGINE_US_DATA_GITHUB_TOKEN }}
139-
- name: Build datasets
140-
run: make data
141-
- name: Upload CPS 2024
142-
uses: actions/upload-artifact@v4
143-
with:
144-
name: cps_2024.h5
145-
path: policyengine_us_data/storage/cps_2024.h5
146-
- name: Upload ECPS 2024
147-
uses: actions/upload-artifact@v4
148-
with:
149-
name: enhanced_cps_2024.h5
150-
path: policyengine_us_data/storage/enhanced_cps_2024.h5
151-
- name: Upload data
152-
run: make upload
153-
env:
154-
POLICYENGINE_US_DATA_GITHUB_TOKEN: ${{ secrets.POLICYENGINE_US_DATA_GITHUB_TOKEN }}
103+
run: docker push ghcr.io/policyengine/policyengine-us-data:latest

.github/workflows/push_1.yaml renamed to .github/workflows/update_versioning.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# This script must run first and complete to allow for
66
# proper versioning.
77

8-
name: Push 1
8+
name: Update versioning
99

1010
on:
1111
push:

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ documentation:
3434
data:
3535
python policyengine_us_data/datasets/acs/acs.py
3636
python policyengine_us_data/datasets/cps/cps.py
37+
python policyengine_us_data/datasets/puf/irs_puf.py
38+
python policyengine_us_data/datasets/puf/puf.py
3739
python policyengine_us_data/datasets/cps/extended_cps.py
3840
python policyengine_us_data/datasets/cps/enhanced_cps.py
3941

‎changelog_entry.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
- bump: minor
2+
changes:
3+
changed:
4+
- Bump to policyengine-us 1.100.0.

‎docs/validation.ipynb‎

Lines changed: 55 additions & 55 deletions
Large diffs are not rendered by default.

‎policyengine_us_data/datasets/__init__.py‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818
from .puf import PUF_2015, PUF_2021, PUF_2024, IRS_PUF_2015
1919
from .acs import ACS_2022
2020

21-
DATASETS = [CPS_2022, PUF_2021, CPS_2024, EnhancedCPS_2024, ACS_2022]
21+
DATASETS = [
22+
CPS_2022,
23+
PUF_2021,
24+
CPS_2024,
25+
EnhancedCPS_2024,
26+
ACS_2022,
27+
Pooled_3_Year_CPS_2023,
28+
]

‎policyengine_us_data/datasets/acs/acs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class ACS_2022(ACS):
111111
time_period = 2022
112112
file_path = STORAGE_FOLDER / "acs_2022.h5"
113113
census_acs = CensusACS_2022
114-
url = "release://PolicyEngine/policyengine-us-data/release/acs_2022.h5"
114+
url = "release://PolicyEngine/policyengine-us-data/1.7.0/acs_2022.h5"
115115

116116

117117
if __name__ == "__main__":

‎policyengine_us_data/datasets/cps/cps.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -620,9 +620,9 @@ class CPS_2023(CPS):
620620
class CPS_2024(CPS):
621621
name = "cps_2024"
622622
label = "CPS 2024 (2022-based)"
623-
file_path = STORAGE_FOLDER / "cps_2024_v1_6_1.h5"
623+
file_path = STORAGE_FOLDER / "cps_2024.h5"
624624
time_period = 2024
625-
url = "release://policyengine/policyengine-us-data/release/cps_2024_v1_6_1.h5"
625+
url = "release://policyengine/policyengine-us-data/1.7.0/cps_2024.h5"
626626

627627

628628
class PooledCPS(Dataset):
@@ -674,14 +674,14 @@ def generate(self):
674674
class Pooled_3_Year_CPS_2023(PooledCPS):
675675
label = "CPS 2023 (3-year pooled)"
676676
name = "pooled_3_year_cps_2023"
677-
file_path = STORAGE_FOLDER / "pooled_3_year_cps_2023_v1_6_1.h5"
677+
file_path = STORAGE_FOLDER / "pooled_3_year_cps_2023.h5"
678678
input_datasets = [
679679
CPS_2021,
680680
CPS_2022,
681681
CPS_2023,
682682
]
683683
time_period = 2023
684-
url = "release://PolicyEngine/policyengine-us-data/release/pooled_3_year_cps_2023_v1_6_1.h5"
684+
url = "release://PolicyEngine/policyengine-us-data/1.7.0/pooled_3_year_cps_2023.h5"
685685

686686

687687
if __name__ == "__main__":

‎policyengine_us_data/datasets/cps/enhanced_cps.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ class EnhancedCPS_2024(EnhancedCPS):
176176
end_year = 2024
177177
name = "enhanced_cps_2024"
178178
label = "Enhanced CPS 2024"
179-
file_path = STORAGE_FOLDER / "enhanced_cps_2024_v1_6_1.h5"
180-
url = "release://policyengine/policyengine-us-data/release/enhanced_cps_2024_v1_6_1.h5"
179+
file_path = STORAGE_FOLDER / "enhanced_cps_2024.h5"
180+
url = "release://policyengine/policyengine-us-data/1.7.0/enhanced_cps_2024.h5"
181181

182182

183183
if __name__ == "__main__":

0 commit comments

Comments
 (0)