Skip to content

[PULL REQUEST] Preparations for 2025 run #254

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
GregorSchroeder merged 3 commits into from
May 29, 2026
Merged

[PULL REQUEST] Preparations for 2025 run #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
580578f
#252 - update input parser to allow 2025
May 29, 2026
0e9a5bd
#251 - handle a/s/e module runtime warning
May 29, 2026
04c5cd6
#253 - max lookback for edd data
May 29, 2026
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
10 changes: 8 additions & 2 deletions python/ase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,8 +513,14 @@ def _create_ase(
"value",
] = 0
seed_mgras.loc[
(seed_mgras["max"] < seed_mgras["min_age"])
| (seed_mgras["min"] > seed_mgras["max_age"]),
(
seed_mgras["min_age"].notna()
& seed_mgras["max"].lt(seed_mgras["min_age"])
)
| (
seed_mgras["max_age"].notna()
& seed_mgras["min"].gt(seed_mgras["max_age"])
),
"value",
] = 0

Expand Down
3 changes: 2 additions & 1 deletion python/employment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def _get_lodes_data(year: int) -> pd.DataFrame:
with utils.GIS_ENGINE.connect() as con:
with open(utils.SQL_FOLDER / "employment/get_naics72_split.sql") as file:
split_naics_72 = utils.read_sql_query_fallback(
max_lookback=3,
max_lookback=2,
sql=sql.text(file.read()),
con=con,
params={"year": year},
Expand Down Expand Up @@ -267,6 +267,7 @@ def _get_jobs_inputs(year: int) -> dict[str, pd.DataFrame]:
# Get crosswalk from Census blocks to MGRAs
with open(utils.SQL_FOLDER / "employment/xref_block_to_mgra.sql") as file:
jobs_inputs["xref_block_to_mgra"] = utils.read_sql_query_fallback(
max_lookback=2,
sql=sql.text(file.read()),
con=con,
params={
Expand Down
2 changes: 1 addition & 1 deletion python/parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def _validate_config(self) -> None:

# Check all keys are present and key types using Cerberus. For help, see their
# website here: https://docs.python-cerberus.org/usage.html
min_max_years = [2010, 2024]
min_max_years = [2010, 2025]
versions = ["0.0.0-dev", "1.0.0", "1.1.0", "1.1.1-dev"]
schema = {
"run": {
Expand Down