From 69bdcf22303713c3e3dc75e672a6c2499c461b79 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Mon, 22 Apr 2024 22:11:26 -0400 Subject: [PATCH 1/3] add 2021 and 2022 employment fbs --- flowsa/data/source_catalog.yaml | 4 +++- flowsa/data_source_scripts/BLS_QCEW.py | 6 ++++++ flowsa/methods/flowbyactivitymethods/BLS_QCEW.yaml | 1 + .../flowbysectormethods/Employment_national_2021.yaml | 10 ++++++++++ .../flowbysectormethods/Employment_national_2022.yaml | 10 ++++++++++ 5 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 flowsa/methods/flowbysectormethods/Employment_national_2021.yaml create mode 100644 flowsa/methods/flowbysectormethods/Employment_national_2022.yaml diff --git a/flowsa/data/source_catalog.yaml b/flowsa/data/source_catalog.yaml index f67064425..33a73bc43 100644 --- 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 index 78b6bde6f..c2c2ddb53 100644 --- 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 index 07b0b7505..b7a99cd13 100644 --- 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_2021.yaml b/flowsa/methods/flowbysectormethods/Employment_national_2021.yaml new file mode 100644 index 000000000..c6749778d --- /dev/null +++ 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 new file mode 100644 index 000000000..87da1f1fc --- /dev/null +++ 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 From aed269b977bc61b2b9c9ff788c9e39ff3f899c90 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 22 May 2024 13:15:30 -0400 Subject: [PATCH 2/3] update employment FBS to 2017 NAICS year --- .../methods/flowbysectormethods/Employment_national_2017.yaml | 4 ++-- .../methods/flowbysectormethods/Employment_national_2018.yaml | 4 ++-- .../methods/flowbysectormethods/Employment_national_2019.yaml | 2 +- .../methods/flowbysectormethods/Employment_national_2020.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flowsa/methods/flowbysectormethods/Employment_national_2017.yaml b/flowsa/methods/flowbysectormethods/Employment_national_2017.yaml index d0782639b..b54b95b36 100644 --- 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 index c9e1e26db..909036bc0 100644 --- 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 index 3cc73d684..9972de34c 100644 --- 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 index 1c8feff34..11179d1b9 100644 --- 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: From c3cec36ceb048f5f5b3207cbef81676f1bf4b11e Mon Sep 17 00:00:00 2001 From: Ben Young Date: Tue, 28 May 2024 16:17:26 -0400 Subject: [PATCH 3/3] replicate fix for git lfs issue (see fe5dbb4) --- .github/workflows/test_methods.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test_methods.yml b/.github/workflows/test_methods.yml index 60cd0b3c2..6fe12f1ea 100644 --- 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 .