From 6d85825b2570f08ecbbc982e3b3218a0e2ac97a7 Mon Sep 17 00:00:00 2001 From: nadeemshahzad Date: Mon, 4 Nov 2024 05:13:58 +0000 Subject: [PATCH 1/2] chore: Upgrade Python requirements --- requirements/base.txt | 188 ++++++++++++++++++++----------------- requirements/pip-tools.txt | 21 +++-- requirements/pip.txt | 4 +- requirements/testing.txt | 89 +++++++++--------- 4 files changed, 161 insertions(+), 141 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 5f8448ff..23a6936a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,33 +4,37 @@ # # make upgrade # -asgiref==3.7.2 - # via django -attrs==23.1.0 +annotated-types==0.7.0 + # via pydantic +anyio==4.5.2 # via - # jsonlines - # zeep + # cloudflare + # httpx +asgiref==3.8.1 + # via django +attrs==24.2.0 + # via zeep backoff==2.2.1 # via -r requirements/base.in -beautifulsoup4==4.12.2 - # via cloudflare -boto3==1.28.68 +boto3==1.35.54 # via -r requirements/base.in -botocore==1.31.68 +botocore==1.35.54 # via # boto3 # s3transfer -cachetools==5.3.1 +cachetools==5.5.0 # via google-auth -certifi==2023.7.22 +certifi==2024.8.30 # via + # httpcore + # httpx # kubernetes # requests -cffi==1.16.0 +cffi==1.17.1 # via # cryptography # pynacl -charset-normalizer==3.3.1 +charset-normalizer==3.4.0 # via requests click==8.1.7 # via @@ -39,15 +43,15 @@ click==8.1.7 # edx-django-utils click-log==0.4.0 # via -r requirements/base.in -cloudflare==2.12.4 +cloudflare==3.1.0 # via -r requirements/base.in -cryptography==41.0.4 - # via - # pyjwt - # simple-salesforce +cryptography==43.0.3 + # via pyjwt deprecated==1.2.14 # via pygithub -django==3.2.22 +distro==1.9.0 + # via cloudflare +django==3.2.25 # via # -c requirements/constraints.txt # django-crum @@ -55,98 +59,116 @@ django==3.2.22 # edx-django-utils django-crum==0.7.9 # via edx-django-utils -django-waffle==4.0.0 +django-waffle==4.1.0 # via edx-django-utils -easydict==1.10 +dnspython==2.6.1 + # via pymongo +durationpy==0.9 + # via kubernetes +easydict==1.13 # via yagocd -edx-django-utils==5.7.0 +edx-django-utils==7.0.0 # via edx-rest-api-client -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.11.0 # via -r requirements/base.in -edx-rest-api-client==5.6.1 +edx-rest-api-client==6.0.0 # via -r requirements/base.in -freezegun==1.2.2 +exceptiongroup==1.2.2 + # via anyio +freezegun==1.5.1 # via -r requirements/base.in gitdb==4.0.11 # via gitpython -gitpython==3.1.40 +gitpython==3.1.43 # via -r requirements/base.in -google-api-core==2.12.0 +google-api-core==2.22.0 # via google-api-python-client google-api-python-client==1.12.11 # via # -c requirements/constraints.txt # -r requirements/base.in -google-auth==2.23.3 +google-auth==2.35.0 # via # google-api-core # google-api-python-client # google-auth-httplib2 # kubernetes -google-auth-httplib2==0.1.1 +google-auth-httplib2==0.2.0 # via google-api-python-client -googleapis-common-protos==1.61.0 +googleapis-common-protos==1.65.0 # via google-api-core +h11==0.14.0 + # via httpcore +httpcore==1.0.6 + # via httpx httplib2==0.22.0 # via # google-api-python-client # google-auth-httplib2 -idna==3.4 - # via requests -isodate==0.6.1 +httpx==0.27.2 + # via cloudflare +idna==3.10 + # via + # anyio + # httpx + # requests +isodate==0.7.2 # via zeep jenkinsapi==0.3.13 # via -r requirements/base.in -jinja2==3.1.2 +jinja2==3.1.4 # via -r requirements/base.in jmespath==1.0.1 # via # boto3 # botocore -jsonlines==4.0.0 - # via cloudflare -kubernetes==28.1.0 +kubernetes==31.0.0 # via -r requirements/base.in -lxml==4.9.3 +lxml==5.3.0 # via zeep -markupsafe==2.1.3 +markupsafe==2.1.5 # via jinja2 -more-itertools==10.1.0 +more-itertools==10.5.0 # via simple-salesforce -newrelic==9.1.1 +newrelic==10.2.0 # via edx-django-utils oauthlib==3.2.2 # via # kubernetes # requests-oauthlib -pbr==5.11.1 +pbr==6.1.0 # via stevedore -pendulum==2.1.2 - # via simple-salesforce -platformdirs==3.11.0 +platformdirs==4.3.6 # via zeep -protobuf==4.24.4 +proto-plus==1.25.0 + # via google-api-core +protobuf==5.28.3 # via # google-api-core # googleapis-common-protos -psutil==5.9.6 + # proto-plus +psutil==6.1.0 # via edx-django-utils -pyasn1==0.5.0 +pyasn1==0.6.1 # via # pyasn1-modules # rsa -pyasn1-modules==0.3.0 +pyasn1-modules==0.4.1 # via google-auth -pycparser==2.21 +pycparser==2.22 # via cffi -pygithub==2.1.1 +pydantic==2.9.2 + # via cloudflare +pydantic-core==2.23.4 + # via pydantic +pygithub==2.4.0 # via -r requirements/base.in -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.9.0 # via # edx-rest-api-client # pygithub # simple-salesforce -pymongo==3.13.0 +pymongo==4.10.1 # via # -r requirements/base.in # edx-opaque-keys @@ -154,32 +176,26 @@ pynacl==1.5.0 # via # edx-django-utils # pygithub -pyparsing==3.1.1 +pyparsing==3.1.4 # via httplib2 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # botocore # freezegun # kubernetes - # pendulum - # pygithub -pytz==2023.3.post1 +pytz==2024.2 # via # -r requirements/base.in # django # jenkinsapi # zeep -pytzdata==2020.1 - # via pendulum -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/base.in - # cloudflare # kubernetes -requests==2.31.0 +requests==2.32.3 # via # -r requirements/base.in - # cloudflare # edx-rest-api-client # google-api-core # jenkinsapi @@ -190,71 +206,75 @@ requests==2.31.0 # requests-toolbelt # sailthru-client # simple-salesforce - # slumber # yagocd # zeep -requests-file==1.5.1 +requests-file==2.1.0 # via zeep -requests-oauthlib==1.3.1 +requests-oauthlib==2.0.0 # via kubernetes requests-toolbelt==1.0.0 # via zeep rsa==4.9 # via google-auth -s3transfer==0.7.0 +s3transfer==0.10.3 # via boto3 sailthru-client==2.3.5 # via -r requirements/base.in -simple-salesforce==1.12.5 +simple-salesforce==1.12.6 # via -r requirements/base.in -simplejson==3.19.2 +simplejson==3.19.3 # via sailthru-client six==1.16.0 # via # -r requirements/base.in # google-api-python-client - # isodate # jenkinsapi # kubernetes # python-dateutil - # requests-file # yagocd -slumber==0.7.1 - # via edx-rest-api-client smmap==5.0.1 # via gitdb -soupsieve==2.5 - # via beautifulsoup4 -sqlparse==0.4.4 +sniffio==1.3.1 + # via + # anyio + # cloudflare + # httpx +sqlparse==0.5.1 # via django -stevedore==5.1.0 +stevedore==5.3.0 # via # edx-django-utils # edx-opaque-keys -typing-extensions==4.8.0 +typing-extensions==4.12.2 # via + # annotated-types + # anyio # asgiref + # cloudflare # edx-opaque-keys + # pydantic + # pydantic-core # pygithub + # simple-salesforce unicodecsv==0.14.1 # via -r requirements/base.in uritemplate==3.0.1 # via google-api-python-client -urllib3==1.26.18 +urllib3==1.26.20 # via # botocore # kubernetes # pygithub # requests -validators==0.22.0 +validators==0.34.0 # via -r requirements/base.in -websocket-client==1.6.4 +websocket-client==1.8.0 # via kubernetes -wrapt==1.15.0 +wrapt==1.16.0 # via # -r requirements/base.in # deprecated yagocd==1.0.1 # via -r requirements/base.in -zeep==4.2.1 +zeep==4.3.1 # via simple-salesforce diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 50d35f22..c9392931 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,26 +4,27 @@ # # make upgrade # -build==1.0.3 +build==1.2.2.post1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.8.0 +importlib-metadata==8.5.0 # via build -packaging==23.2 +packaging==24.1 # via build -pip-tools==7.3.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.in -pyproject-hooks==1.0.0 - # via build -tomli==2.0.1 +pyproject-hooks==1.2.0 + # via + # build + # pip-tools +tomli==2.0.2 # via # build # pip-tools - # pyproject-hooks -wheel==0.41.2 +wheel==0.44.0 # via pip-tools -zipp==3.17.0 +zipp==3.20.2 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 2086b008..10386af4 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.41.2 +wheel==0.44.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==24.3.1 # via -r requirements/pip.in setuptools==59.8.0 # via diff --git a/requirements/testing.txt b/requirements/testing.txt index 441bcd9f..a079c424 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -4,23 +4,23 @@ # # make upgrade # -astroid==3.0.1 +astroid==3.2.4 # via # -r requirements/testing.in # pylint # pylint-celery -boto3==1.28.68 +boto3==1.35.54 # via moto -botocore==1.31.68 +botocore==1.35.54 # via # boto3 # moto # s3transfer -certifi==2023.7.22 +certifi==2024.8.30 # via requests -cffi==1.16.0 +cffi==1.17.1 # via cryptography -charset-normalizer==3.3.1 +charset-normalizer==3.4.0 # via requests click==8.1.7 # via @@ -29,33 +29,33 @@ click==8.1.7 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.5.0 +code-annotations==1.8.0 # via edx-lint -coverage[toml]==7.3.2 +coverage[toml]==7.6.1 # via # coverage # pytest-cov -cryptography==41.0.4 +cryptography==43.0.3 # via moto -ddt==1.6.0 +ddt==1.7.2 # via -r requirements/testing.in -dill==0.3.7 +dill==0.3.9 # via pylint -edx-lint==5.3.4 +edx-lint==5.4.1 # via -r requirements/testing.in -exceptiongroup==1.1.3 +exceptiongroup==1.2.2 # via pytest -execnet==2.0.2 +execnet==2.1.1 # via pytest-xdist httpretty==1.1.4 # via -r requirements/testing.in -idna==3.4 +idna==3.10 # via requests iniconfig==2.0.0 # via pytest -isort==5.12.0 +isort==5.13.2 # via pylint -jinja2==3.1.2 +jinja2==3.1.4 # via # code-annotations # moto @@ -63,7 +63,7 @@ jmespath==1.0.1 # via # boto3 # botocore -markupsafe==2.1.3 +markupsafe==2.1.5 # via # jinja2 # werkzeug @@ -71,25 +71,25 @@ mccabe==0.7.0 # via pylint mock==5.1.0 # via -r requirements/testing.in -moto==4.2.6 +moto==5.0.19 # via -r requirements/testing.in -packaging==23.2 +packaging==24.1 # via pytest -pbr==5.11.1 +pbr==6.1.0 # via stevedore -platformdirs==3.11.0 +platformdirs==4.3.6 # via pylint -pluggy==1.3.0 +pluggy==1.5.0 # via pytest py==1.11.0 # via pytest-pycodestyle -pycodestyle==2.11.1 +pycodestyle==2.12.1 # via # -r requirements/testing.in # pytest-pycodestyle -pycparser==2.21 +pycparser==2.22 # via cffi -pylint==3.0.2 +pylint==3.2.7 # via # -r requirements/testing.in # edx-lint @@ -99,78 +99,77 @@ pylint==3.0.2 # pytest-pylint pylint-celery==0.3 # via edx-lint -pylint-django==2.5.4 +pylint-django==2.5.5 # via edx-lint pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pytest==7.4.2 +pytest==8.3.3 # via # -r requirements/testing.in # pytest-cov # pytest-pycodestyle # pytest-pylint # pytest-xdist -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/testing.in pytest-pycodestyle==2.3.1 # via -r requirements/testing.in pytest-pylint==0.21.0 # via -r requirements/testing.in -pytest-xdist==3.3.1 +pytest-xdist==3.6.1 # via -r requirements/testing.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # botocore # moto -python-slugify==8.0.1 +python-slugify==8.0.4 # via code-annotations -pyyaml==6.0.1 +pyyaml==6.0.2 # via code-annotations -requests==2.31.0 +requests==2.32.3 # via # moto # requests-mock # responses -requests-mock==1.11.0 +requests-mock==1.12.1 # via -r requirements/testing.in responses==0.20.0 # via # -c requirements/constraints.txt # -r requirements/testing.in # moto -s3transfer==0.7.0 +s3transfer==0.10.3 # via boto3 six==1.16.0 # via # edx-lint # python-dateutil - # requests-mock -stevedore==5.1.0 +stevedore==5.3.0 # via code-annotations text-unidecode==1.3 # via python-slugify -tomli==2.0.1 +tomli==2.0.2 # via # coverage # pylint # pytest # pytest-pylint -tomlkit==0.12.1 +tomlkit==0.13.2 # via pylint -typing-extensions==4.8.0 +typing-extensions==4.12.2 # via # astroid # pylint -urllib3==1.26.18 +urllib3==1.26.20 # via # botocore # requests # responses -werkzeug==3.0.0 +werkzeug==3.0.6 # via moto -wrapt==1.15.0 +wrapt==1.16.0 # via -r requirements/testing.in -xmltodict==0.13.0 +xmltodict==0.14.2 # via moto From 3dad5f1b98d7443c0ce3798e27ecc09c55ba7670 Mon Sep 17 00:00:00 2001 From: nadeemshahzad Date: Mon, 4 Nov 2024 05:30:52 +0000 Subject: [PATCH 2/2] chore: pin cloudflare and moto version --- requirements/base.txt | 51 +++++++++--------------------------- requirements/constraints.txt | 2 ++ requirements/testing.txt | 10 +++---- 3 files changed, 19 insertions(+), 44 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 23a6936a..8e14a797 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,16 +4,12 @@ # # make upgrade # -annotated-types==0.7.0 - # via pydantic -anyio==4.5.2 - # via - # cloudflare - # httpx asgiref==3.8.1 # via django attrs==24.2.0 - # via zeep + # via + # jsonlines + # zeep backoff==2.2.1 # via -r requirements/base.in boto3==1.35.54 @@ -26,8 +22,6 @@ cachetools==5.5.0 # via google-auth certifi==2024.8.30 # via - # httpcore - # httpx # kubernetes # requests cffi==1.17.1 @@ -43,14 +37,14 @@ click==8.1.7 # edx-django-utils click-log==0.4.0 # via -r requirements/base.in -cloudflare==3.1.0 - # via -r requirements/base.in +cloudflare==2.20.0 + # via + # -c requirements/constraints.txt + # -r requirements/base.in cryptography==43.0.3 # via pyjwt deprecated==1.2.14 # via pygithub -distro==1.9.0 - # via cloudflare django==3.2.25 # via # -c requirements/constraints.txt @@ -73,8 +67,6 @@ edx-opaque-keys==2.11.0 # via -r requirements/base.in edx-rest-api-client==6.0.0 # via -r requirements/base.in -exceptiongroup==1.2.2 - # via anyio freezegun==1.5.1 # via -r requirements/base.in gitdb==4.0.11 @@ -97,21 +89,12 @@ google-auth-httplib2==0.2.0 # via google-api-python-client googleapis-common-protos==1.65.0 # via google-api-core -h11==0.14.0 - # via httpcore -httpcore==1.0.6 - # via httpx httplib2==0.22.0 # via # google-api-python-client # google-auth-httplib2 -httpx==0.27.2 - # via cloudflare idna==3.10 - # via - # anyio - # httpx - # requests + # via requests isodate==0.7.2 # via zeep jenkinsapi==0.3.13 @@ -122,6 +105,8 @@ jmespath==1.0.1 # via # boto3 # botocore +jsonlines==4.0.0 + # via cloudflare kubernetes==31.0.0 # via -r requirements/base.in lxml==5.3.0 @@ -157,10 +142,6 @@ pyasn1-modules==0.4.1 # via google-auth pycparser==2.22 # via cffi -pydantic==2.9.2 - # via cloudflare -pydantic-core==2.23.4 - # via pydantic pygithub==2.4.0 # via -r requirements/base.in pyjwt[crypto]==2.9.0 @@ -192,10 +173,12 @@ pytz==2024.2 pyyaml==6.0.2 # via # -r requirements/base.in + # cloudflare # kubernetes requests==2.32.3 # via # -r requirements/base.in + # cloudflare # edx-rest-api-client # google-api-core # jenkinsapi @@ -234,11 +217,6 @@ six==1.16.0 # yagocd smmap==5.0.1 # via gitdb -sniffio==1.3.1 - # via - # anyio - # cloudflare - # httpx sqlparse==0.5.1 # via django stevedore==5.3.0 @@ -247,13 +225,8 @@ stevedore==5.3.0 # edx-opaque-keys typing-extensions==4.12.2 # via - # annotated-types - # anyio # asgiref - # cloudflare # edx-opaque-keys - # pydantic - # pydantic-core # pygithub # simple-salesforce unicodecsv==0.14.1 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 39a7b42f..e6da4558 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -16,3 +16,5 @@ responses<0.21.0 django<4.0 setuptools<60 google-api-python-client<2 +moto<5.0 +cloudflare<3.0 diff --git a/requirements/testing.txt b/requirements/testing.txt index a079c424..00632a57 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -32,9 +32,7 @@ click-log==0.4.0 code-annotations==1.8.0 # via edx-lint coverage[toml]==7.6.1 - # via - # coverage - # pytest-cov + # via pytest-cov cryptography==43.0.3 # via moto ddt==1.7.2 @@ -71,8 +69,10 @@ mccabe==0.7.0 # via pylint mock==5.1.0 # via -r requirements/testing.in -moto==5.0.19 - # via -r requirements/testing.in +moto==4.2.14 + # via + # -c requirements/constraints.txt + # -r requirements/testing.in packaging==24.1 # via pytest pbr==6.1.0