Skip to content

Commit

Permalink
Remove matplotlib pin (openedx#32787)
Browse files Browse the repository at this point in the history
* chore: upgrading matplotlib to latest version.
---------

Authored-by: awais786 <awais786@users.noreply.github.com>
  • Loading branch information
awais786 authored Aug 23, 2023
1 parent 45fd0b5 commit 02f6a46
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 46 deletions.
13 changes: 11 additions & 2 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ edx-enterprise==4.0.17
# so we're upgrading minor versions one by one.
django-oauth-toolkit==1.4.1

# Will be updated once we update python-dateutil package
matplotlib<3.4.0

# constrained in opaque_keys. migration guide here: https://pymongo.readthedocs.io/en/4.0/migrate-to-pymongo4.html
# Major upgrade will be done in separate ticket.
Expand Down Expand Up @@ -127,3 +125,14 @@ libsass==0.10.0

# incremental upgrade
django-simple-history==3.3.0

# greater version breaking upgrade builds
click==8.1.6

# plz upgrade this in separate ticket
redis==4.6.0

# openedx-learning new version has some changes which are breaking quality tests
# See https://github.com/openedx/openedx-learning/pull/68 for the changes.
# It needs to be updated in a separate issue.
openedx-learning==0.1.2
19 changes: 14 additions & 5 deletions requirements/edx-sandbox/py38.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,18 @@ click==8.1.6
# nltk
codejail-includes==1.0.0
# via -r requirements/edx-sandbox/py38.in
contourpy==1.1.0
# via matplotlib
cryptography==38.0.4
# via
# -c requirements/edx-sandbox/../constraints.txt
# -r requirements/edx-sandbox/py38.in
cycler==0.11.0
# via matplotlib
fonttools==4.42.1
# via matplotlib
importlib-resources==6.0.1
# via matplotlib
joblib==1.3.2
# via nltk
kiwisolver==1.4.4
Expand All @@ -32,10 +38,8 @@ markupsafe==2.1.3
# via
# chem
# openedx-calc
matplotlib==3.3.4
# via
# -c requirements/edx-sandbox/../constraints.txt
# -r requirements/edx-sandbox/py38.in
matplotlib==3.7.2
# via -r requirements/edx-sandbox/py38.in
mpmath==1.3.0
# via sympy
networkx==3.1
Expand All @@ -47,18 +51,21 @@ nltk==3.8.1
numpy==1.22.4
# via
# chem
# contourpy
# matplotlib
# openedx-calc
# scipy
openedx-calc==3.0.1
# via -r requirements/edx-sandbox/py38.in
packaging==23.1
# via matplotlib
pillow==9.5.0
# via
# -c requirements/edx-sandbox/../constraints.txt
# matplotlib
pycparser==2.21
# via cffi
pyparsing==3.1.1
pyparsing==3.0.9
# via
# -r requirements/edx-sandbox/py38.in
# chem
Expand Down Expand Up @@ -87,3 +94,5 @@ sympy==1.12
# openedx-calc
tqdm==4.66.1
# via nltk
zipp==3.16.2
# via importlib-resources
23 changes: 16 additions & 7 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,9 @@ edx-bulk-grades==1.0.2
# -r requirements/edx/kernel.in
# staff-graded-xblock
edx-ccx-keys==1.2.1
# via -r requirements/edx/kernel.in
# via
# -r requirements/edx/kernel.in
# lti-consumer-xblock
edx-celeryutils==1.2.3
# via
# -r requirements/edx/kernel.in
Expand Down Expand Up @@ -463,7 +465,7 @@ edx-django-utils==5.7.0
# openedx-blockstore
# ora2
# super-csv
edx-drf-extensions==8.9.0
edx-drf-extensions==8.9.1
# via
# -r requirements/edx/kernel.in
# edx-completion
Expand All @@ -489,7 +491,7 @@ edx-milestones==0.5.0
# via -r requirements/edx/kernel.in
edx-name-affirmation==2.3.6
# via -r requirements/edx/kernel.in
edx-opaque-keys[django]==2.4.0
edx-opaque-keys[django]==2.5.0
# via
# -r requirements/edx/kernel.in
# -r requirements/edx/paver.txt
Expand Down Expand Up @@ -665,7 +667,7 @@ libsass==0.10.0
# -r requirements/edx/paver.txt
loremipsum==1.0.5
# via ora2
lti-consumer-xblock==9.6.0
lti-consumer-xblock==9.6.1
# via -r requirements/edx/kernel.in
lxml==4.9.3
# via
Expand Down Expand Up @@ -724,7 +726,7 @@ mysqlclient==2.2.0
# via
# -r requirements/edx/kernel.in
# openedx-blockstore
newrelic==8.10.0
newrelic==8.10.1
# via
# -r requirements/edx/bundled.in
# edx-django-utils
Expand Down Expand Up @@ -752,7 +754,9 @@ openedx-blockstore==1.4.0
openedx-calc==3.0.1
# via -r requirements/edx/kernel.in
openedx-django-pyfs==3.4.0
# via xblock
# via
# lti-consumer-xblock
# xblock
openedx-django-require==2.1.0
# via -r requirements/edx/kernel.in
openedx-django-wiki==2.0.1
Expand All @@ -767,7 +771,9 @@ openedx-filters==1.5.0
# -r requirements/edx/kernel.in
# lti-consumer-xblock
openedx-learning==0.1.2
# via -r requirements/edx/kernel.in
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
openedx-mongodbproxy==0.2.0
# via -r requirements/edx/kernel.in
optimizely-sdk==4.1.1
Expand Down Expand Up @@ -959,6 +965,7 @@ recommender-xblock==2.0.1
# via -r requirements/edx/bundled.in
redis==4.6.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
# walrus
referencing==0.30.2
Expand Down Expand Up @@ -1117,8 +1124,10 @@ tqdm==4.66.1
# via nltk
typing-extensions==4.7.1
# via
# -r requirements/edx/paver.txt
# asgiref
# django-countries
# edx-opaque-keys
# kombu
# pylti1p3
# snowflake-connector-python
Expand Down
27 changes: 16 additions & 11 deletions requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,7 @@ edx-ccx-keys==1.2.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# lti-consumer-xblock
edx-celeryutils==1.2.3
# via
# -r requirements/edx/doc.txt
Expand Down Expand Up @@ -730,7 +731,7 @@ edx-django-utils==5.7.0
# openedx-blockstore
# ora2
# super-csv
edx-drf-extensions==8.9.0
edx-drf-extensions==8.9.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -771,7 +772,7 @@ edx-name-affirmation==2.3.6
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
edx-opaque-keys[django]==2.4.0
edx-opaque-keys[django]==2.5.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -949,7 +950,7 @@ glob2==0.7
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
grimp==2.5
grimp==3.0
# via
# -r requirements/edx/testing.txt
# import-linter
Expand Down Expand Up @@ -999,7 +1000,7 @@ imagesize==1.4.1
# via
# -r requirements/edx/doc.txt
# sphinx
import-linter==1.10.0
import-linter==1.11.1
# via -r requirements/edx/testing.txt
importlib-metadata==6.8.0
# via
Expand Down Expand Up @@ -1129,7 +1130,7 @@ loremipsum==1.0.5
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# ora2
lti-consumer-xblock==9.6.0
lti-consumer-xblock==9.6.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1230,7 +1231,7 @@ mysqlclient==2.2.0
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# openedx-blockstore
newrelic==8.10.0
newrelic==8.10.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1277,6 +1278,7 @@ openedx-django-pyfs==3.4.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# lti-consumer-xblock
# xblock
openedx-django-require==2.1.0
# via
Expand All @@ -1299,6 +1301,7 @@ openedx-filters==1.5.0
# lti-consumer-xblock
openedx-learning==0.1.2
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
openedx-mongodbproxy==0.2.0
Expand Down Expand Up @@ -1454,11 +1457,11 @@ pycryptodomex==3.18.0
# lti-consumer-xblock
# pyjwkest
# snowflake-connector-python
pydantic==2.1.1
pydantic==2.2.1
# via
# -r requirements/edx/testing.txt
# fastapi
pydantic-core==2.4.0
pydantic-core==2.6.1
# via
# -r requirements/edx/testing.txt
# pydantic
Expand Down Expand Up @@ -1694,6 +1697,7 @@ recommender-xblock==2.0.1
# -r requirements/edx/testing.txt
redis==4.6.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# walrus
Expand Down Expand Up @@ -2023,7 +2027,7 @@ tox==3.28.0
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/testing.txt
# tox-battery
tox-battery==0.6.1
tox-battery==0.6.2
# via -r requirements/edx/testing.txt
tqdm==4.66.1
# via
Expand Down Expand Up @@ -2051,6 +2055,7 @@ typing-extensions==4.7.1
# django-stubs
# django-stubs-ext
# djangorestframework-stubs
# edx-opaque-keys
# faker
# fastapi
# grimp
Expand Down Expand Up @@ -2119,7 +2124,7 @@ voluptuous==0.13.1
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# ora2
vulture==2.8
vulture==2.9.1
# via -r requirements/edx/development.in
walrus==0.9.3
# via
Expand Down Expand Up @@ -2157,7 +2162,7 @@ webob==1.8.7
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# xblock
wheel==0.41.1
wheel==0.41.2
# via
# -r requirements/edx/../pip-tools.txt
# pip-tools
Expand Down
19 changes: 13 additions & 6 deletions requirements/edx/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,9 @@ edx-bulk-grades==1.0.2
# -r requirements/edx/base.txt
# staff-graded-xblock
edx-ccx-keys==1.2.1
# via -r requirements/edx/base.txt
# via
# -r requirements/edx/base.txt
# lti-consumer-xblock
edx-celeryutils==1.2.3
# via
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -538,7 +540,7 @@ edx-django-utils==5.7.0
# openedx-blockstore
# ora2
# super-csv
edx-drf-extensions==8.9.0
edx-drf-extensions==8.9.1
# via
# -r requirements/edx/base.txt
# edx-completion
Expand Down Expand Up @@ -566,7 +568,7 @@ edx-milestones==0.5.0
# via -r requirements/edx/base.txt
edx-name-affirmation==2.3.6
# via -r requirements/edx/base.txt
edx-opaque-keys[django]==2.4.0
edx-opaque-keys[django]==2.5.0
# via
# -r requirements/edx/base.txt
# edx-bulk-grades
Expand Down Expand Up @@ -791,7 +793,7 @@ loremipsum==1.0.5
# via
# -r requirements/edx/base.txt
# ora2
lti-consumer-xblock==9.6.0
lti-consumer-xblock==9.6.1
# via -r requirements/edx/base.txt
lxml==4.9.3
# via
Expand Down Expand Up @@ -860,7 +862,7 @@ mysqlclient==2.2.0
# via
# -r requirements/edx/base.txt
# openedx-blockstore
newrelic==8.10.0
newrelic==8.10.1
# via
# -r requirements/edx/base.txt
# edx-django-utils
Expand Down Expand Up @@ -893,6 +895,7 @@ openedx-calc==3.0.1
openedx-django-pyfs==3.4.0
# via
# -r requirements/edx/base.txt
# lti-consumer-xblock
# xblock
openedx-django-require==2.1.0
# via -r requirements/edx/base.txt
Expand All @@ -908,7 +911,9 @@ openedx-filters==1.5.0
# -r requirements/edx/base.txt
# lti-consumer-xblock
openedx-learning==0.1.2
# via -r requirements/edx/base.txt
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
openedx-mongodbproxy==0.2.0
# via -r requirements/edx/base.txt
optimizely-sdk==4.1.1
Expand Down Expand Up @@ -1141,6 +1146,7 @@ recommender-xblock==2.0.1
# via -r requirements/edx/base.txt
redis==4.6.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
# walrus
referencing==0.30.2
Expand Down Expand Up @@ -1376,6 +1382,7 @@ typing-extensions==4.7.1
# -r requirements/edx/base.txt
# asgiref
# django-countries
# edx-opaque-keys
# kombu
# pydata-sphinx-theme
# pylti1p3
Expand Down
Loading

0 comments on commit 02f6a46

Please sign in to comment.