From 40401eb7bcf8f6feff7305f28f3eabfe44a6b99c Mon Sep 17 00:00:00 2001 From: Jin-Sun-tts Date: Tue, 31 Dec 2024 11:37:44 -0500 Subject: [PATCH 1/7] upgrade jinja to version 3.1.5 --- requirements.in.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in.txt b/requirements.in.txt index 3af5f52f..a0d714b0 100644 --- a/requirements.in.txt +++ b/requirements.in.txt @@ -86,7 +86,7 @@ wheel==0.42.0 importlib-resources<6.0 cryptography>42.0.4 pip>=23.3 -jinja2>=3.1.4 +jinja2>=3.1.5 # fix for https://security.snyk.io/vuln/SNYK-PYTHON-GEVENT-8320934 gevent>=24.10.1 diff --git a/requirements.txt b/requirements.txt index b026fe10..2fcbe4d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,7 +41,7 @@ idna==3.10 ijson==3.3.0 importlib-resources==5.13.0 itsdangerous==2.0.1 -Jinja2==3.1.4 +Jinja2==3.1.5 jmespath==1.0.1 json-table-schema==0.2.1 jsonlines==4.0.0 From 9d70816a8567e372d6880ace4247cdd8f5ec4ec8 Mon Sep 17 00:00:00 2001 From: Tim Lowden Date: Tue, 31 Dec 2024 13:20:41 -0500 Subject: [PATCH 2/7] Adding USDA OCIO as a publisher --- config/data/inventory_publishers.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/config/data/inventory_publishers.csv b/config/data/inventory_publishers.csv index e4f1b304..332b0b65 100644 --- a/config/data/inventory_publishers.csv +++ b/config/data/inventory_publishers.csv @@ -15,6 +15,7 @@ department-of-agriculture,Department of Agriculture,GIPSA,Federal Grain Inspecti department-of-agriculture,Department of Agriculture,National Institute of Food and Agriculture,,,, department-of-agriculture,Department of Agriculture,National Agricultural Statistics Service,,,, department-of-agriculture,Department of Agriculture,Natural Resources Conservation Service,Colorado State University,,, +department-of-agriculture,Department of Agriculture,Office of the Chief Information Officer,,,, department-of-agriculture,Department of Agriculture,Rural Development,,,, department-of-agriculture,Department of Agriculture,US Forest Service,,,, department-of-commerce,Department of Commerce,Bureau of Industry and Security,,,, From f0298ad7b71976ca881bf06406894d51bbda4b78 Mon Sep 17 00:00:00 2001 From: Fuhu Xia Date: Thu, 2 Jan 2025 09:15:57 -0500 Subject: [PATCH 3/7] update requirements --- requirements.txt | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2fcbe4d0..dd5aad6b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ alembic==1.8.1 -async-timeout==5.0.0 -attrs==24.2.0 +async-timeout==5.0.1 +attrs==24.3.0 Babel==2.10.3 Beaker==1.11.0 bleach==5.0.1 blinker==1.5 -boto3==1.35.53 -botocore==1.35.53 -certifi==2024.8.30 +boto3==1.35.90 +botocore==1.35.90 +certifi==2024.12.14 cffi==1.17.1 chardet==5.2.0 -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 ckan @ git+https://github.com/GSA/ckan.git@8c4a517efeac80db098cc6ba144cb742bbeca194 ckanext-datajson==0.1.27 ckanext-dcat-usmetadata==0.6.0 @@ -19,13 +19,13 @@ ckanext-googleanalyticsbasic==0.2.1 ckanext-s3filestore @ git+https://github.com/keitaroinc/ckanext-s3filestore.git@caf88c0352ffe7b4432d3d55ddfb0a71249ceddd ckanext-saml2auth @ git+https://github.com/GSA/ckanext-saml2auth.git@387cfc1c6a7619f670bf387384f2634516de5844 ckanext-usmetadata==0.3.2 --e git+https://github.com/ckan/ckanext-xloader.git@6b6895990a7b3497b274afe4e83e3db794d9dd69#egg=ckanext_xloader +-e git+https://github.com/ckan/ckanext-xloader.git@dbc7a3c870a0a7c1c115dcfdde0c4a2a89867565#egg=ckanext_xloader ckantoolkit==0.0.7 click==8.1.3 -cryptography==43.0.3 +cryptography==44.0.0 defusedxml==0.7.1 dominate==2.7.0 -elementpath==4.6.0 +elementpath==4.7.0 et_xmlfile==2.0.0 feedgen==0.9.0 Flask==2.0.3 @@ -33,7 +33,7 @@ Flask-Babel==1.0.0 Flask-Login==0.6.1 flask-multistatic==1.0 Flask-WTF==1.0.1 -gevent==24.10.3 +gevent==24.11.1 greenlet==3.1.1 gunicorn==23.0.0 html5lib==1.1 @@ -48,13 +48,13 @@ jsonlines==4.0.0 jsonschema==2.4.0 linear-tsv==1.1.0 lxml==4.9.1 -Mako==1.3.6 +Mako==1.3.8 Markdown==3.4.1 MarkupSafe==2.0.1 messytables==0.15.2 mypy==1.10.1 mypy-extensions==1.0.0 -newrelic==10.2.0 +newrelic==10.4.0 nose==1.3.7 openpyxl==3.1.5 packaging==24.1 @@ -65,7 +65,7 @@ polib==1.1.1 psycopg2==2.9.3 pycparser==2.22 PyJWT==2.4.0 -pyOpenSSL==24.2.1 +pyOpenSSL==24.3.0 pyparsing==3.1.2 pysaml2==7.3.1 pysolr==3.9.0 @@ -75,26 +75,26 @@ pytz==2024.2 pytz-deprecation-shim==0.1.0.post0 PyUtilib==6.0.0 PyYAML==6.0.1 -redis==5.2.0 +redis==5.2.1 requests==2.32.3 rfc3987==1.3.8 rq==1.11.0 -s3transfer==0.10.3 +s3transfer==0.10.4 sansjson==0.3.0 setuptools==71.0.4 simplejson==3.18.0 -six==1.16.0 +six==1.17.0 SQLAlchemy==1.4.41 sqlalchemy2-stubs==0.0.2a38 sqlparse==0.5.0 tabulator==1.53.5 -tomli==2.0.2 +tomli==2.2.1 typing_extensions==4.3.0 tzdata==2024.2 tzlocal==4.2 unicodecsv==0.14.1 Unidecode==1.0.22 -urllib3==2.2.3 +urllib3==2.3.0 watchdog==6.0.0 webassets==2.0 webencodings==0.5.1 From 4fb803c4b5f9f6827b17a3e159dea9311e32b45b Mon Sep 17 00:00:00 2001 From: Fuhu Xia Date: Thu, 2 Jan 2025 12:12:05 -0500 Subject: [PATCH 4/7] fix usda-gov --- config/data/inventory_publishers.csv | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/config/data/inventory_publishers.csv b/config/data/inventory_publishers.csv index 332b0b65..668fd2ba 100644 --- a/config/data/inventory_publishers.csv +++ b/config/data/inventory_publishers.csv @@ -2,22 +2,22 @@ agricultural-marketing-service-department-of-agriculture,Department of Agriculture,Agricultural Marketing Service,,,, alcohol-and-tobacco-tax-and-trade-bureau-ttb,Alcohol and Tobacco Tax and Trade Bureau (TTB),Alcohol and Tobacco Tax and Trade Bureau,,,, consumer-financial-protection-bureau,Consumer Financial Protection Bureau,,,,, -department-of-agriculture,Department of Agriculture,Agricultural Marketing Service,,,, -department-of-agriculture,Department of Agriculture,Agricultural Research Service,,,, -department-of-agriculture,Department of Agriculture,Animal and Plant Health Inspection Service,,,, -department-of-agriculture,Department of Agriculture,Departmental Management,,,, -department-of-agriculture,Department of Agriculture,Economic Research Service,,,, -department-of-agriculture,Department of Agriculture,Farm Service Agency,,,, -department-of-agriculture,Department of Agriculture,Food and Nutrition Service,,,, -department-of-agriculture,Department of Agriculture,Food Safety and Inspection Service,,,, -department-of-agriculture,Department of Agriculture,Foreign Agricultural Service,,,, -department-of-agriculture,Department of Agriculture,GIPSA,Federal Grain Inspection Service,,, -department-of-agriculture,Department of Agriculture,National Institute of Food and Agriculture,,,, -department-of-agriculture,Department of Agriculture,National Agricultural Statistics Service,,,, -department-of-agriculture,Department of Agriculture,Natural Resources Conservation Service,Colorado State University,,, -department-of-agriculture,Department of Agriculture,Office of the Chief Information Officer,,,, -department-of-agriculture,Department of Agriculture,Rural Development,,,, -department-of-agriculture,Department of Agriculture,US Forest Service,,,, +usda-gov,Department of Agriculture,Agricultural Marketing Service,,,, +usda-gov,Department of Agriculture,Agricultural Research Service,,,, +usda-gov,Department of Agriculture,Animal and Plant Health Inspection Service,,,, +usda-gov,Department of Agriculture,Departmental Management,,,, +usda-gov,Department of Agriculture,Economic Research Service,,,, +usda-gov,Department of Agriculture,Farm Service Agency,,,, +usda-gov,Department of Agriculture,Food and Nutrition Service,,,, +usda-gov,Department of Agriculture,Food Safety and Inspection Service,,,, +usda-gov,Department of Agriculture,Foreign Agricultural Service,,,, +usda-gov,Department of Agriculture,GIPSA,Federal Grain Inspection Service,,, +usda-gov,Department of Agriculture,National Institute of Food and Agriculture,,,, +usda-gov,Department of Agriculture,National Agricultural Statistics Service,,,, +usda-gov,Department of Agriculture,Natural Resources Conservation Service,Colorado State University,,, +usda-gov,Department of Agriculture,Office of the Chief Information Officer,,,, +usda-gov,Department of Agriculture,Rural Development,,,, +usda-gov,Department of Agriculture,US Forest Service,,,, department-of-commerce,Department of Commerce,Bureau of Industry and Security,,,, department-of-commerce,Department of Commerce,Bureau of Economic Analysis,,,, department-of-commerce,Department of Commerce,International Trade Administration,,,, From 7014e4f156a2275f725713a044307dfce9024dec Mon Sep 17 00:00:00 2001 From: Fuhu Xia Date: Thu, 2 Jan 2025 12:54:08 -0500 Subject: [PATCH 5/7] Revert "update requirements" This reverts commit f0298ad7b71976ca881bf06406894d51bbda4b78. --- requirements.txt | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index dd5aad6b..2fcbe4d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ alembic==1.8.1 -async-timeout==5.0.1 -attrs==24.3.0 +async-timeout==5.0.0 +attrs==24.2.0 Babel==2.10.3 Beaker==1.11.0 bleach==5.0.1 blinker==1.5 -boto3==1.35.90 -botocore==1.35.90 -certifi==2024.12.14 +boto3==1.35.53 +botocore==1.35.53 +certifi==2024.8.30 cffi==1.17.1 chardet==5.2.0 -charset-normalizer==3.4.1 +charset-normalizer==3.4.0 ckan @ git+https://github.com/GSA/ckan.git@8c4a517efeac80db098cc6ba144cb742bbeca194 ckanext-datajson==0.1.27 ckanext-dcat-usmetadata==0.6.0 @@ -19,13 +19,13 @@ ckanext-googleanalyticsbasic==0.2.1 ckanext-s3filestore @ git+https://github.com/keitaroinc/ckanext-s3filestore.git@caf88c0352ffe7b4432d3d55ddfb0a71249ceddd ckanext-saml2auth @ git+https://github.com/GSA/ckanext-saml2auth.git@387cfc1c6a7619f670bf387384f2634516de5844 ckanext-usmetadata==0.3.2 --e git+https://github.com/ckan/ckanext-xloader.git@dbc7a3c870a0a7c1c115dcfdde0c4a2a89867565#egg=ckanext_xloader +-e git+https://github.com/ckan/ckanext-xloader.git@6b6895990a7b3497b274afe4e83e3db794d9dd69#egg=ckanext_xloader ckantoolkit==0.0.7 click==8.1.3 -cryptography==44.0.0 +cryptography==43.0.3 defusedxml==0.7.1 dominate==2.7.0 -elementpath==4.7.0 +elementpath==4.6.0 et_xmlfile==2.0.0 feedgen==0.9.0 Flask==2.0.3 @@ -33,7 +33,7 @@ Flask-Babel==1.0.0 Flask-Login==0.6.1 flask-multistatic==1.0 Flask-WTF==1.0.1 -gevent==24.11.1 +gevent==24.10.3 greenlet==3.1.1 gunicorn==23.0.0 html5lib==1.1 @@ -48,13 +48,13 @@ jsonlines==4.0.0 jsonschema==2.4.0 linear-tsv==1.1.0 lxml==4.9.1 -Mako==1.3.8 +Mako==1.3.6 Markdown==3.4.1 MarkupSafe==2.0.1 messytables==0.15.2 mypy==1.10.1 mypy-extensions==1.0.0 -newrelic==10.4.0 +newrelic==10.2.0 nose==1.3.7 openpyxl==3.1.5 packaging==24.1 @@ -65,7 +65,7 @@ polib==1.1.1 psycopg2==2.9.3 pycparser==2.22 PyJWT==2.4.0 -pyOpenSSL==24.3.0 +pyOpenSSL==24.2.1 pyparsing==3.1.2 pysaml2==7.3.1 pysolr==3.9.0 @@ -75,26 +75,26 @@ pytz==2024.2 pytz-deprecation-shim==0.1.0.post0 PyUtilib==6.0.0 PyYAML==6.0.1 -redis==5.2.1 +redis==5.2.0 requests==2.32.3 rfc3987==1.3.8 rq==1.11.0 -s3transfer==0.10.4 +s3transfer==0.10.3 sansjson==0.3.0 setuptools==71.0.4 simplejson==3.18.0 -six==1.17.0 +six==1.16.0 SQLAlchemy==1.4.41 sqlalchemy2-stubs==0.0.2a38 sqlparse==0.5.0 tabulator==1.53.5 -tomli==2.2.1 +tomli==2.0.2 typing_extensions==4.3.0 tzdata==2024.2 tzlocal==4.2 unicodecsv==0.14.1 Unidecode==1.0.22 -urllib3==2.3.0 +urllib3==2.2.3 watchdog==6.0.0 webassets==2.0 webencodings==0.5.1 From 349d26787b23de3d26b5e378900d34f6c11d09f5 Mon Sep 17 00:00:00 2001 From: Tim Lowden Date: Tue, 7 Jan 2025 13:31:26 -0500 Subject: [PATCH 6/7] add PPPO to Energy publishers --- config/data/inventory_publishers.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/config/data/inventory_publishers.csv b/config/data/inventory_publishers.csv index 668fd2ba..febea006 100644 --- a/config/data/inventory_publishers.csv +++ b/config/data/inventory_publishers.csv @@ -75,6 +75,7 @@ department-of-energy,Department of Energy,Office of Science,,,, department-of-energy,Department of Energy,Office of Scientific and Technical Information,,,, department-of-energy,Department of Energy,Office of State and Community Energy Programs,,,, department-of-energy,Department of Energy,Office of Technology Transitions,,,, +department-of-energy,Department of Energy,Paducah Portsmouth Project Office,,,, department-of-energy,Department of Energy,Public Affairs,,,, department-of-energy,Department of Energy,Richland Operations and the Office of River Protection,,,, department-of-energy,Department of Energy,Small and Disadvantaged Business Utilization,,,, From 8c25afc2d8e4b4ea930554bcdd40c58729828153 Mon Sep 17 00:00:00 2001 From: Tim Lowden Date: Tue, 7 Jan 2025 14:39:22 -0500 Subject: [PATCH 7/7] Add PPPO to publishers --- config/data/inventory_publishers.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/config/data/inventory_publishers.csv b/config/data/inventory_publishers.csv index febea006..b5cc7eba 100644 --- a/config/data/inventory_publishers.csv +++ b/config/data/inventory_publishers.csv @@ -173,6 +173,7 @@ office-of-management-and-budget,Office of Management and Budget,,,,, office-of-personnel-management,Office of Personnel Management,,,,, onhir-gov,Office of Navajo and Hopi Indian Relocation,,,,, osc,Office of Special Counsel,,,,, +paducah-portsmouth-project-office,Paducah Portsmouth Project Office,,,, pension-benefit-guaranty-corp,Pension Benefit Guaranty Corporation,,,,, railroad-retirement-board,Railroad Retirement Board,,,,, sec-gov,Securities and Exchange Commission,,,,,