Merge pull request #741 from GSA/requirement-patches

[Snyk + GH Actions] Update requirements

.github/workflows/commit.yml

@@ -34,7 +34,7 @@ jobs:
       - name: test
         run: make build test
       - name: test extension
-        run: make test_extension
+        run: make test-extension
       - name: cypress-artifacts
         uses: actions/upload-artifact@v3
         if: failure()

Makefile

@@ -8,6 +8,12 @@ build:
 clean:
 	docker compose down -v --remove-orphans
 
+clear-solr-volume:
+	# Destructive
+	docker stop $(shell docker volume rm catalogdatagov_solr_data 2>&1 | cut -d "[" -f2 | cut -d "]" -f1)
+	docker rm $(shell docker volume rm catalogdatagov_solr_data 2>&1 | cut -d "[" -f2 | cut -d "]" -f1)
+	docker volume rm catalogdatagov_solr_data
+
 cypress:
 	# Turn on local system, and open cypress in interactive mode
 	docker compose up -d && cd e2e && npm install && npm run test
@@ -17,33 +23,27 @@ debug:
 	# so that we have interactive console access for the debugger.
 	docker compose stop ckan ; docker compose run --service-ports ckan
 
-requirements:
-	docker compose run --rm -T ckan /app/bin/requirements.sh
-
 lint:
 	flake8 . --count --show-source --statistics
 
+requirements:
+	docker compose run --rm -T ckan /app/bin/requirements.sh
+
 restart:
 	docker compose restart ckan
 
-test-build:
-	docker compose -f docker-compose.yml -f docker-compose.test.yml build
-
 test:
 	docker compose -f docker-compose.yml -f docker-compose.test.yml up --abort-on-container-exit test
 
-test_extension:
-	docker compose run --rm -T ckan pytest --cov=ckanext.datagov_inventory --disable-warnings /app/ckanext/datagov_inventory/tests/
-
-up:
-	docker compose up $(ARGS)
+test-build:
+	docker compose -f docker-compose.yml -f docker-compose.test.yml build
 
-clear-solr-volume:
-	# Destructive
-	docker stop $(shell docker volume rm catalogdatagov_solr_data 2>&1 | cut -d "[" -f2 | cut -d "]" -f1)
-	docker rm $(shell docker volume rm catalogdatagov_solr_data 2>&1 | cut -d "[" -f2 | cut -d "]" -f1)
-	docker volume rm catalogdatagov_solr_data
+test-extension:
+	docker compose run --rm -T ckan pytest --cov=ckanext.datagov_inventory --disable-warnings /app/ckanext/datagov_inventory/tests/
 
 unlock-solr-volume:
 	# Corruptible
 	docker compose run solr /bin/bash -c "rm -rf /var/solr/data/ckan/data/index/write.lock"
+
+up:
+	docker compose up $(ARGS)

docker-compose.test.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   ckan:
     environment:

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   ckan:
     image: datagov/inventory-app:2.10.4

requirements.in.txt

@@ -85,7 +85,6 @@ wheel==0.42.0
 # avoid ImportError error https://github.com/GSA/data.gov/issues/4396
 importlib-resources<6.0
 gevent>=23.9.0
-urllib3~=1.26.17
 cryptography>=42.0.4
 pip>=23.3
 jinja2>=3.1.4
@@ -95,3 +94,5 @@ pyparsing # need to avoid solr missing module error on cloud.gov
 # duplicate Werkzeug[watchdog]==2.0.3 requrements from ckan list
 # so that snyk doesn't complain about the version mismatch
 Werkzeug==2.0.3
+urllib3>=2.2.2
+

requirements.txt

@@ -5,9 +5,9 @@ Babel==2.10.3
 Beaker==1.11.0
 bleach==5.0.1
 blinker==1.5
-boto3==1.34.111
-botocore==1.34.111
-certifi==2024.2.2
+boto3==1.34.130
+botocore==1.34.130
+certifi==2024.6.2
 cffi==1.16.0
 chardet==5.2.0
 charset-normalizer==3.3.2
@@ -22,7 +22,7 @@ ckanext-usmetadata==0.3.2
 -e git+https://github.com/ckan/ckanext-xloader.git@dd475e70255da1e46b93e2193bf3e20f2e694db5#egg=ckanext_xloader
 ckantoolkit==0.0.7
 click==8.1.3
-cryptography==42.0.7
+cryptography==42.0.8
 defusedxml==0.7.1
 dominate==2.7.0
 elementpath==4.4.0
@@ -38,7 +38,7 @@ greenlet==2.0.2
 gunicorn==22.0.0
 html5lib==1.1
 idna==3.7
-ijson==3.2.3
+ijson==3.3.0
 importlib-resources==5.13.0
 itsdangerous==2.0.1
 Jinja2==3.1.4
@@ -54,10 +54,10 @@ MarkupSafe==2.0.1
 messytables==0.15.2
 mypy==1.10.0
 mypy-extensions==1.0.0
-newrelic==9.9.1
+newrelic==9.11.0
 nose==1.3.7
-openpyxl==3.1.2
-packaging==24.0
+openpyxl==3.1.4
+packaging==24.1
 passlib==1.7.4
 pika==1.3.2
 pip==24.0
@@ -75,8 +75,8 @@ pytz==2024.1
 pytz-deprecation-shim==0.1.0.post0
 PyUtilib==6.0.0
 PyYAML==6.0.1
-redis==5.0.4
-requests==2.32.2
+redis==5.0.6
+requests==2.32.3
 rfc3987==1.3.8
 rq==1.11.0
 s3transfer==0.10.1
@@ -94,8 +94,8 @@ tzdata==2024.1
 tzlocal==4.2
 unicodecsv==0.14.1
 Unidecode==1.0.22
-urllib3==1.26.18
-watchdog==4.0.0
+urllib3==2.2.2
+watchdog==4.0.1
 webassets==2.0
 webencodings==0.5.1
 Werkzeug==2.0.3

setup.py

@@ -40,7 +40,7 @@
         'Development Status :: 4 - Beta',
 
         # Pick your license as you wish (should match "license" above)
-        'License :: OSI Approved :: GNU Affero General Public License'\
+        'License :: OSI Approved :: GNU Affero General Public License'
             ' v3 or later (AGPLv3+)',
 
         # Specify the Python versions you support here. In particular, ensure