From 02f6a46ad5ac5bf051caa11d23600b01cbe4c9ed Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Wed, 23 Aug 2023 14:28:38 +0500 Subject: [PATCH] Remove matplotlib pin (#32787) * chore: upgrading matplotlib to latest version. --------- Authored-by: awais786 --- requirements/constraints.txt | 13 +++++++++++-- requirements/edx-sandbox/py38.txt | 19 ++++++++++++++----- requirements/edx/base.txt | 23 ++++++++++++++++------- requirements/edx/development.txt | 27 ++++++++++++++++----------- requirements/edx/doc.txt | 19 +++++++++++++------ requirements/edx/paver.txt | 4 +++- requirements/edx/testing.txt | 29 ++++++++++++++++++----------- requirements/pip-tools.txt | 2 +- requirements/pip.txt | 4 ++-- 9 files changed, 94 insertions(+), 46 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index caec8131509..a34152b00ed 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -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. @@ -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 diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt index 22833926322..756802cfb8a 100644 --- a/requirements/edx-sandbox/py38.txt +++ b/requirements/edx-sandbox/py38.txt @@ -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 @@ -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 @@ -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 @@ -87,3 +94,5 @@ sympy==1.12 # openedx-calc tqdm==4.66.1 # via nltk +zipp==3.16.2 + # via importlib-resources diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index d64d20b7693..63ca4968647 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 519652b3b12..68aa4ceeab5 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -2051,6 +2055,7 @@ typing-extensions==4.7.1 # django-stubs # django-stubs-ext # djangorestframework-stubs + # edx-opaque-keys # faker # fastapi # grimp @@ -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 @@ -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 diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 69dfb28d336..1cb28ec36e2 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index e3998bfb52e..4c498e9476c 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -10,7 +10,7 @@ charset-normalizer==2.0.12 # via # -c requirements/edx/../constraints.txt # requests -edx-opaque-keys==2.4.0 +edx-opaque-keys==2.5.0 # via -r requirements/edx/paver.in idna==3.4 # via requests @@ -52,6 +52,8 @@ stevedore==5.1.0 # via # -r requirements/edx/paver.in # edx-opaque-keys +typing-extensions==4.7.1 + # via edx-opaque-keys urllib3==1.26.16 # via # -c requirements/edx/../constraints.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index a606067969d..16c6ade6d4c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -534,7 +534,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 @@ -567,7 +569,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 @@ -598,7 +600,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 @@ -726,7 +728,7 @@ geoip2==4.7.0 # via -r requirements/edx/base.txt glob2==0.7 # via -r requirements/edx/base.txt -grimp==2.5 +grimp==3.0 # via import-linter gunicorn==21.2.0 # via -r requirements/edx/base.txt @@ -757,7 +759,7 @@ idna==3.4 # rfc3986 # snowflake-connector-python # yarl -import-linter==1.10.0 +import-linter==1.11.1 # via -r requirements/edx/testing.in importlib-metadata==6.8.0 # via @@ -858,7 +860,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 @@ -929,7 +931,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 @@ -962,6 +964,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 @@ -977,7 +980,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 @@ -1091,9 +1096,9 @@ pycryptodomex==3.18.0 # lti-consumer-xblock # pyjwkest # snowflake-connector-python -pydantic==2.1.1 +pydantic==2.2.1 # via fastapi -pydantic-core==2.4.0 +pydantic-core==2.6.1 # via pydantic pygments==2.16.1 # via @@ -1275,6 +1280,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 @@ -1492,7 +1498,7 @@ tox==3.28.0 # -c requirements/edx/../common_constraints.txt # -r requirements/edx/testing.in # tox-battery -tox-battery==0.6.1 +tox-battery==0.6.2 # via -r requirements/edx/testing.in tqdm==4.66.1 # via @@ -1505,6 +1511,7 @@ typing-extensions==4.7.1 # asgiref # astroid # django-countries + # edx-opaque-keys # faker # fastapi # grimp diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 19b825795e1..3a5569fc10e 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -21,7 +21,7 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.41.1 +wheel==0.41.2 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 7dfc08c7631..13c7e84595c 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.41.1 +wheel==0.41.2 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==23.2.1 # via -r requirements/pip.in -setuptools==68.1.0 +setuptools==68.1.2 # via -r requirements/pip.in