chore: make upgrade

irtazaakram · Dec 16, 2024 · 67a2270 · 67a2270
1 parent 23d00bd
commit 67a2270
Show file tree

Hide file tree

Showing 11 changed files with 133 additions and 429 deletions.
diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt
@@ -20,11 +20,7 @@ cryptography==44.0.0
     # via -r requirements/edx-sandbox/base.in
 cycler==0.12.1
     # via matplotlib
-<<<<<<< HEAD
-fonttools==4.55.0
-=======
-fonttools==4.55.2
->>>>>>> master
+fonttools==4.55.3
     # via matplotlib
 joblib==1.4.2
     # via nltk
@@ -41,7 +37,7 @@ markupsafe==3.0.2
     # via
     #   chem
     #   openedx-calc
-matplotlib==3.9.3
+matplotlib==3.10.0
     # via -r requirements/edx-sandbox/base.in
 mpmath==1.3.0
     # via sympy
@@ -92,9 +88,5 @@ sympy==1.13.3
     # via
     #   -r requirements/edx-sandbox/base.in
     #   openedx-calc
-<<<<<<< HEAD
-tqdm==4.67.0
-=======
 tqdm==4.67.1
->>>>>>> master
     # via nltk
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -10,15 +10,11 @@ acid-xblock==0.4.1
     # via -r requirements/edx/kernel.in
 aiohappyeyeballs==2.4.4
     # via aiohttp
-<<<<<<< HEAD
-aiohttp==3.11.4
-=======
-aiohttp==3.11.9
->>>>>>> master
+aiohttp==3.11.10
     # via
     #   geoip2
     #   openai
-aiosignal==1.3.1
+aiosignal==1.3.2
     # via aiohttp
 algoliasearch==3.0.0
     # via
@@ -76,21 +72,13 @@ bleach[css]==6.2.0
     #   xblock-poll
 boto==2.49.0
     # via -r requirements/edx/kernel.in
-<<<<<<< HEAD
-boto3==1.35.64
-=======
-boto3==1.35.76
->>>>>>> master
+boto3==1.35.81
     # via
     #   -r requirements/edx/kernel.in
     #   django-ses
     #   fs-s3fs
     #   ora2
-<<<<<<< HEAD
-botocore==1.35.64
-=======
-botocore==1.35.76
->>>>>>> master
+botocore==1.35.81
     # via
     #   -r requirements/edx/kernel.in
     #   boto3
@@ -113,7 +101,7 @@ celery==5.4.0
     #   edx-enterprise
     #   event-tracking
     #   openedx-learning
-certifi==2024.8.30
+certifi==2024.12.14
     # via
     #   -r requirements/edx/paver.txt
     #   elasticsearch
@@ -152,11 +140,7 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
-<<<<<<< HEAD
-code-annotations==1.8.1
-=======
-code-annotations==2.0.0
->>>>>>> master
+code-annotations==2.1.0
     # via
     #   edx-enterprise
     #   edx-toggles
@@ -337,7 +321,7 @@ django-oauth-toolkit==1.7.1
     #   edx-enterprise
 django-object-actions==4.3.0
     # via edx-enterprise
-django-pipeline==3.1.0
+django-pipeline==4.0.0
     # via -r requirements/edx/kernel.in
 django-push-notifications==3.1.0
     # via edx-ace
@@ -347,7 +331,7 @@ django-sekizai==4.1.0
     # via
     #   -r requirements/edx/kernel.in
     #   openedx-django-wiki
-django-ses==4.3.0
+django-ses==4.3.1
     # via -r requirements/edx/bundled.in
 django-simple-history==3.4.0
     # via
@@ -450,7 +434,7 @@ edx-celeryutils==1.3.0
     #   super-csv
 edx-codejail==3.5.2
     # via -r requirements/edx/kernel.in
-edx-completion==4.7.6
+edx-completion==4.7.7
     # via -r requirements/edx/kernel.in
 edx-django-release-util==1.4.0
     # via
@@ -524,7 +508,7 @@ edx-opaque-keys[django]==2.11.0
     #   ora2
 edx-organizations==6.13.0
     # via -r requirements/edx/kernel.in
-edx-proctoring==4.18.4
+edx-proctoring==5.0.1
     # via
     #   -r requirements/edx/kernel.in
     #   edx-proctoring-proctortrack
@@ -541,7 +525,7 @@ edx-search==4.1.1
     #   openedx-forum
 edx-sga==0.25.0
     # via -r requirements/edx/bundled.in
-edx-submissions==3.8.3
+edx-submissions==3.8.4
     # via
     #   -r requirements/edx/kernel.in
     #   ora2
@@ -609,20 +593,16 @@ geoip2==4.8.1
     # via -r requirements/edx/kernel.in
 glob2==0.7
     # via -r requirements/edx/kernel.in
-google-api-core[grpc]==2.23.0
+google-api-core[grpc]==2.24.0
     # via
     #   firebase-admin
     #   google-api-python-client
     #   google-cloud-core
     #   google-cloud-firestore
     #   google-cloud-storage
-<<<<<<< HEAD
-google-api-python-client==2.153.0
-=======
-google-api-python-client==2.154.0
->>>>>>> master
+google-api-python-client==2.155.0
     # via firebase-admin
-google-auth==2.36.0
+google-auth==2.37.0
     # via
     #   google-api-core
     #   google-api-python-client
@@ -650,19 +630,11 @@ googleapis-common-protos==1.66.0
     # via
     #   google-api-core
     #   grpcio-status
-<<<<<<< HEAD
-grpcio==1.68.0
-    # via
-    #   google-api-core
-    #   grpcio-status
-grpcio-status==1.68.0
-=======
 grpcio==1.68.1
     # via
     #   google-api-core
     #   grpcio-status
 grpcio-status==1.68.1
->>>>>>> master
     # via google-api-core
 gunicorn==23.0.0
     # via -r requirements/edx/kernel.in
@@ -762,7 +734,7 @@ lxml-html-clean==0.4.1
     # via lxml
 mailsnake==1.6.4
     # via -r requirements/edx/bundled.in
-mako==1.3.7
+mako==1.3.8
     # via
     #   -r requirements/edx/kernel.in
     #   acid-xblock
@@ -809,15 +781,10 @@ multidict==6.1.0
     #   aiohttp
     #   yarl
 mysqlclient==2.2.6
-<<<<<<< HEAD
-    # via -r requirements/edx/kernel.in
-newrelic==10.3.0
-=======
     # via
     #   -r requirements/edx/kernel.in
     #   openedx-forum
-newrelic==10.3.1
->>>>>>> master
+newrelic==10.4.0
     # via edx-django-utils
 nh3==0.2.19
     # via -r requirements/edx/kernel.in
@@ -869,7 +836,7 @@ openedx-events==9.15.0
     #   edx-name-affirmation
     #   event-tracking
     #   ora2
-openedx-filters==1.11.0
+openedx-filters==1.12.0
     # via
     #   -r requirements/edx/kernel.in
     #   lti-consumer-xblock
@@ -886,7 +853,7 @@ optimizely-sdk==4.1.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/bundled.in
-ora2==6.14.1
+ora2==6.14.2
     # via -r requirements/edx/bundled.in
 packaging==24.2
     # via
@@ -933,11 +900,7 @@ polib==1.2.0
     # via edx-i18n-tools
 prompt-toolkit==3.0.48
     # via click-repl
-<<<<<<< HEAD
-propcache==0.2.0
-=======
 propcache==0.2.1
->>>>>>> master
     # via
     #   aiohttp
     #   yarl
@@ -990,11 +953,7 @@ pyjwkest==1.4.2
     #   -r requirements/edx/kernel.in
     #   edx-token-utils
     #   lti-consumer-xblock
-<<<<<<< HEAD
-pyjwt[crypto]==2.10.0
-=======
 pyjwt[crypto]==2.10.1
->>>>>>> master
     # via
     #   -r requirements/edx/kernel.in
     #   drf-jwt
@@ -1103,7 +1062,7 @@ random2==1.0.2
     # via -r requirements/edx/kernel.in
 recommender-xblock==3.0.0
     # via -r requirements/edx/bundled.in
-redis==5.2.0
+redis==5.2.1
     # via
     #   -r requirements/edx/kernel.in
     #   walrus
@@ -1145,11 +1104,7 @@ requests-oauthlib==2.0.0
     # via
     #   -r requirements/edx/kernel.in
     #   social-auth-core
-<<<<<<< HEAD
-rpds-py==0.21.0
-=======
 rpds-py==0.22.3
->>>>>>> master
     # via
     #   jsonschema
     #   referencing
@@ -1232,7 +1187,7 @@ sortedcontainers==2.4.0
     #   snowflake-connector-python
 soupsieve==2.6
     # via beautifulsoup4
-sqlparse==0.5.2
+sqlparse==0.5.3
     # via django
 staff-graded-xblock==2.3.0
     # via -r requirements/edx/bundled.in
@@ -1257,11 +1212,7 @@ tinycss2==1.4.0
     # via bleach
 tomlkit==0.13.2
     # via snowflake-connector-python
-<<<<<<< HEAD
-tqdm==4.67.0
-=======
 tqdm==4.67.1
->>>>>>> master
     # via
     #   nltk
     #   openai
@@ -1328,6 +1279,8 @@ webob==1.8.9
     # via
     #   -r requirements/edx/kernel.in
     #   xblock
+wheel==0.45.1
+    # via django-pipeline
 wrapt==1.17.0
     # via -r requirements/edx/paver.txt
 xblock[django]==5.1.0
@@ -1362,11 +1315,7 @@ xmlsec==1.3.14
     # via python3-saml
 xss-utils==0.6.0
     # via -r requirements/edx/kernel.in
-<<<<<<< HEAD
-yarl==1.17.2
-=======
 yarl==1.18.3
->>>>>>> master
     # via aiohttp
 zipp==3.21.0
     # via importlib-metadata

diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt
@@ -6,13 +6,9 @@
 #
 chardet==5.2.0
     # via diff-cover
-<<<<<<< HEAD
-coverage==7.6.7
-=======
-coverage==7.6.8
->>>>>>> master
+coverage==7.6.9
     # via -r requirements/edx/coverage.in
-diff-cover==9.2.0
+diff-cover==9.2.1
     # via -r requirements/edx/coverage.in
 jinja2==3.1.4
     # via diff-cover