diff --git a/python/ase.py b/python/ase.py index 238dd5d..c7ca330 100644 --- a/python/ase.py +++ b/python/ase.py @@ -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 diff --git a/python/employment.py b/python/employment.py index f584a6f..738b0ce 100644 --- a/python/employment.py +++ b/python/employment.py @@ -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}, @@ -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={ diff --git a/python/parsers.py b/python/parsers.py index 0a4f178..8727c41 100644 --- a/python/parsers.py +++ b/python/parsers.py @@ -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": {