From 268fc5847a46e7ef05cccfe6bad8dd72d3d1a044 Mon Sep 17 00:00:00 2001 From: Joseph Mulloy Date: Wed, 20 Sep 2023 16:14:30 -0400 Subject: [PATCH] fix: Pin google-api-python-client under 2.0 google-api-python-client >2.0 fails tests --- requirements/base.txt | 54 +++++++++++++++++++++--------------- requirements/constraints.txt | 1 + requirements/pip-tools.txt | 6 +++- requirements/testing.txt | 14 +++++----- 4 files changed, 44 insertions(+), 31 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 646cb317..e9f1c5ec 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,9 +14,9 @@ backoff==2.2.1 # via -r requirements/base.in beautifulsoup4==4.12.2 # via cloudflare -boto3==1.28.38 +boto3==1.28.51 # via -r requirements/base.in -botocore==1.31.38 +botocore==1.31.51 # via # boto3 # s3transfer @@ -39,15 +39,15 @@ click==8.1.7 # edx-django-utils click-log==0.4.0 # via -r requirements/base.in -cloudflare==2.11.7 +cloudflare==2.12.2 # via -r requirements/base.in -cryptography==41.0.3 +cryptography==41.0.4 # via # pyjwt # simple-salesforce deprecated==1.2.14 # via pygithub -django==3.2.20 +django==3.2.21 # via # -c requirements/constraints.txt # django-crum @@ -71,19 +71,21 @@ future==0.18.3 # via -r requirements/base.in gitdb==4.0.10 # via gitpython -gitpython==3.1.32 +gitpython==3.1.36 # via -r requirements/base.in google-api-core==2.11.1 # via google-api-python-client -google-api-python-client==2.97.0 - # via -r requirements/base.in -google-auth==2.22.0 +google-api-python-client==1.12.11 + # via + # -c requirements/constraints.txt + # -r requirements/base.in +google-auth==2.23.0 # via # google-api-core # google-api-python-client # google-auth-httplib2 # kubernetes -google-auth-httplib2==0.1.0 +google-auth-httplib2==0.1.1 # via google-api-python-client googleapis-common-protos==1.60.0 # via google-api-core @@ -103,14 +105,16 @@ jmespath==1.0.1 # via # boto3 # botocore -jsonlines==3.1.0 +jsonlines==4.0.0 # via cloudflare -kubernetes==27.2.0 +kubernetes==28.1.0 # via -r requirements/base.in lxml==4.9.3 # via zeep markupsafe==2.1.3 # via jinja2 +more-itertools==10.1.0 + # via simple-salesforce newrelic==9.0.0 # via edx-django-utils oauthlib==3.2.2 @@ -119,9 +123,11 @@ oauthlib==3.2.2 # requests-oauthlib pbr==5.11.1 # via stevedore +pendulum==2.1.2 + # via simple-salesforce platformdirs==3.10.0 # via zeep -protobuf==4.24.2 +protobuf==4.24.3 # via # google-api-core # googleapis-common-protos @@ -157,12 +163,15 @@ python-dateutil==2.8.2 # botocore # freezegun # kubernetes -pytz==2023.3 + # pendulum +pytz==2023.3.post1 # via # -r requirements/base.in # django # jenkinsapi # zeep +pytzdata==2020.1 + # via pendulum pyyaml==6.0.1 # via # -r requirements/base.in @@ -197,15 +206,14 @@ s3transfer==0.6.2 # via boto3 sailthru-client==2.3.5 # via -r requirements/base.in -simple-salesforce==1.12.4 +simple-salesforce==1.12.5 # via -r requirements/base.in simplejson==3.19.1 # via sailthru-client six==1.16.0 # via # -r requirements/base.in - # google-auth - # google-auth-httplib2 + # google-api-python-client # isodate # jenkinsapi # kubernetes @@ -214,9 +222,9 @@ six==1.16.0 # yagocd slumber==0.7.1 # via edx-rest-api-client -smmap==5.0.0 +smmap==5.0.1 # via gitdb -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django @@ -224,13 +232,13 @@ stevedore==5.1.0 # via # edx-django-utils # edx-opaque-keys -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # asgiref # edx-opaque-keys unicodecsv==0.14.1 # via -r requirements/base.in -uritemplate==4.1.1 +uritemplate==3.0.1 # via google-api-python-client urllib3==1.26.16 # via @@ -238,9 +246,9 @@ urllib3==1.26.16 # google-auth # kubernetes # requests -validators==0.21.2 +validators==0.22.0 # via -r requirements/base.in -websocket-client==1.6.2 +websocket-client==1.6.3 # via kubernetes wrapt==1.15.0 # via diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 350284d5..39a7b42f 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -15,3 +15,4 @@ responses<0.21.0 django<4.0 setuptools<60 +google-api-python-client<2 diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 007ed388..894fa179 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,10 +4,12 @@ # # make upgrade # -build==0.10.0 +build==1.0.3 # via pip-tools click==8.1.7 # via pip-tools +importlib-metadata==6.8.0 + # via build packaging==23.1 # via build pip-tools==7.3.0 @@ -21,6 +23,8 @@ tomli==2.0.1 # pyproject-hooks wheel==0.41.2 # via pip-tools +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/testing.txt b/requirements/testing.txt index af59f437..bf1d9878 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -9,9 +9,9 @@ astroid==2.15.6 # -r requirements/testing.in # pylint # pylint-celery -boto3==1.28.38 +boto3==1.28.51 # via moto -botocore==1.31.38 +botocore==1.31.51 # via # boto3 # moto @@ -31,9 +31,9 @@ click-log==0.4.0 # via edx-lint code-annotations==1.5.0 # via edx-lint -coverage[toml]==7.3.0 +coverage[toml]==7.3.1 # via pytest-cov -cryptography==41.0.3 +cryptography==41.0.4 # via moto ddt==1.6.0 # via -r requirements/testing.in @@ -71,7 +71,7 @@ mccabe==0.7.0 # via pylint mock==5.1.0 # via -r requirements/testing.in -moto==4.2.0 +moto==4.2.3 # via -r requirements/testing.in packaging==23.1 # via pytest @@ -105,7 +105,7 @@ pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pytest==7.4.0 +pytest==7.4.2 # via # -r requirements/testing.in # pytest-cov @@ -160,7 +160,7 @@ tomli==2.0.1 # pytest tomlkit==0.12.1 # via pylint -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # astroid # pylint