fix: fix make upgrade job and _mysql issue (openedx#32084)

* fix: upgrade pip & pip-tools versions * fix: install libmysqlclient-dev system package again * fix: skip reinstalling mysqlclient package * fix: add pytz package constraint --------- Co-authored-by: edX requirements bot <[email protected]> (cherry picked from commit 0ec7b8c)
DmytroAlipov · Jun 12, 2023 · 2817dd1 · 2817dd1
1 parent 2b50ccb
commit 2817dd1
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 116 deletions.
diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml
@@ -61,10 +61,6 @@ jobs:
     - name: Install Python dependencies
       run: |
         make dev-requirements
-        pip uninstall -y mysqlclient
-        pip install --no-binary mysqlclient mysqlclient
-        pip uninstall -y xmlsec
-        pip install --no-binary xmlsec xmlsec
 
     - name: Initiate Services
       run: |
@@ -78,6 +74,11 @@ jobs:
           UPDATE mysql.user SET authentication_string = null WHERE user = 'root';
           FLUSH PRIVILEGES;
         EOF
+    
+    - name: Install mysqlclient-dev binary
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libmysqlclient-dev
 
     - name: Run Tests
       env:

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -90,3 +90,7 @@ babel==2.11.0
 social-auth-app-django==5.0.0
 algoliasearch==2.6.3
 django-ipware==4.0.2
+
+# pytz>2022 has major changes which are causing test failures.
+# Pinning this version for now so this could be fixed in a separate PR later on
+pytz<2023
diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt
@@ -38,7 +38,7 @@ matplotlib==3.3.4
     #   -r requirements/edx-sandbox/py38.in
 mpmath==1.3.0
     # via sympy
-networkx==3.0
+networkx==3.1
     # via -r requirements/edx-sandbox/py38.in
 nltk==3.8.1
     # via
@@ -52,7 +52,7 @@ numpy==1.22.4
     #   scipy
 openedx-calc==3.0.1
     # via -r requirements/edx-sandbox/py38.in
-pillow==9.4.0
+pillow==9.5.0
     # via matplotlib
 pycparser==2.21
     # via cffi
@@ -66,7 +66,7 @@ python-dateutil==2.8.2
     # via matplotlib
 random2==1.0.1
     # via -r requirements/edx-sandbox/py38.in
-regex==2022.10.31
+regex==2023.3.23
     # via nltk
 scipy==1.7.3
     # via

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -16,7 +16,7 @@ algoliasearch==2.6.3
     #   -r requirements/edx/base.in
 amqp==5.1.1
     # via kombu
-analytics-python==1.4.0
+analytics-python==1.4.post1
     # via -r requirements/edx/base.in
 aniso8601==9.0.1
     # via edx-tincan-py35
@@ -34,7 +34,7 @@ async-timeout==4.0.2
     # via
     #   aiohttp
     #   redis
-attrs==22.2.0
+attrs==23.1.0
     # via
     #   -r requirements/edx/base.in
     #   aiohttp
@@ -53,7 +53,7 @@ backoff==1.10.0
     # via analytics-python
 backports-zoneinfo==0.2.1
     # via icalendar
-beautifulsoup4==4.11.2
+beautifulsoup4==4.12.2
     # via pynliner
 billiard==3.6.4.0
     # via celery
@@ -261,7 +261,7 @@ django-config-models==2.3.0
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==3.13.0
+django-cors-headers==3.14.0
     # via -r requirements/edx/base.in
 django-countries==7.5.1
     # via
@@ -282,7 +282,7 @@ django-fernet-fields==0.6
     # via
     #   -r requirements/edx/base.in
     #   edx-enterprise
-django-filter==22.1
+django-filter==23.1
     # via
     #   -r requirements/edx/base.in
     #   edx-enterprise
@@ -467,7 +467,7 @@ edx-django-utils==5.3.0
     #   ora2
     #   outcome-surveys
     #   super-csv
-edx-drf-extensions==8.4.1
+edx-drf-extensions==8.6.0
     # via
     #   -r requirements/edx/base.in
     #   edx-completion
@@ -484,7 +484,7 @@ edx-enterprise==3.61.11
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.in
     #   learner-pathway-progress
-edx-event-bus-kafka==3.9.4
+edx-event-bus-kafka==3.9.6
     # via -r requirements/edx/base.in
 edx-i18n-tools==0.9.2
     # via ora2
@@ -542,6 +542,7 @@ edx-toggles==5.0.0
     #   edx-completion
     #   edx-event-bus-kafka
     #   edx-name-affirmation
+    #   edx-search
     #   edxval
     #   learner-pathway-progress
     #   ora2
@@ -570,7 +571,7 @@ event-tracking==2.1.0
     #   edx-search
 fastavro==1.7.3
     # via openedx-events
-filelock==3.10.0
+filelock==3.11.0
     # via snowflake-connector-python
 frozenlist==1.3.3
     # via
@@ -600,7 +601,7 @@ html5lib==1.1
     # via
     #   -r requirements/edx/base.in
     #   ora2
-icalendar==5.0.4
+icalendar==5.0.5
     # via -r requirements/edx/base.in
 idna==3.4
     # via
@@ -609,7 +610,7 @@ idna==3.4
     #   requests
     #   snowflake-connector-python
     #   yarl
-importlib-metadata==6.0.0
+importlib-metadata==6.4.1
     # via markdown
 importlib-resources==5.12.0
     # via jsonschema
@@ -711,7 +712,7 @@ markupsafe==2.1.2
     #   xblock
 maxminddb==2.2.0
     # via geoip2
-mock==5.0.1
+mock==5.0.2
     # via -r requirements/edx/paver.txt
 mongodbproxy @ git+https://github.com/openedx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a
     # via -r requirements/edx/github.in
@@ -731,7 +732,7 @@ mysqlclient==2.1.1
     # via
     #   -r requirements/edx/base.in
     #   openedx-blockstore
-newrelic==8.7.0
+newrelic==8.8.0
     # via
     #   -r requirements/edx/base.in
     #   edx-django-utils
@@ -767,7 +768,7 @@ openedx-django-require==2.0.0
     # via -r requirements/edx/base.in
 openedx-django-wiki==2.0.0
     # via -r requirements/edx/base.in
-openedx-events==5.1.0
+openedx-events==7.0.0
     # via
     #   -r requirements/edx/base.in
     #   edx-event-bus-kafka
@@ -783,7 +784,7 @@ oscrypto==1.3.0
     # via snowflake-connector-python
 outcome-surveys==2.4.0
     # via -r requirements/edx/base.in
-packaging==23.0
+packaging==23.1
     # via
     #   drf-yasg
     #   py2neo
@@ -811,7 +812,7 @@ pgpy==0.6.0
     # via edx-enterprise
 piexif==1.1.3
     # via -r requirements/edx/base.in
-pillow==9.4.0
+pillow==9.5.0
     # via
     #   -r requirements/edx/base.in
     #   edx-enterprise
@@ -822,7 +823,7 @@ polib==1.2.0
     # via edx-i18n-tools
 prompt-toolkit==3.0.38
     # via click-repl
-psutil==5.9.4
+psutil==5.9.5
     # via
     #   -r requirements/edx/paver.txt
     #   edx-django-utils
@@ -843,7 +844,7 @@ pycryptodomex==3.17
     #   lti-consumer-xblock
     #   pyjwkest
     #   snowflake-connector-python
-pygments==2.14.0
+pygments==2.15.0
     # via
     #   -r requirements/edx/base.in
     #   py2neo
@@ -917,7 +918,7 @@ python-memcached==1.59
     # via -r requirements/edx/paver.txt
 python-slugify==8.0.1
     # via code-annotations
-python-swiftclient==4.2.0
+python-swiftclient==4.3.0
     # via ora2
 python3-openid==3.2.0 ; python_version >= "3"
     # via
@@ -929,6 +930,7 @@ python3-saml==1.9.0
     #   -r requirements/edx/base.in
 pytz==2022.7.1
     # via
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.in
     #   babel
     #   celery
@@ -961,13 +963,13 @@ pyyaml==6.0
     #   xblock
 random2==1.0.1
     # via -r requirements/edx/base.in
-rapidfuzz==2.13.7
+rapidfuzz==2.15.1
     # via levenshtein
 recommender-xblock==2.0.1
     # via -r requirements/edx/base.in
-redis==4.5.1
+redis==4.5.4
     # via -r requirements/edx/base.in
-regex==2022.10.31
+regex==2023.3.23
     # via nltk
 requests==2.28.2
     # via
@@ -1019,7 +1021,7 @@ semantic-version==2.10.0
     # via edx-drf-extensions
 shapely==2.0.1
     # via -r requirements/edx/base.in
-simplejson==3.18.4
+simplejson==3.19.1
     # via
     #   -r requirements/edx/base.in
     #   sailthru-client
@@ -1062,7 +1064,7 @@ slumber==0.7.1
     #   edx-bulk-grades
     #   edx-enterprise
     #   edx-rest-api-client
-snowflake-connector-python==3.0.1
+snowflake-connector-python==3.0.2
     # via edx-enterprise
 social-auth-app-django==5.0.0
     # via
@@ -1081,7 +1083,7 @@ sorl-thumbnail==12.9.0
     #   openedx-django-wiki
 sortedcontainers==2.4.0
     # via -r requirements/edx/base.in
-soupsieve==2.4
+soupsieve==2.4.1
     # via beautifulsoup4
 sqlparse==0.4.3
     # via
@@ -1143,7 +1145,7 @@ vine==5.0.0
     #   kombu
 voluptuous==0.13.1
     # via ora2
-watchdog==2.3.1
+watchdog==3.0.0
     # via -r requirements/edx/paver.txt
 wcwidth==0.2.6
     # via prompt-toolkit

diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt
@@ -6,7 +6,7 @@
 #
 chardet==5.1.0
     # via diff-cover
-coverage==7.2.1
+coverage==7.2.3
     # via -r requirements/edx/coverage.in
 diff-cover==7.5.0
     # via -r requirements/edx/coverage.in
@@ -16,5 +16,5 @@ markupsafe==2.1.2
     # via jinja2
 pluggy==1.0.0
     # via diff-cover
-pygments==2.14.0
+pygments==2.15.0
     # via diff-cover