From d2dca9fc24b664752dba62e2767bd891a9a69e59 Mon Sep 17 00:00:00 2001 From: nickumia-reisys Date: Sat, 16 Mar 2024 12:16:08 +0000 Subject: [PATCH 1/2] Update Pip Requirements --- ckan/requirements.in | 2 +- ckan/requirements.txt | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ckan/requirements.in b/ckan/requirements.in index d5b01dda..a7fc71a1 100644 --- a/ckan/requirements.in +++ b/ckan/requirements.in @@ -1,5 +1,4 @@ # CKAN requirements and extensions -ckan==2.10.1 git+https://github.com/ckan/ckanext-dcat@master#egg=ckanext-dcat -e git+https://github.com/ckan/ckanext-harvest.git@v1.5.6#egg=ckanext-harvest -e git+https://github.com/ckan/ckanext-googleanalytics.git@master#egg=ckanext-googleanalytics @@ -125,3 +124,4 @@ importlib-resources<6.0 gevent>=23.9.0 jinja2>=3.1.3 cryptography>=42.0.4 +ckan>=2.10.4 diff --git a/ckan/requirements.txt b/ckan/requirements.txt index ed48ce45..649b5d42 100644 --- a/ckan/requirements.txt +++ b/ckan/requirements.txt @@ -4,18 +4,18 @@ Babel==2.10.3 Beaker==1.11.0 bleach==3.3.0 blinker==1.5 -boto3==1.34.48 -botocore==1.34.48 +boto3==1.34.64 +botocore==1.34.64 certifi==2024.2.2 cffi==1.16.0 chardet==5.2.0 charset-normalizer==3.3.2 -ckan==2.10.1 +ckan==2.10.4 -e git+https://github.com/ckan/ckanext-archiver.git@cbfadf9fbf10405958fdef9f77a7faedc05aa20b#egg=ckanext_archiver ckanext-datagovcatalog==0.1.0 -ckanext-datagovtheme==0.2.15 +ckanext-datagovtheme==0.2.16 ckanext-datajson==0.1.23 -ckanext-dcat @ git+https://github.com/ckan/ckanext-dcat@1109205069dd105dda27e3486898e4ca1525a808 +ckanext-dcat @ git+https://github.com/ckan/ckanext-dcat@e2183dd13bf2dbb0532281d84225f909b8362dd3 ckanext-envvars==0.0.3 ckanext-geodatagov==0.2.8 -e git+https://github.com/ckan/ckanext-googleanalytics.git@24d9a7ff62235bc2d543e6594f7362763411b0f9#egg=ckanext_googleanalytics @@ -26,10 +26,10 @@ ckanext-saml2auth @ git+https://github.com/GSA/ckanext-saml2auth.git@4d59366423e -e git+https://github.com/ckan/ckanext-spatial.git@938308469892e4bcf7389cb4adee5ccdd5a0ccca#egg=ckanext_spatial ckantoolkit==0.0.7 click==8.1.3 -cryptography==42.0.4 +cryptography==42.0.5 defusedxml==0.7.1 dominate==2.7.0 -elementpath==4.3.0 +elementpath==4.4.0 feedgen==0.9.0 Flask==2.0.3 Flask-Babel==1.0.0 @@ -48,8 +48,8 @@ gunicorn==21.2.0 html5lib==1.1 httplib2==0.22.0 idna==3.6 -importlib-metadata==7.0.1 importlib-resources==5.13.0 +importlib_metadata==7.0.2 isodate==0.6.1 itsdangerous==2.1.2 Jinja2==3.1.3 @@ -61,14 +61,14 @@ Mako==1.3.2 Markdown==3.4.1 MarkupSafe==2.1.5 messytables==0.15.2 -mypy==1.8.0 +mypy==1.9.0 mypy-extensions==1.0.0 -newrelic==9.7.0 +newrelic==9.7.1 nose==1.3.7 numpy==1.26.4 oauth2client==4.1.3 -OWSLib==0.29.3 -packaging==23.2 +OWSLib==0.30.0 +packaging==24.0 passlib==1.7.4 PasteDeploy==2.0.1 pathtools==0.1.2 @@ -83,12 +83,12 @@ pyasn1==0.5.1 pyasn1-modules==0.3.0 pycparser==2.21 PyJWT==2.4.0 -pyOpenSSL==24.0.0 -pyparsing==3.1.1 +pyOpenSSL==24.1.0 +pyparsing==3.1.2 pyproj==3.4.1 pysaml2==7.0.1 pysolr==3.9.0 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 python-magic==0.4.27 python-utils==3.8.2 pytz==2024.1 @@ -97,12 +97,12 @@ PyUtilib==6.0.0 PyYAML==6.0 PyZ3950 @ git+https://github.com/danizen/PyZ3950@6d44a4ab85c8bda3a7542c2c9efdfad46c830219 rdflib==6.1.1 -redis==5.0.1 +redis==5.0.3 requests==2.31.0 rfc3987==1.3.8 rq==1.11.0 rsa==4.9 -s3transfer==0.10.0 +s3transfer==0.10.1 sansjson==0.3.0 setuptools==67.1.0 shapely==2.0.1 @@ -112,7 +112,7 @@ SQLAlchemy==1.4.41 sqlalchemy2-stubs==0.0.2a38 sqlparse==0.4.4 tomli==2.0.1 -typing_extensions==4.9.0 +typing_extensions==4.10.0 tzdata==2024.1 tzlocal==4.2 uritemplate==3.0.1 @@ -123,7 +123,7 @@ Werkzeug==2.0.0 wheel==0.42.0 WTForms==3.1.2 xlrd==2.0.1 -xmlschema==3.0.2 -zipp==3.17.0 +xmlschema==3.1.0 +zipp==3.18.1 zope.event==5.0 zope.interface==6.2 From a795156762bd1d3729a90731528d954d628b65b9 Mon Sep 17 00:00:00 2001 From: Fuhu Xia Date: Mon, 18 Mar 2024 10:08:58 -0400 Subject: [PATCH 2/2] add snyk exceptions, hold ckan 2.10.4 --- ckan/.snyk | 19 ++++++++++++------- ckan/requirements.in | 2 +- ckan/requirements.txt | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ckan/.snyk b/ckan/.snyk index 4de2b85d..a98eab5d 100644 --- a/ckan/.snyk +++ b/ckan/.snyk @@ -51,13 +51,6 @@ ignore: https://github.com/GSA/data.gov/issues/4532 expires: 2024-02-08T00:00:00.000Z created: 2023-11-16T20:31:20.590Z - SNYK-PYTHON-CKAN-6124881: - - '*': - reason: >- - Remediation blocked by CKAN upgrade to 2.10.3: - https://github.com/GSA/data.gov/issues/4571 - expires: 2024-03-14T00:00:00.000Z - created: 2023-12-14T00:00:00.000Z SNYK-PYTHON-CRYPTOGRAPHY-6126975: - '*': reason: >- @@ -91,4 +84,16 @@ ignore: No remediation available yet; Issue tracked in github: https://github.com/GSA/data.gov/issues/4590 expires: 2024-04-10T19:29:54.032Z + SNYK-PYTHON-CKAN-6124881: + - '*': + reason: >- + Work in progress. Issue tracked in github: + https://github.com/GSA/data.gov/issues/4571 + expires: 2024-03-31T19:29:54.032Z + SNYK-PYTHON-CKAN-6437666: + - '*': + reason: >- + Work in progress. Issue tracked in github: + https://github.com/GSA/data.gov/issues/4659 + expires: 2024-03-31T19:29:54.032Z patch: {} diff --git a/ckan/requirements.in b/ckan/requirements.in index a7fc71a1..d5b01dda 100644 --- a/ckan/requirements.in +++ b/ckan/requirements.in @@ -1,4 +1,5 @@ # CKAN requirements and extensions +ckan==2.10.1 git+https://github.com/ckan/ckanext-dcat@master#egg=ckanext-dcat -e git+https://github.com/ckan/ckanext-harvest.git@v1.5.6#egg=ckanext-harvest -e git+https://github.com/ckan/ckanext-googleanalytics.git@master#egg=ckanext-googleanalytics @@ -124,4 +125,3 @@ importlib-resources<6.0 gevent>=23.9.0 jinja2>=3.1.3 cryptography>=42.0.4 -ckan>=2.10.4 diff --git a/ckan/requirements.txt b/ckan/requirements.txt index 649b5d42..65e422d6 100644 --- a/ckan/requirements.txt +++ b/ckan/requirements.txt @@ -10,7 +10,7 @@ certifi==2024.2.2 cffi==1.16.0 chardet==5.2.0 charset-normalizer==3.3.2 -ckan==2.10.4 +ckan==2.10.1 -e git+https://github.com/ckan/ckanext-archiver.git@cbfadf9fbf10405958fdef9f77a7faedc05aa20b#egg=ckanext_archiver ckanext-datagovcatalog==0.1.0 ckanext-datagovtheme==0.2.16