revert: prior code changes to isolate bug

This commit reverts the following commit. * e8883bd Starting 04/05/2024, deployments of this service started to fail due to failing migrations on the wagtail core model in the wagtail application. We are reverting the code changes up until the issue began to rule out an issue in any of our Python requirements upgrade, namely the upgrade of wagtail from 6.0.1 to 6.0.2. Revert "chore: Updating Python Requirements" This reverts commit e8883bd.
edx · Apr 17, 2024 · 5f95805 · 5f95805
1 parent fe7dc16
commit 5f95805
Show file tree

Hide file tree

Showing 7 changed files with 159 additions and 160 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,6 +4,8 @@
 #
 #    make upgrade
 #
+annotated-types==0.6.0
+    # via pydantic
 anyascii==0.3.2
     # via wagtail
 asgiref==3.8.1
@@ -16,9 +18,9 @@ backports-zoneinfo==0.2.1
     #   djangorestframework
 beautifulsoup4==4.12.3
     # via wagtail
-boto3==1.34.75
+boto3==1.34.70
     # via -r requirements/base.in
-botocore==1.34.75
+botocore==1.34.70
     # via
     #   boto3
     #   s3transfer
@@ -108,16 +110,16 @@ drf-yasg==1.21.7
     #   edx-api-doc-tools
 edx-api-doc-tools==1.7.0
     # via -r requirements/base.in
-edx-auth-backends==4.3.0
+edx-auth-backends==4.2.0
     # via -r requirements/base.in
-edx-django-release-util==1.4.0
+edx-django-release-util==1.3.0
     # via -r requirements/base.in
-edx-django-utils==5.12.0
+edx-django-utils==5.11.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
     #   edx-rest-api-client
-edx-drf-extensions==10.3.0
+edx-drf-extensions==10.2.0
     # via -r requirements/base.in
 edx-opaque-keys==2.5.1
     # via edx-drf-extensions
@@ -133,11 +135,7 @@ html5lib==1.1
     # via wagtail
 idna==3.6
     # via requests
-importlib-metadata==6.11.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   typeguard
-inflect==7.2.0
+inflect==7.0.0
     # via -r requirements/base.in
 inflection==0.5.1
     # via drf-yasg
@@ -151,11 +149,9 @@ laces==0.1.1
     # via wagtail
 mock==5.1.0
     # via -r requirements/base.in
-more-itertools==10.2.0
-    # via inflect
 mysqlclient==2.2.4
     # via -r requirements/base.in
-newrelic==9.8.0
+newrelic==9.7.1
     # via edx-django-utils
 oauthlib==3.2.2
     # via
@@ -167,16 +163,20 @@ packaging==24.0
     # via drf-yasg
 pbr==6.0.0
     # via stevedore
-pillow==10.3.0
+pillow==10.2.0
     # via
     #   pillow-heif
     #   wagtail
-pillow-heif==0.16.0
+pillow-heif==0.15.0
     # via willow
 psutil==5.9.8
     # via edx-django-utils
-pycparser==2.22
+pycparser==2.21
     # via cffi
+pydantic==2.6.4
+    # via inflect
+pydantic-core==2.16.3
+    # via pydantic
 pyjwt[crypto]==2.8.0
     # via
     #   drf-jwt
@@ -246,14 +246,14 @@ stevedore==5.2.0
     #   edx-opaque-keys
 telepath==0.3.1
     # via wagtail
-typeguard==4.2.1
-    # via inflect
 typing-extensions==4.10.0
     # via
+    #   annotated-types
     #   asgiref
     #   edx-opaque-keys
     #   inflect
-    #   typeguard
+    #   pydantic
+    #   pydantic-core
 uritemplate==4.1.1
     # via drf-yasg
 urllib3==1.26.18
@@ -269,6 +269,4 @@ willow[heif]==1.8.0
     #   wagtail
     #   willow
 zipp==3.18.1
-    # via
-    #   -r requirements/base.in
-    #   importlib-metadata
+    # via -r requirements/base.in
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -4,6 +4,10 @@
 #
 #    make upgrade
 #
+annotated-types==0.6.0
+    # via
+    #   -r requirements/quality.txt
+    #   pydantic
 anyascii==0.3.2
     # via
     #   -r requirements/quality.txt
@@ -27,9 +31,9 @@ beautifulsoup4==4.12.3
     # via
     #   -r requirements/quality.txt
     #   wagtail
-boto3==1.34.75
+boto3==1.34.70
     # via -r requirements/quality.txt
-botocore==1.34.75
+botocore==1.34.70
     # via
     #   -r requirements/quality.txt
     #   boto3
@@ -189,16 +193,16 @@ drf-yasg==1.21.7
     #   edx-api-doc-tools
 edx-api-doc-tools==1.7.0
     # via -r requirements/quality.txt
-edx-auth-backends==4.3.0
+edx-auth-backends==4.2.0
     # via -r requirements/quality.txt
-edx-django-release-util==1.4.0
+edx-django-release-util==1.3.0
     # via -r requirements/quality.txt
-edx-django-utils==5.12.0
+edx-django-utils==5.11.0
     # via
     #   -r requirements/quality.txt
     #   edx-drf-extensions
     #   edx-rest-api-client
-edx-drf-extensions==10.3.0
+edx-drf-extensions==10.2.0
     # via -r requirements/quality.txt
 edx-i18n-tools==1.3.0
     # via -r requirements/dev.in
@@ -243,12 +247,7 @@ idna==3.6
     # via
     #   -r requirements/quality.txt
     #   requests
-importlib-metadata==6.11.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/quality.txt
-    #   typeguard
-inflect==7.2.0
+inflect==7.0.0
     # via -r requirements/quality.txt
 inflection==0.5.1
     # via
@@ -280,7 +279,7 @@ laces==0.1.1
     # via
     #   -r requirements/quality.txt
     #   wagtail
-lxml==5.2.0
+lxml==5.1.0
     # via edx-i18n-tools
 markupsafe==2.1.5
     # via
@@ -292,13 +291,9 @@ mccabe==0.7.0
     #   pylint
 mock==5.1.0
     # via -r requirements/quality.txt
-more-itertools==10.2.0
-    # via
-    #   -r requirements/quality.txt
-    #   inflect
 mysqlclient==2.2.4
     # via -r requirements/quality.txt
-newrelic==9.8.0
+newrelic==9.7.1
     # via
     #   -r requirements/quality.txt
     #   edx-django-utils
@@ -324,12 +319,12 @@ pbr==6.0.0
     # via
     #   -r requirements/quality.txt
     #   stevedore
-pillow==10.3.0
+pillow==10.2.0
     # via
     #   -r requirements/quality.txt
     #   pillow-heif
     #   wagtail
-pillow-heif==0.16.0
+pillow-heif==0.15.0
     # via
     #   -r requirements/quality.txt
     #   willow
@@ -353,10 +348,18 @@ psutil==5.9.8
     #   edx-django-utils
 pycodestyle==2.11.1
     # via -r requirements/quality.txt
-pycparser==2.22
+pycparser==2.21
     # via
     #   -r requirements/quality.txt
     #   cffi
+pydantic==2.6.4
+    # via
+    #   -r requirements/quality.txt
+    #   inflect
+pydantic-core==2.16.3
+    # via
+    #   -r requirements/quality.txt
+    #   pydantic
 pydocstyle==6.3.0
     # via -r requirements/quality.txt
 pygments==2.17.2
@@ -520,20 +523,18 @@ tomlkit==0.12.4
     #   pylint
 tox==4.14.2
     # via -r requirements/quality.txt
-typeguard==4.2.1
-    # via
-    #   -r requirements/quality.txt
-    #   inflect
 typing-extensions==4.10.0
     # via
     #   -r requirements/quality.txt
+    #   annotated-types
     #   asgiref
     #   astroid
     #   edx-opaque-keys
     #   faker
     #   inflect
+    #   pydantic
+    #   pydantic-core
     #   pylint
-    #   typeguard
 uritemplate==4.1.1
     # via
     #   -r requirements/quality.txt
@@ -558,6 +559,4 @@ willow[heif]==1.8.0
     #   -r requirements/quality.txt
     #   wagtail
 zipp==3.18.1
-    # via
-    #   -r requirements/quality.txt
-    #   importlib-metadata
+    # via -r requirements/quality.txt