Merge branch 'develop' into eia

USEPA · May 30, 2024 · 8080c2b · 8080c2b
2 parents 2152009 + d0f71b8
commit 8080c2b
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 7 deletions.
diff --git a/.github/workflows/test_methods.yml b/.github/workflows/test_methods.yml
@@ -57,6 +57,9 @@ jobs:
 
     # install package & dependencies
     - name: Install package and dependencies
+      env:
+        # Temporary fix to avoid git lfs error in fedelemflowlist install https://github.com/git-lfs/git-lfs/issues/5749
+        GIT_CLONE_PROTECTION_ACTIVE: false
       run: |
         pip install .
 

diff --git a/flowsa/data/source_catalog.yaml b/flowsa/data/source_catalog.yaml
@@ -94,7 +94,9 @@ BLS_QCEW:
                     2018: NAICS_2017_Code,
                     2019: NAICS_2017_Code,
                     2020: NAICS_2017_Code,
-                    2021: NAICS_2017_Code}
+                    2021: NAICS_2017_Code,
+                    2022: NAICS_2017_Code,
+                    }
   sector_hierarchy: "parent-completeChild"
 BTS_Airlines:
   data_format: FBA

diff --git a/flowsa/data_source_scripts/BLS_QCEW.py b/flowsa/data_source_scripts/BLS_QCEW.py
@@ -315,3 +315,9 @@ def fill_suppressed(
     )
 
     return aggregated
+
+
+if __name__ == "__main__":
+    import flowsa
+    flowsa.generateflowbyactivity.main(source='BLS_QCEW', year=2022)
+    fba = flowsa.getFlowByActivity('BLS_QCEW', year=2022)
diff --git a/flowsa/methods/flowbyactivitymethods/BLS_QCEW.yaml b/flowsa/methods/flowbyactivitymethods/BLS_QCEW.yaml
@@ -24,3 +24,4 @@ years:
 - 2019
 - 2020
 - 2021
+- 2022
diff --git a/flowsa/methods/flowbysectormethods/Employment_national_2017.yaml b/flowsa/methods/flowbysectormethods/Employment_national_2017.yaml
@@ -1,10 +1,10 @@
 industry_spec:
   default: NAICS_6
-target_naics_year: 2012
+target_naics_year: 2017
 geoscale: national
 
 source_names:
-  "BLS_QCEW": !include:Employment_common.yaml:bls_load_and_clean_national
+  BLS_QCEW: !include:Employment_common.yaml:bls_load_and_clean_national
     year: 2017
     activity_sets:
       qcew: !include:Employment_common.yaml:bls_allocation

diff --git a/flowsa/methods/flowbysectormethods/Employment_national_2018.yaml b/flowsa/methods/flowbysectormethods/Employment_national_2018.yaml
@@ -1,10 +1,10 @@
 industry_spec:
   default: NAICS_6
-target_naics_year: 2012
+target_naics_year: 2017
 geoscale: national
 
 source_names:
-  "BLS_QCEW": !include:Employment_common.yaml:bls_load_and_clean_national
+  BLS_QCEW: !include:Employment_common.yaml:bls_load_and_clean_national
     year: 2018
     activity_sets:
       qcew: !include:Employment_common.yaml:bls_allocation
diff --git a/flowsa/methods/flowbysectormethods/Employment_national_2019.yaml b/flowsa/methods/flowbysectormethods/Employment_national_2019.yaml
@@ -1,6 +1,6 @@
 industry_spec:
   default: NAICS_6
-target_naics_year: 2012
+target_naics_year: 2017
 geoscale: national
 
 source_names:

diff --git a/flowsa/methods/flowbysectormethods/Employment_national_2020.yaml b/flowsa/methods/flowbysectormethods/Employment_national_2020.yaml
@@ -1,6 +1,6 @@
 industry_spec:
   default: NAICS_6
-target_naics_year: 2012
+target_naics_year: 2017
 geoscale: national
 
 source_names:

diff --git a/flowsa/methods/flowbysectormethods/Employment_national_2021.yaml b/flowsa/methods/flowbysectormethods/Employment_national_2021.yaml
@@ -0,0 +1,10 @@
+industry_spec:
+  default: NAICS_6
+target_naics_year: 2017
+geoscale: national
+
+source_names:
+  BLS_QCEW: !include:Employment_common.yaml:bls_load_and_clean_national
+    year: 2021
+    activity_sets:
+      qcew: !include:Employment_common.yaml:bls_allocation
diff --git a/flowsa/methods/flowbysectormethods/Employment_national_2022.yaml b/flowsa/methods/flowbysectormethods/Employment_national_2022.yaml
@@ -0,0 +1,10 @@
+industry_spec:
+  default: NAICS_6
+target_naics_year: 2017
+geoscale: national
+
+source_names:
+  BLS_QCEW: !include:Employment_common.yaml:bls_load_and_clean_national
+    year: 2022
+    activity_sets:
+      qcew: !include:Employment_common.yaml:bls_allocation
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,3 +24,4 @@ years: @@
     - 2019
     - 2020
     - 2021
+    - 2022