From 70cf08e96b83b5f07e33baf13de9b4913218127f Mon Sep 17 00:00:00 2001 From: Dhwani Patel Date: Mon, 17 Jul 2023 16:09:39 -0600 Subject: [PATCH 1/2] Upgrade requirements --- requirements-dev.txt | 29 ++++++++++++++--------------- requirements.txt | 21 +++++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 7b9cc5a4c7..3d27d25e63 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -47,7 +47,7 @@ cryptography==40.0.2 # josepy # mozilla-django-oidc # pyopenssl -distlib==0.3.6 +distlib==0.3.7 # via virtualenv django==1.11.29 # via @@ -82,10 +82,6 @@ filelock==3.4.1 # virtualenv funcparserlib==1.0.0a0 # via mockldap -future==0.18.3 - # via - # -r requirements.txt - # metsrw gearman3==0.2.1 # via -r requirements.txt gevent==22.10.2 @@ -94,7 +90,7 @@ greenlet==2.0.2 # via # -r requirements.txt # gevent -gunicorn==20.1.0 +gunicorn==21.0.1 # via -r requirements.txt idna==3.4 # via @@ -105,6 +101,7 @@ importlib-metadata==4.8.3 # via # -r requirements.txt # click + # gunicorn # jsonschema # pep517 # pluggy @@ -129,13 +126,13 @@ jsonschema==3.2.0 # via -r requirements.txt lazy-paged-sequence==0.3 # via -r requirements.txt -lxml==4.9.2 +lxml==4.9.3 # via # -r requirements.txt # ammcpc # metsrw # python-cas -metsrw==0.3.23 +metsrw==0.4.0 # via -r requirements.txt mockldap @ git+https://github.com/artefactual-labs/mockldap@v0.3.1 # via -r requirements-dev.in @@ -155,6 +152,8 @@ opf-fido==1.6.1 # via -r requirements.txt packaging==21.3 # via + # -r requirements.txt + # gunicorn # pytest # tox pep517==0.13.0 @@ -169,7 +168,7 @@ pluggy==1.0.0 # via # pytest # tox -prometheus-client==0.16.0 +prometheus-client==0.17.1 # via # -r requirements.txt # django-prometheus @@ -190,12 +189,14 @@ pycparser==2.21 # via # -r requirements.txt # cffi -pyopenssl==23.1.1 +pyopenssl==23.2.0 # via # -r requirements.txt # josepy -pyparsing==3.0.9 - # via packaging +pyparsing==3.1.0 + # via + # -r requirements.txt + # packaging pyrsistent==0.18.0 # via # -r requirements.txt @@ -252,7 +253,6 @@ six==1.16.0 # amclient # django-extensions # jsonschema - # metsrw # mozilla-django-oidc # opf-fido # python-cas @@ -276,7 +276,7 @@ typing-extensions==4.1.1 # yarl unidecode==1.3.6 # via -r requirements.txt -urllib3==1.26.15 +urllib3==1.26.16 # via # -r requirements.txt # amclient @@ -320,7 +320,6 @@ setuptools==59.6.0 # via # -r requirements.txt # gevent - # gunicorn # josepy # jsonschema # pip-tools diff --git a/requirements.txt b/requirements.txt index 028e9d8008..63c9cec2c4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -58,15 +58,13 @@ django-tastypie==0.14.3 # via -r requirements.in elasticsearch==6.8.2 # via -r requirements.in -future==0.18.3 - # via metsrw gearman3==0.2.1 # via -r requirements.in gevent==22.10.2 # via -r requirements.in greenlet==2.0.2 # via gevent -gunicorn==20.1.0 +gunicorn==21.0.1 # via -r requirements.in idna==3.4 # via requests @@ -74,6 +72,7 @@ importlib-metadata==4.8.3 # via # -r requirements.in # click + # gunicorn # jsonschema # pep517 importlib-resources==5.4.0 @@ -86,13 +85,13 @@ jsonschema==3.2.0 # via -r requirements.in lazy-paged-sequence==0.3 # via -r requirements.in -lxml==4.9.2 +lxml==4.9.3 # via # -r requirements.in # ammcpc # metsrw # python-cas -metsrw==0.3.23 +metsrw==0.4.0 # via -r requirements.in mozilla-django-oidc==1.2.4 # via -r requirements.in @@ -104,11 +103,13 @@ olefile==0.46 # via opf-fido opf-fido==1.6.1 # via -r requirements.in +packaging==21.3 + # via gunicorn pep517==0.13.0 # via pip-tools pip-tools==6.4.0 # via -r requirements.in -prometheus-client==0.16.0 +prometheus-client==0.17.1 # via # -r requirements.in # django-prometheus @@ -120,8 +121,10 @@ pyasn1-modules==0.3.0 # via python-ldap pycparser==2.21 # via cffi -pyopenssl==23.1.1 +pyopenssl==23.2.0 # via josepy +pyparsing==3.1.0 + # via packaging pyrsistent==0.18.0 # via jsonschema python-cas==1.6.0 @@ -151,7 +154,6 @@ six==1.16.0 # amclient # django-extensions # jsonschema - # metsrw # mozilla-django-oidc # opf-fido # python-cas @@ -162,7 +164,7 @@ typing-extensions==4.1.1 # via importlib-metadata unidecode==1.3.6 # via -r requirements.in -urllib3==1.26.15 +urllib3==1.26.16 # via # amclient # elasticsearch @@ -189,7 +191,6 @@ pip==21.3.1 setuptools==59.6.0 # via # gevent - # gunicorn # josepy # jsonschema # pip-tools From c1be861a5bff8ee3d781e58fc29d831433ff1aee Mon Sep 17 00:00:00 2001 From: Dhwani Patel Date: Mon, 17 Jul 2023 16:33:48 -0600 Subject: [PATCH 2/2] Update submodules --- hack/submodules/archivematica-acceptance-tests | 2 +- hack/submodules/archivematica-storage-service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/submodules/archivematica-acceptance-tests b/hack/submodules/archivematica-acceptance-tests index 0e28e77ca8..96fe940a9e 160000 --- a/hack/submodules/archivematica-acceptance-tests +++ b/hack/submodules/archivematica-acceptance-tests @@ -1 +1 @@ -Subproject commit 0e28e77ca8a4ac524c2396d7f19a2e9c1d7dd636 +Subproject commit 96fe940a9e18f97aae5868fe4c7c6d0b389814d0 diff --git a/hack/submodules/archivematica-storage-service b/hack/submodules/archivematica-storage-service index 11abd8084b..1c274365b1 160000 --- a/hack/submodules/archivematica-storage-service +++ b/hack/submodules/archivematica-storage-service @@ -1 +1 @@ -Subproject commit 11abd8084b0cb08ca03d2b0e1befc36f9bdfcc77 +Subproject commit 1c274365b13a09a0ebcb4d23c97b8fae4cc9d1dc