Revert: Accidental direct pushes to main

Author: baogorek

CHANGELOG.md

@@ -5,12 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.40.1] - 2025-07-24 14:16:14
-
-### Fixed
-
-- Clean up immigration status PR.
-
 ## [1.40.0] - 2025-07-24 13:44:42
 
 ### Added
@@ -574,7 +568,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
-[1.40.1]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.40.0...1.40.1
 [1.40.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.39.2...1.40.0
 [1.39.2]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.39.1...1.39.2
 [1.39.1]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.39.0...1.39.1

changelog.yaml

@@ -475,8 +475,3 @@
     added:
     - Added Immigration status from SSN algorithm.
   date: 2025-07-24 13:44:42
-- bump: patch
-  changes:
-    fixed:
-    - Clean up immigration status PR.
-  date: 2025-07-24 14:16:14

policyengine_us_data/datasets/cps/cps.py

@@ -17,7 +17,7 @@
 
 
 test_lite = os.environ.get("TEST_LITE")
-print(3 + 3)
+
 
 class CPS(Dataset):
     name = "cps"
@@ -66,7 +66,6 @@ def generate(self):
             cps,
             person,
             spm_unit,
-            self.time_period,
             undocumented_target=13e6,
             undocumented_workers_target=8.3e6,
             undocumented_students_target=0.21 * 1.9e6,
@@ -707,7 +706,6 @@ def add_ssn_card_type(
     cps: h5py.File,
     person: pd.DataFrame,
     spm_unit: pd.DataFrame,
-    time_period: int,
     undocumented_target: float = 13e6,
     undocumented_workers_target: float = 8.3e6,
     undocumented_students_target: float = 0.21 * 1.9e6,
@@ -1392,7 +1390,7 @@ def get_arrival_year_midpoint(peinusyr):
 
     # Calculate arrival years once for all logic
     arrival_years = get_arrival_year_midpoint(person.PEINUSYR)
-    CURRENT_YEAR = time_period
+    CURRENT_YEAR = 2024
     years_in_us = CURRENT_YEAR - arrival_years
     age_at_entry = np.maximum(0, person.A_AGE - years_in_us)
 
@@ -1416,11 +1414,10 @@ def get_arrival_year_midpoint(peinusyr):
 
     # 3. Cuban / Haitian entrants (created by Congress in 1980)
     # Only those who arrived after 1980
-    CUBAN_HAITIAN_ARRIVAL_CUTOFF = 1980
     cuban_haitian_mask = (
         (ssn_card_type != 0)
         & np.isin(birth, list(COUNTRY_CODES["CUBAN_HAITIAN"]))
-        & (arrival_years >= CUBAN_HAITIAN_ARRIVAL_CUTOFF)
+        & (arrival_years >= 1980)
     )
     immigration_status[cuban_haitian_mask] = "CUBAN_HAITIAN_ENTRANT"
 
@@ -1449,6 +1446,19 @@ def get_arrival_year_midpoint(peinusyr):
     )
     immigration_status[mask] = "TPS"
 
+    # ---------------------------------------------------------------
+    # Map custom labels into Enum-approved buckets
+    placeholder_to_specific_status = {
+        "TEMP_NONQUALIFIED": "TPS",
+    }
+    needs_translation = np.isin(
+        immigration_status, list(placeholder_to_specific_status.keys())
+    )
+    immigration_status[needs_translation] = (
+        pd.Series(immigration_status[needs_translation])
+        .replace(placeholder_to_specific_status)
+        .values
+    )
     # Final write (all values now in ImmigrationStatus Enum)
     cps["immigration_status"] = immigration_status.astype("S")
     # ============================================================================

pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "policyengine_us_data"
-version = "1.40.1"
+version = "1.40.0"
 description = "A package to create representative microdata for the US."
 readme = "README.md"
 authors = [