From b512f378a59d0abf97a16efc3e55667f7df9d742 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 12 Apr 2024 16:16:19 -0400 Subject: [PATCH] fix: Add a backports.zoneinfo environment marker. The user_retirement scripts pull this requirement so we set an environment marker so we can run the tests on newer versions of python. --- scripts/user_retirement/requirements/base.txt | 64 +++++++------- .../user_retirement/requirements/testing.in | 7 ++ .../user_retirement/requirements/testing.txt | 88 ++++++++++--------- 3 files changed, 86 insertions(+), 73 deletions(-) diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 11374b34a454..4f78e8a31f53 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -4,7 +4,7 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via django attrs==23.2.0 # via zeep @@ -14,15 +14,15 @@ backports-zoneinfo==0.2.1 # via # django # pendulum -boto3==1.34.26 +boto3==1.34.84 # via -r scripts/user_retirement/requirements/base.in -botocore==1.34.26 +botocore==1.34.84 # via # boto3 # s3transfer -cachetools==5.3.2 +cachetools==5.3.3 # via google-auth -certifi==2023.11.17 +certifi==2024.2.2 # via requests cffi==1.16.0 # via @@ -34,9 +34,9 @@ click==8.1.7 # via # -r scripts/user_retirement/requirements/base.in # edx-django-utils -cryptography==42.0.0 +cryptography==42.0.5 # via simple-salesforce -django==4.2.9 +django==4.2.11 # via # django-crum # django-waffle @@ -49,26 +49,26 @@ edx-django-utils==5.12.0 # via edx-rest-api-client edx-rest-api-client==5.7.0 # via -r scripts/user_retirement/requirements/base.in -google-api-core==2.15.0 +google-api-core==2.18.0 # via google-api-python-client -google-api-python-client==2.115.0 +google-api-python-client==2.125.0 # via -r scripts/user_retirement/requirements/base.in -google-auth==2.26.2 +google-auth==2.29.0 # via # google-api-core # google-api-python-client # google-auth-httplib2 google-auth-httplib2==0.2.0 # via google-api-python-client -googleapis-common-protos==1.62.0 +googleapis-common-protos==1.63.0 # via google-api-core httplib2==0.22.0 # via # google-api-python-client # google-auth-httplib2 -idna==3.6 +idna==3.7 # via requests -importlib-resources==6.1.1 +importlib-resources==6.4.0 # via pendulum isodate==0.6.1 # via zeep @@ -78,31 +78,34 @@ jmespath==1.0.1 # via # boto3 # botocore -lxml==4.9.3 +lxml==5.2.1 # via zeep more-itertools==10.2.0 # via simple-salesforce -newrelic==9.5.0 +newrelic==9.8.0 # via edx-django-utils pbr==6.0.0 # via stevedore pendulum==3.0.0 # via simple-salesforce -platformdirs==4.1.0 +platformdirs==4.2.0 # via zeep -protobuf==4.25.2 +proto-plus==1.23.0 + # via google-api-core +protobuf==4.25.3 # via # google-api-core # googleapis-common-protos + # proto-plus psutil==5.9.8 # via edx-django-utils -pyasn1==0.5.1 +pyasn1==0.6.0 # via # pyasn1-modules # rsa -pyasn1-modules==0.3.0 +pyasn1-modules==0.4.0 # via google-auth -pycparser==2.21 +pycparser==2.22 # via cffi pyjwt==2.8.0 # via @@ -110,14 +113,14 @@ pyjwt==2.8.0 # simple-salesforce pynacl==1.5.0 # via edx-django-utils -pyparsing==3.1.1 +pyparsing==3.1.2 # via httplib2 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # botocore # pendulum # time-machine -pytz==2023.3.post1 +pytz==2024.1 # via # jenkinsapi # zeep @@ -134,13 +137,13 @@ requests==2.31.0 # simple-salesforce # slumber # zeep -requests-file==1.5.1 +requests-file==2.0.0 # via zeep requests-toolbelt==1.0.0 # via zeep rsa==4.9 # via google-auth -s3transfer==0.10.0 +s3transfer==0.10.1 # via boto3 simple-salesforce==1.12.5 # via -r scripts/user_retirement/requirements/base.in @@ -151,18 +154,17 @@ six==1.16.0 # isodate # jenkinsapi # python-dateutil - # requests-file slumber==0.7.1 # via edx-rest-api-client sqlparse==0.4.4 # via django -stevedore==5.1.0 +stevedore==5.2.0 # via edx-django-utils -time-machine==2.13.0 +time-machine==2.14.1 # via pendulum -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via asgiref -tzdata==2023.4 +tzdata==2024.1 # via pendulum unicodecsv==0.14.1 # via -r scripts/user_retirement/requirements/base.in @@ -174,5 +176,5 @@ urllib3==1.26.18 # requests zeep==4.2.1 # via simple-salesforce -zipp==3.17.0 +zipp==3.18.1 # via importlib-resources diff --git a/scripts/user_retirement/requirements/testing.in b/scripts/user_retirement/requirements/testing.in index 49a4297b2292..509b2e26275f 100644 --- a/scripts/user_retirement/requirements/testing.in +++ b/scripts/user_retirement/requirements/testing.in @@ -6,3 +6,10 @@ requests_mock responses mock ddt + +# This is a subdependency of one of our dependencies +# but we need to not install it on newer versions of python +# so we explictily declare it here and restrict it to older +# versions of python. +# This can be removed after we drop Python 3.8 support (After Redwood is cut) +backports.zoneinfo;python_version<"3.9" diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index 4517a31633a8..8c039ed3cc03 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -4,7 +4,7 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via # -r scripts/user_retirement/requirements/base.txt # django @@ -14,26 +14,27 @@ attrs==23.2.0 # zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.txt -backports-zoneinfo==0.2.1 +backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r scripts/user_retirement/requirements/base.txt + # -r scripts/user_retirement/requirements/testing.in # django # pendulum -boto3==1.34.26 +boto3==1.34.84 # via # -r scripts/user_retirement/requirements/base.txt # moto -botocore==1.34.26 +botocore==1.34.84 # via # -r scripts/user_retirement/requirements/base.txt # boto3 # moto # s3transfer -cachetools==5.3.2 +cachetools==5.3.3 # via # -r scripts/user_retirement/requirements/base.txt # google-auth -certifi==2023.11.17 +certifi==2024.2.2 # via # -r scripts/user_retirement/requirements/base.txt # requests @@ -50,14 +51,14 @@ click==8.1.7 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -cryptography==42.0.0 +cryptography==42.0.5 # via # -r scripts/user_retirement/requirements/base.txt # moto # simple-salesforce -ddt==1.7.1 +ddt==1.7.2 # via -r scripts/user_retirement/requirements/testing.in -django==4.2.9 +django==4.2.11 # via # -r scripts/user_retirement/requirements/base.txt # django-crum @@ -79,13 +80,13 @@ edx-rest-api-client==5.7.0 # via -r scripts/user_retirement/requirements/base.txt exceptiongroup==1.2.0 # via pytest -google-api-core==2.15.0 +google-api-core==2.18.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-python-client -google-api-python-client==2.115.0 +google-api-python-client==2.125.0 # via -r scripts/user_retirement/requirements/base.txt -google-auth==2.26.2 +google-auth==2.29.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core @@ -95,7 +96,7 @@ google-auth-httplib2==0.2.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-python-client -googleapis-common-protos==1.62.0 +googleapis-common-protos==1.63.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core @@ -104,11 +105,11 @@ httplib2==0.22.0 # -r scripts/user_retirement/requirements/base.txt # google-api-python-client # google-auth-httplib2 -idna==3.6 +idna==3.7 # via # -r scripts/user_retirement/requirements/base.txt # requests -importlib-resources==6.1.1 +importlib-resources==6.4.0 # via # -r scripts/user_retirement/requirements/base.txt # pendulum @@ -127,11 +128,11 @@ jmespath==1.0.1 # -r scripts/user_retirement/requirements/base.txt # boto3 # botocore -lxml==4.9.3 +lxml==5.2.1 # via # -r scripts/user_retirement/requirements/base.txt # zeep -markupsafe==2.1.4 +markupsafe==2.1.5 # via # jinja2 # werkzeug @@ -141,13 +142,13 @@ more-itertools==10.2.0 # via # -r scripts/user_retirement/requirements/base.txt # simple-salesforce -moto==4.2.13 +moto==5.0.5 # via -r scripts/user_retirement/requirements/testing.in -newrelic==9.5.0 +newrelic==9.8.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -packaging==23.2 +packaging==24.0 # via pytest pbr==6.0.0 # via @@ -157,31 +158,36 @@ pendulum==3.0.0 # via # -r scripts/user_retirement/requirements/base.txt # simple-salesforce -platformdirs==4.1.0 +platformdirs==4.2.0 # via # -r scripts/user_retirement/requirements/base.txt # zeep -pluggy==1.3.0 +pluggy==1.4.0 # via pytest -protobuf==4.25.2 +proto-plus==1.23.0 + # via + # -r scripts/user_retirement/requirements/base.txt + # google-api-core +protobuf==4.25.3 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core # googleapis-common-protos + # proto-plus psutil==5.9.8 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -pyasn1==0.5.1 +pyasn1==0.6.0 # via # -r scripts/user_retirement/requirements/base.txt # pyasn1-modules # rsa -pyasn1-modules==0.3.0 +pyasn1-modules==0.4.0 # via # -r scripts/user_retirement/requirements/base.txt # google-auth -pycparser==2.21 +pycparser==2.22 # via # -r scripts/user_retirement/requirements/base.txt # cffi @@ -194,20 +200,20 @@ pynacl==1.5.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -pyparsing==3.1.1 +pyparsing==3.1.2 # via # -r scripts/user_retirement/requirements/base.txt # httplib2 -pytest==7.4.4 +pytest==8.1.1 # via -r scripts/user_retirement/requirements/testing.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r scripts/user_retirement/requirements/base.txt # botocore # moto # pendulum # time-machine -pytz==2023.3.post1 +pytz==2024.1 # via # -r scripts/user_retirement/requirements/base.txt # jenkinsapi @@ -230,17 +236,17 @@ requests==2.31.0 # simple-salesforce # slumber # zeep -requests-file==1.5.1 +requests-file==2.0.0 # via # -r scripts/user_retirement/requirements/base.txt # zeep -requests-mock==1.11.0 +requests-mock==1.12.1 # via -r scripts/user_retirement/requirements/testing.in requests-toolbelt==1.0.0 # via # -r scripts/user_retirement/requirements/base.txt # zeep -responses==0.24.1 +responses==0.25.0 # via # -r scripts/user_retirement/requirements/testing.in # moto @@ -248,7 +254,7 @@ rsa==4.9 # via # -r scripts/user_retirement/requirements/base.txt # google-auth -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r scripts/user_retirement/requirements/base.txt # boto3 @@ -262,8 +268,6 @@ six==1.16.0 # isodate # jenkinsapi # python-dateutil - # requests-file - # requests-mock slumber==0.7.1 # via # -r scripts/user_retirement/requirements/base.txt @@ -272,21 +276,21 @@ sqlparse==0.4.4 # via # -r scripts/user_retirement/requirements/base.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -time-machine==2.13.0 +time-machine==2.14.1 # via # -r scripts/user_retirement/requirements/base.txt # pendulum tomli==2.0.1 # via pytest -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r scripts/user_retirement/requirements/base.txt # asgiref -tzdata==2023.4 +tzdata==2024.1 # via # -r scripts/user_retirement/requirements/base.txt # pendulum @@ -302,7 +306,7 @@ urllib3==1.26.18 # botocore # requests # responses -werkzeug==3.0.1 +werkzeug==3.0.2 # via moto xmltodict==0.13.0 # via moto @@ -310,7 +314,7 @@ zeep==4.2.1 # via # -r scripts/user_retirement/requirements/base.txt # simple-salesforce -zipp==3.17.0 +zipp==3.18.1 # via # -r scripts/user_retirement/requirements/base.txt # importlib-resources