fix: revert requirements to master and remove mysqlclient constraint

requirements/base.in

@@ -43,7 +43,7 @@ jsonfield2
 libsass
 lxml[html_clean]
 markdown==3.4.3
-mysqlclient<1.5
+mysqlclient
 newrelic
 ndg-httpsclient
 openedx-atlas

requirements/base.txt

@@ -30,7 +30,7 @@ attrs==23.2.0
     #   jsonschema
     #   referencing
     #   zeep
-babel==2.15.0
+babel==2.14.0
     # via django-oscar
 backoff==1.10.0
     # via analytics-python
@@ -40,17 +40,17 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     #   celery
     #   djangorestframework
     #   kombu
-bcrypt==4.1.3
+bcrypt==4.1.2
     # via
     #   cybersource-rest-client-python
     #   paramiko
 billiard==4.2.0
     # via celery
 bleach==6.1.0
     # via -r requirements/base.in
-boto3==1.34.109
+boto3==1.34.96
     # via -r requirements/base.in
-botocore==1.34.109
+botocore==1.34.96
     # via
     #   boto3
     #   s3transfer
@@ -93,13 +93,13 @@ coreapi==2.3.3
     # via -r requirements/base.in
 coreschema==0.0.4
     # via coreapi
-coverage==7.5.1
+coverage==7.5.0
     # via cybersource-rest-client-python
 crispy-bootstrap3==2024.1
     # via -r requirements/base.in
 crypto==1.4.1
     # via cybersource-rest-client-python
-cryptography==42.0.7
+cryptography==42.0.5
     # via
     #   app-store-notifications-v2-validator
     #   cybersource-rest-client-python
@@ -109,7 +109,7 @@ cryptography==42.0.7
     #   social-auth-core
 cssselect==1.2.0
     # via premailer
-cssutils==2.11.0
+cssutils==2.10.2
     # via premailer
 cybersource-rest-client-python==0.0.21
     # via
@@ -183,7 +183,7 @@ django-haystack==3.3b2
     # via django-oscar
 django-libsass==0.9
     # via -r requirements/base.in
-django-model-utils==4.5.1
+django-model-utils==4.5.0
     # via edx-rbac
 django-oscar==3.2
     # via
@@ -269,7 +269,7 @@ extras==1.0.0
     # via cybersource-rest-client-python
 factory-boy==3.2.1
     # via django-oscar
-faker==25.2.0
+faker==25.0.0
     # via factory-boy
 fixtures==4.1.0
     # via cybersource-rest-client-python
@@ -308,10 +308,8 @@ idna==2.7
     #   cybersource-rest-client-python
     #   requests
     #   yarl
-importlib-metadata==6.11.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   markdown
+importlib-metadata==7.1.0
+    # via markdown
 importlib-resources==6.4.0
     # via
     #   jsonschema
@@ -328,7 +326,7 @@ isodate==0.6.1
     # via zeep
 itypes==1.2.0
     # via coreapi
-jinja2==3.1.4
+jinja2==3.1.3
     # via coreschema
 jmespath==1.0.1
     # via
@@ -354,7 +352,7 @@ linecache2==1.0.0
     #   traceback2
 logger==1.4
     # via cybersource-rest-client-python
-lxml[html-clean,html_clean]==5.2.2
+lxml[html-clean,html_clean]==5.2.1
     # via
     #   -r requirements/base.in
     #   lxml-html-clean
@@ -372,15 +370,15 @@ multidict==6.0.5
     # via
     #   aiohttp
     #   yarl
-mysqlclient==1.4.6
+mysqlclient==2.2.4
     # via -r requirements/base.in
 naked==0.1.32
     # via
     #   crypto
     #   cybersource-rest-client-python
 ndg-httpsclient==0.5.1
     # via -r requirements/base.in
-newrelic==9.9.1
+newrelic==9.9.0
     # via
     #   -r requirements/base.in
     #   edx-django-utils
@@ -410,13 +408,13 @@ pbr==6.0.0
     #   cybersource-rest-client-python
     #   fixtures
     #   stevedore
-phonenumbers==8.13.37
+phonenumbers==8.13.35
     # via django-oscar
 pillow==10.3.0
     # via django-oscar
 pkgutil-resolve-name==1.3.10
     # via jsonschema
-platformdirs==4.2.2
+platformdirs==4.2.1
     # via zeep
 premailer==2.9.2
     # via -r requirements/base.in
@@ -456,7 +454,7 @@ pycryptodome==3.20.0
     # via cybersource-rest-client-python
 pycryptodomex==3.20.0
     # via cybersource-rest-client-python
-pygments==2.18.0
+pygments==2.17.2
     # via -r requirements/base.in
 pyjwt[crypto]==2.8.0
     # via
@@ -555,7 +553,7 @@ requests-toolbelt==1.0.0
     # via zeep
 rjsmin==1.2.1
     # via django-compressor
-rpds-py==0.18.1
+rpds-py==0.18.0
     # via
     #   jsonschema
     #   referencing
@@ -565,7 +563,7 @@ rsa==4.9
     #   google-auth
     #   inapppy
     #   oauth2client
-rules==3.4
+rules==3.3
     # via -r requirements/base.in
 s3transfer==0.10.1
     # via boto3
@@ -610,7 +608,7 @@ stevedore==5.2.0
     # via
     #   edx-django-utils
     #   edx-opaque-keys
-stripe==9.7.0
+stripe==9.4.0
     # via -r requirements/base.in
 testtools==2.7.1
     # via
@@ -662,15 +660,15 @@ yarl==1.9.4
     # via aiohttp
 zeep==4.2.1
     # via -r requirements/base.in
-zipp==3.18.2
+zipp==3.18.1
     # via
     #   importlib-metadata
     #   importlib-resources
-zope-interface==6.4
+zope-interface==6.3
     # via
     #   cybersource-rest-client-python
     #   datetime
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
-# setuptools
+# setuptools

requirements/common_constraints.txt

@@ -13,20 +13,11 @@
 
 
 # using LTS django version
-Django<5.0
+Django<4.0
 
 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
 elasticsearch<7.14.0
 
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
-django-simple-history==3.0.0
-
-# opentelemetry requires version 6.x at the moment:
-# https://github.com/open-telemetry/opentelemetry-python/issues/3570
-# Normally this could be added as a constraint in edx-django-utils, where we're
-# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
-# that uses version 7.x, and then there's no undoing that when compiling base.txt.
-# So we need to pin it globally, for now.
-# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
-importlib-metadata<7
+django-simple-history==3.0.0