Fix import errors (#60)

* Fix import error

* Versioning

* Format

* Add missing import

* Format

Author: nikhilwoodruff

.github/workflows/ci_cd.yaml

@@ -81,7 +81,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{github.actor}}

CHANGELOG.md

@@ -5,6 +5,12 @@ 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.4.1] - 2024-09-18 16:30:37
+
+### Fixed
+
+- Import errors in non-dev mode.
+
 ## [1.4.0] - 2024-09-18 03:05:11
 
 ### Added
@@ -75,6 +81,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[1.4.1]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.4.0...1.4.1
 [1.4.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.3.1...1.4.0
 [1.3.1]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.3.0...1.3.1
 [1.3.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.2.1...1.3.0

changelog.yaml

@@ -52,3 +52,8 @@
     changed:
     - Fixed export structure within __init__ files
   date: 2024-09-18 03:05:11
+- bump: patch
+  changes:
+    fixed:
+    - Import errors in non-dev mode.
+  date: 2024-09-18 16:30:37

policyengine_us_data/datasets/cps/enhanced_cps.py

@@ -14,7 +14,11 @@
     CPS_2019,
     CPS_2024,
 )
-import torch
+
+try:
+    import torch
+except ImportError:
+    torch = None
 
 
 def reweight(

policyengine_us_data/datasets/puf/puf.py

@@ -5,7 +5,6 @@
 from policyengine_core.data import Dataset
 from policyengine_us_data.storage import STORAGE_FOLDER
 from .uprate_puf import uprate_puf
-from survey_enhance import Imputation
 from .irs_puf import IRS_PUF_2015
 from policyengine_us_data.utils.uprating import (
     create_policyengine_uprating_factors_table,
@@ -23,6 +22,8 @@ def impute_pension_contributions_to_puf(puf_df):
         ["employment_income", "household_weight", "pre_tax_contributions"]
     )
 
+    from survey_enhance import Imputation
+
     pension_contributions = Imputation()
 
     pension_contributions.train(
@@ -38,6 +39,8 @@ def impute_pension_contributions_to_puf(puf_df):
 def impute_missing_demographics(
     puf: pd.DataFrame, demographics: pd.DataFrame
 ) -> pd.DataFrame:
+    from survey_enhance import Imputation
+
     puf_with_demographics = (
         puf[puf.RECID.isin(demographics.RECID)]
         .merge(demographics, on="RECID")

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "policyengine_us_data"
-version = "1.4.0"
+version = "1.4.1"
 description = "A package to create representative microdata for the US."
 readme = "README.md"
 authors = [
@@ -23,7 +23,6 @@ dev = [
     "black",
     "pytest",
     "policyengine_us==1.71.1",
-    "streamlit",
     "survey_enhance",
     "torch",
     "tables",