From e5d71725d4a3f8612cf5eafbc3d52c4e5d114ee7 Mon Sep 17 00:00:00 2001 From: Robert Raposa Date: Wed, 12 Apr 2023 11:46:50 -0400 Subject: [PATCH] fixup! drop more constraints and upgrade --- requirements/base.txt | 14 ++++++-------- requirements/constraints.txt | 5 ----- requirements/dev.txt | 9 +++++---- requirements/docs.txt | 6 ++---- requirements/e2e.txt | 5 ++--- requirements/production.txt | 14 ++++++-------- requirements/test.txt | 14 ++++++-------- 7 files changed, 27 insertions(+), 40 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 527bb47f953..1c4852b98bb 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -204,10 +204,8 @@ drf-extensions==0.7.1 # via -r requirements/base.in drf-jwt==1.19.2 # via edx-drf-extensions -drf-yasg==1.20.0 - # via - # -c requirements/constraints.txt - # -r requirements/base.in +drf-yasg==1.21.5 + # via -r requirements/base.in edx-auth-backends==4.1.0 # via -r requirements/base.in edx-braze-client==0.1.6 @@ -216,7 +214,7 @@ edx-django-release-util==1.2.0 # via -r requirements/base.in edx-django-sites-extensions==4.0.0 # via -r requirements/base.in -edx-django-utils==5.3.0 +edx-django-utils==5.4.0 # via # -r requirements/base.in # django-config-models @@ -261,7 +259,7 @@ funcsigs==1.0.2 # via cybersource-rest-client-python future==0.18.3 # via pyjwkest -getsmarter-api-clients==0.4.0 +getsmarter-api-clients==0.5.0 # via -r requirements/base.in google-api-core==2.11.0 # via google-api-python-client @@ -464,9 +462,8 @@ python3-openid==3.2.0 # via # -r requirements/base.in # social-auth-core -pytz==2016.10 +pytz==2023.3 # via - # -c requirements/constraints.txt # -r requirements/base.in # babel # celery @@ -475,6 +472,7 @@ pytz==2016.10 # django # djangorestframework # djangorestframework-datatables + # drf-yasg # getsmarter-api-clients # zeep pyyaml==6.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 4afba27f806..0574dc7395b 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -17,11 +17,6 @@ cybersource-rest-client-python==0.0.21 # Django 3.2 support is added in version 2.2 so pinning it to 2.2 django-oscar==2.2 -# Pinned to preserve the status quo -pytz==2016.10 -# drf-yasg>=1.20.3 requires pytz>2021.10 so pinning the version untill pytz is upgraded -drf-yasg<1.20.3 - # Pinned because transifex-client==0.13.6 pins it urllib3>=1.24.2,<2.0.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index 918ee2a1662..96f9b38eae6 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -295,7 +295,7 @@ drf-jwt==1.19.2 # via # -r requirements/test.txt # edx-drf-extensions -drf-yasg==1.20.0 +drf-yasg==1.21.5 # via -r requirements/test.txt edx-auth-backends==4.1.0 # via -r requirements/test.txt @@ -307,7 +307,7 @@ edx-django-release-util==1.2.0 # via -r requirements/test.txt edx-django-sites-extensions==4.0.0 # via -r requirements/test.txt -edx-django-utils==5.3.0 +edx-django-utils==5.4.0 # via # -r requirements/test.txt # django-config-models @@ -375,7 +375,7 @@ future==0.18.3 # via # -r requirements/test.txt # pyjwkest -getsmarter-api-clients==0.4.0 +getsmarter-api-clients==0.5.0 # via -r requirements/test.txt gitdb==4.0.10 # via gitpython @@ -781,7 +781,7 @@ python3-openid==3.2.0 # via # -r requirements/test.txt # social-auth-core -pytz==2016.10 +pytz==2023.3 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -792,6 +792,7 @@ pytz==2016.10 # django # djangorestframework # djangorestframework-datatables + # drf-yasg # getsmarter-api-clients # zeep pywatchman==1.4.1 diff --git a/requirements/docs.txt b/requirements/docs.txt index b3a1efb38bc..cc2af43dd6c 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -32,10 +32,8 @@ packaging==23.0 # via sphinx pygments==2.15.0 # via sphinx -pytz==2016.10 - # via - # -c requirements/constraints.txt - # babel +pytz==2023.3 + # via babel requests==2.28.2 # via sphinx six==1.16.0 diff --git a/requirements/e2e.txt b/requirements/e2e.txt index b3c8ec5565e..802faa4bed9 100644 --- a/requirements/e2e.txt +++ b/requirements/e2e.txt @@ -47,7 +47,7 @@ django-waffle==3.0.0 # via # -c requirements/base.txt # edx-django-utils -edx-django-utils==5.3.0 +edx-django-utils==5.4.0 # via # -c requirements/base.txt # edx-rest-api-client @@ -128,10 +128,9 @@ pytest-variables==1.9.0 # via pytest-selenium python-dotenv==1.0.0 # via -r requirements/e2e.in -pytz==2016.10 +pytz==2023.3 # via # -c requirements/base.txt - # -c requirements/constraints.txt # django requests==2.28.2 # via diff --git a/requirements/production.txt b/requirements/production.txt index 403b2dc426b..0ef8a51e2f7 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -209,10 +209,8 @@ drf-extensions==0.7.1 # via -r requirements/base.in drf-jwt==1.19.2 # via edx-drf-extensions -drf-yasg==1.20.0 - # via - # -c requirements/constraints.txt - # -r requirements/base.in +drf-yasg==1.21.5 + # via -r requirements/base.in edx-auth-backends==4.1.0 # via -r requirements/base.in edx-braze-client==0.1.6 @@ -221,7 +219,7 @@ edx-django-release-util==1.2.0 # via -r requirements/base.in edx-django-sites-extensions==4.0.0 # via -r requirements/base.in -edx-django-utils==5.3.0 +edx-django-utils==5.4.0 # via # -r requirements/base.in # django-config-models @@ -266,7 +264,7 @@ funcsigs==1.0.2 # via cybersource-rest-client-python future==0.18.3 # via pyjwkest -getsmarter-api-clients==0.4.0 +getsmarter-api-clients==0.5.0 # via -r requirements/base.in google-api-core==2.11.0 # via google-api-python-client @@ -476,9 +474,8 @@ python3-openid==3.2.0 # via # -r requirements/base.in # social-auth-core -pytz==2016.10 +pytz==2023.3 # via - # -c requirements/constraints.txt # -r requirements/base.in # babel # celery @@ -488,6 +485,7 @@ pytz==2016.10 # django-ses # djangorestframework # djangorestframework-datatables + # drf-yasg # getsmarter-api-clients # zeep pyyaml==6.0 diff --git a/requirements/test.txt b/requirements/test.txt index d0b73040201..a31442173eb 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -294,10 +294,8 @@ drf-jwt==1.19.2 # via # -r requirements/base.txt # edx-drf-extensions -drf-yasg==1.20.0 - # via - # -c requirements/constraints.txt - # -r requirements/base.txt +drf-yasg==1.21.5 + # via -r requirements/base.txt edx-auth-backends==4.1.0 # via -r requirements/base.txt edx-braze-client==0.1.6 @@ -308,7 +306,7 @@ edx-django-release-util==1.2.0 # via -r requirements/base.txt edx-django-sites-extensions==4.0.0 # via -r requirements/base.txt -edx-django-utils==5.3.0 +edx-django-utils==5.4.0 # via # -r requirements/base.txt # -r requirements/e2e.txt @@ -377,7 +375,7 @@ future==0.18.3 # via # -r requirements/base.txt # pyjwkest -getsmarter-api-clients==0.4.0 +getsmarter-api-clients==0.5.0 # via -r requirements/base.txt google-api-core==2.11.0 # via @@ -772,9 +770,8 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core -pytz==2016.10 +pytz==2023.3 # via - # -c requirements/constraints.txt # -r requirements/base.txt # -r requirements/e2e.txt # babel @@ -784,6 +781,7 @@ pytz==2016.10 # django # djangorestframework # djangorestframework-datatables + # drf-yasg # getsmarter-api-clients # zeep pyyaml==6.0