diff --git a/Makefile b/Makefile index 093065efa4..a876214964 100644 --- a/Makefile +++ b/Makefile @@ -84,8 +84,8 @@ REQ_FILES = \ requirements/edx/coverage \ requirements/edx/doc \ requirements/edx/paver \ - requirements/edx-sandbox/shared \ requirements/edx-sandbox/py35 \ + requirements/edx-sandbox/py38 \ requirements/edx/base \ requirements/edx/testing \ requirements/edx/development \ diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 4e27ee9787..114241d0ce 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -15,17 +15,6 @@ # latest version breaks the tests. django<2.2.21 -# celery 5.0 has dropped python3.5 support. -celery<5.0 - -# cryptography 3.3 has dropped python3.5 support. -cryptography<3.3 - -# PYJWT[crypto]==2.0.1 requires cryptography>=3.3.1 -PyJWT[crypto]<2.0.0 -# social-auth-core>=4.0.0 requires PYJWT>=2.0.0 -social-auth-core<4.0.0 - # We do not support version django-config-models<1.0.0 django-config-models>=1.0.0 @@ -46,66 +35,32 @@ edx-enterprise==3.23.11 # Newer versions need a more recent version of python-dateutil freezegun==0.3.12 -# 4.0.0 dropped support for Python 3.5 -inflect<4.0.0 - -# 5.0.0 dropped support for Python 3.5 -isort<5.0.0 - -# 0.15.0 dropped support for Python 3.5 -joblib<0.15.0 - - -# jsonfield2 3.1.0 drops support for python 3.5 -jsonfield2<3.1.0 - -# kiwisolver 1.2.0 requires Python 3.6+ -kiwisolver<1.2.0 - # 4.5.1 introduced a bug when used together with xmlsec: https://bugs.launchpad.net/lxml/+bug/1880251 # Tests passed, but hit a problem in stage lxml<4.5.1 -# Matplotlib 3.1 requires Python 3.6 -matplotlib<3.1 - -# maxminddb 2.0.0 has dropped support for Python 3.5 -maxminddb<2.0.0 - # oauthlib>3.0.1 causes test failures ( also remove the django-oauth-toolkit constraint when this is fixed ) oauthlib==3.0.1 # django-auth-toolkit==1.3.3 requires oauthlib>=3.1.0 which is pinned because of test failures django-oauth-toolkit<=1.3.2 -# path 13.2.0 drops support for Python 3.5 -path<13.2.0 - # ARCHBOM-1141: pip-tools upgrade requires pip upgrade pip-tools<6.0 # Upgrading to 2.5.3 on 2020-01-03 triggered "'tzlocal' object has no attribute '_std_offset'" errors in production python-dateutil==2.4.0 - -# stevedore 2.0.0 requires python >= 3.6 -stevedore<2.0.0 +# matplotlib>=3.4.0 requires python-dateutil>=2.7 +matplotlib<3.4.0 # Constraint from astroid 2.3.3 wrapt==1.11.* -# zipp 2.0.0 requires Python >= 3.6 -zipp==1.0.0 - -# Matplotlib 3.1 requires Python 3.6 -matplotlib<3.1 - -# geoip2 requires Python 3.6 -geoip2<4.0.1 - # tests failing for pymongo==3.11 pymongo<3.11 # sympy latest version causing test failures. +# may be related to python35 version drop in 1.7.0. Needs to be tested before removing. sympy==1.6.2 # python3-saml==1.10.0 version started breaking a11y tests @@ -121,13 +76,26 @@ diff-cover==4.0.0 # This can be removed once transifex-client drops support for Python 2.0 and removes the required constraint. python-slugify<5.0.0 - -# Temporary package constraints to deal with some requirement upgrade issues. -Sphinx<4.0 -jinja2<3.0 -MarkupSafe<2.0 -click<8.0 - # greater version has breaking changes and requires some migration steps. django-webpack-loader==0.7.0 +# edx-proctoring==3.11.4 (latest) requires PyJWT<2.0.0 +PyJWT[crypto]<2.0.0 +social-auth-core<4.0.0 # social-auth-core>=4.0.0 requires PYJWT>=2.0.0 + +# celery requires click<8.0.0 which would be fixed once https://github.com/celery/celery/issues/6753 is done. +click<8.0.0 + +# constraints present due to Python35 support. Need to be tested and removed independently. + +celery<5.0 # celery 5.0 has dropped python3.5 support. +inflect<4.0.0 # 4.0.0 dropped support for Python 3.5 +isort<5.0.0 # 5.0.0 dropped support for Python 3.5 +joblib<0.15.0 # 0.15.0 dropped support for Python 3.5 +jsonfield2<3.1.0 # jsonfield2 3.1.0 drops support for python 3.5 +kiwisolver<1.2.0 # kiwisolver 1.2.0 requires Python 3.6+ +matplotlib<3.1 # Matplotlib 3.1 requires Python 3.6 +maxminddb<2.0.0 # maxminddb 2.0.0 has dropped support for Python 3.5 +path<13.2.0 # path 13.2.0 drops support for Python 3.5 +zipp==1.0.0 # zipp 2.0.0 requires Python >= 3.6 +geoip2<4.0.1 # geoip2 requires Python 3.6 diff --git a/requirements/edx-sandbox/py35-constraints.txt b/requirements/edx-sandbox/py35-constraints.txt new file mode 100644 index 0000000000..413d1924df --- /dev/null +++ b/requirements/edx-sandbox/py35-constraints.txt @@ -0,0 +1,38 @@ +# constraints required for Python 3.5 support in sandbox codejail environments +# All of these constraints require python3.6+ for larger versions + +celery<5.0 # celery 5.0 has dropped python3.5 support. + +geoip2<4.0.1 # geoip2 requires Python 3.6 + +inflect<4.0.0 # 4.0.0 dropped support for Python 3.5 + +isort<5.0.0 # 5.0.0 dropped support for Python 3.5 + +joblib<0.15.0 # 0.15.0 dropped support for Python 3.5 + +jsonfield2<3.1.0 # jsonfield2 3.1.0 drops support for python 3.5 + +kiwisolver<1.2.0 # kiwisolver 1.2.0 requires Python 3.6+ + +matplotlib<3.1 # Matplotlib 3.1 requires Python 3.6 + +maxminddb<2.0.0 # maxminddb 2.0.0 has dropped support for Python 3.5 + +numpy<1.19.0 # numpy 1.19.0 drops support for Python 3.5 + +path<13.2.0 # path 13.2.0 drops support for Python 3.5 + +stevedore<2.0.0 # stevedore 2.0.0 requires python >= 3.6 + +scipy<1.5.0 # scipy 1.5.0 drops support for Python 3.5 + +sympy<1.7.0 # sympy 1.7.0 drops support for Python 3.5 + +zipp==1.0.0 # zipp 2.0.0 requires Python >= 3.6 + +markupsafe<2.0.0 # markupsafe 2.0.0 requires Python >= 3.6 + +cryptography<3.3 # cryptography 3.3 has dropped python3.5 support. +PyJWT[crypto]<2.0.0 # PYJWT[crypto]==2.0.1 requires cryptography>=3.3.1 +social-auth-core<4.0.0 # social-auth-core>=4.0.0 requires PYJWT>=2.0.0 diff --git a/requirements/edx-sandbox/py35.in b/requirements/edx-sandbox/py35.in index eccc5a8605..d1087cfd84 100644 --- a/requirements/edx-sandbox/py35.in +++ b/requirements/edx-sandbox/py35.in @@ -13,11 +13,15 @@ -c ../constraints.txt +-c py35-constraints.txt + --r shared.txt # Dependencies in common with LMS and Studio chem # A helper library for chemistry calculations +cryptography # Implementations of assorted cryptography algorithms +lxml # XML parser matplotlib==2.2.4 # 2D plotting library networkx==2.2 # Utilities for creating, manipulating, and studying network graphs +nltk # Natural language processing; used by the chem package numpy==1.16.5 # Numeric array processing utilities; used by scipy openedx-calc<2.0.0 pyparsing==2.2.0 # Python Parsing module diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index 336fc05408..a4abaf76fc 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -9,20 +9,17 @@ common/lib/sandbox-packages common/lib/symmath # via -r requirements/edx-sandbox/py35.in cffi==1.14.5 - # via - # -r requirements/edx-sandbox/shared.txt - # cryptography + # via cryptography chem==1.2.0 # via -r requirements/edx-sandbox/py35.in click==7.1.2 # via # -c requirements/edx-sandbox/../constraints.txt - # -r requirements/edx-sandbox/shared.txt # nltk cryptography==3.2.1 # via - # -c requirements/edx-sandbox/../constraints.txt - # -r requirements/edx-sandbox/shared.txt + # -c requirements/edx-sandbox/py35-constraints.txt + # -r requirements/edx-sandbox/py35.in cycler==0.10.0 # via matplotlib decorator==5.0.9 @@ -30,23 +27,25 @@ decorator==5.0.9 joblib==0.14.1 # via # -c requirements/edx-sandbox/../constraints.txt - # -r requirements/edx-sandbox/shared.txt + # -c requirements/edx-sandbox/py35-constraints.txt # nltk kiwisolver==1.1.0 # via # -c requirements/edx-sandbox/../constraints.txt + # -c requirements/edx-sandbox/py35-constraints.txt # matplotlib lxml==4.5.0 # via # -c requirements/edx-sandbox/../constraints.txt - # -r requirements/edx-sandbox/shared.txt + # -r requirements/edx-sandbox/py35.in markupsafe==1.1.1 # via - # -c requirements/edx-sandbox/../constraints.txt + # -c requirements/edx-sandbox/py35-constraints.txt # chem matplotlib==2.2.4 # via # -c requirements/edx-sandbox/../constraints.txt + # -c requirements/edx-sandbox/py35-constraints.txt # -r requirements/edx-sandbox/py35.in mpmath==1.2.1 # via sympy @@ -54,10 +53,11 @@ networkx==2.2 # via -r requirements/edx-sandbox/py35.in nltk==3.6.2 # via - # -r requirements/edx-sandbox/shared.txt + # -r requirements/edx-sandbox/py35.in # chem numpy==1.16.5 # via + # -c requirements/edx-sandbox/py35-constraints.txt # -r requirements/edx-sandbox/py35.in # chem # matplotlib @@ -66,9 +66,7 @@ numpy==1.16.5 openedx-calc==1.0.9 # via -r requirements/edx-sandbox/py35.in pycparser==2.20 - # via - # -r requirements/edx-sandbox/shared.txt - # cffi + # via cffi pyparsing==2.2.0 # via # -r requirements/edx-sandbox/py35.in @@ -84,17 +82,15 @@ pytz==2021.1 random2==1.0.1 # via -r requirements/edx-sandbox/py35.in regex==2021.4.4 - # via - # -r requirements/edx-sandbox/shared.txt - # nltk + # via nltk scipy==1.2.1 # via + # -c requirements/edx-sandbox/py35-constraints.txt # -r requirements/edx-sandbox/py35.in # chem # openedx-calc six==1.16.0 # via - # -r requirements/edx-sandbox/shared.txt # chem # cryptography # cycler @@ -104,12 +100,11 @@ six==1.16.0 sympy==1.6.2 # via # -c requirements/edx-sandbox/../constraints.txt + # -c requirements/edx-sandbox/py35-constraints.txt # -r requirements/edx-sandbox/py35.in # symmath tqdm==4.61.0 - # via - # -r requirements/edx-sandbox/shared.txt - # nltk + # via nltk # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx-sandbox/py38.in b/requirements/edx-sandbox/py38.in new file mode 100644 index 0000000000..ed3fd9bb84 --- /dev/null +++ b/requirements/edx-sandbox/py38.in @@ -0,0 +1,20 @@ +-c ../constraints.txt + +chem # A helper library for chemistry calculations +cryptography # Implementations of assorted cryptography algorithms +lxml # XML parser +matplotlib # 2D plotting library +networkx # Utilities for creating, manipulating, and studying network graphs +nltk # Natural language processing; used by the chem package +numpy # Numeric array processing utilities; used by scipy +openedx-calc +pyparsing # Python Parsing module +random2 # Implementation of random module that works identically under Python 2 and 3 +scipy # Math, science, and engineering library +sympy # Symbolic math library + +# Install these packages from the edx-platform working tree +# NOTE: if you change code in these packages, you MUST change the version +# number in its setup.py or the code WILL NOT be installed during deploy. +-e common/lib/sandbox-packages +-e common/lib/symmath diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt new file mode 100644 index 0000000000..0fb2d33362 --- /dev/null +++ b/requirements/edx-sandbox/py38.txt @@ -0,0 +1,95 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# make upgrade +# +-e common/lib/sandbox-packages + # via -r requirements/edx-sandbox/py38.in +-e common/lib/symmath + # via -r requirements/edx-sandbox/py38.in +cffi==1.14.5 + # via cryptography +chem==1.2.0 + # via -r requirements/edx-sandbox/py38.in +click==7.1.2 + # via + # -c requirements/edx-sandbox/../constraints.txt + # nltk +cryptography==3.4.7 + # via -r requirements/edx-sandbox/py38.in +cycler==0.10.0 + # via matplotlib +decorator==4.4.2 + # via networkx +joblib==0.14.1 + # via + # -c requirements/edx-sandbox/../constraints.txt + # nltk +kiwisolver==1.1.0 + # via + # -c requirements/edx-sandbox/../constraints.txt + # matplotlib +lxml==4.5.0 + # via + # -c requirements/edx-sandbox/../constraints.txt + # -r requirements/edx-sandbox/py38.in +markupsafe==2.0.1 + # via chem +matplotlib==3.0.3 + # via + # -c requirements/edx-sandbox/../constraints.txt + # -r requirements/edx-sandbox/py38.in +mpmath==1.2.1 + # via sympy +networkx==2.5.1 + # via -r requirements/edx-sandbox/py38.in +nltk==3.6.2 + # via + # -r requirements/edx-sandbox/py38.in + # chem +numpy==1.20.3 + # via + # -r requirements/edx-sandbox/py38.in + # chem + # matplotlib + # openedx-calc + # scipy +openedx-calc==2.0.1 + # via -r requirements/edx-sandbox/py38.in +pycparser==2.20 + # via cffi +pyparsing==2.4.7 + # via + # -r requirements/edx-sandbox/py38.in + # chem + # matplotlib + # openedx-calc +python-dateutil==2.4.0 + # via + # -c requirements/edx-sandbox/../constraints.txt + # matplotlib +random2==1.0.1 + # via -r requirements/edx-sandbox/py38.in +regex==2021.4.4 + # via nltk +scipy==1.6.3 + # via + # -r requirements/edx-sandbox/py38.in + # chem + # openedx-calc +six==1.16.0 + # via + # chem + # cycler + # python-dateutil +sympy==1.6.2 + # via + # -c requirements/edx-sandbox/../constraints.txt + # -r requirements/edx-sandbox/py38.in + # symmath +tqdm==4.61.0 + # via nltk + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements/edx/base.in b/requirements/edx/base.in index c884102a4f..f2d47bb75e 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -10,7 +10,6 @@ -c ../constraints.txt --r ../edx-sandbox/shared.txt # Dependencies which are also used by code sandboxes -r github.in # Forks and other dependencies not yet on PyPI -r local.in # Packages in edx-platform which have their own setup.py -r paver.txt # Requirements for running paver commands @@ -39,6 +38,7 @@ celery # Asynchronous task execution library chem # A helper library for chemistry calculations contextlib2 # We need contextlib2.ExitStack so we can stop using contextlib.nested which doesn't exist in python 3 crowdsourcehinter-xblock +cryptography # Implementations of assorted cryptography algorithms defusedxml Django # Web application framework django-appconf @@ -108,6 +108,7 @@ icalendar # .ics generator, used by calendar_sync ipaddress # Ip network support for Embargo feature jsonfield2 # Django model field for validated JSON; used in several apps laboratory # Library for testing that code refactors/infrastructure changes produce identical results +lxml # XML parser lti-consumer-xblock mailsnake # Needed for mailchimp (mailing djangoapp) mako # Primary template language used for server-side page rendering @@ -115,6 +116,7 @@ Markdown # Convert text markup to HTML; used in capa mongoengine # Object-document mapper for MongoDB, used in the LMS dashboard mysqlclient # Driver for the default production relational database newrelic # New Relic agent for performance monitoring +nltk # Natural language processing; used by the chem package nodeenv # Utility for managing Node.js environments; we use this for deployments and testing oauthlib # OAuth specification support for authenticating via LTI or other Open edX services openedx-calc # Library supporting mathematical calculations for Open edX @@ -163,4 +165,3 @@ XBlock # Courseware component architecture xblock-utils # Provides utilities used by the Discussion XBlock xss-utils # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations enmerkar-underscore # Implements a underscore extractor for django-babel. - diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index df2419ee49..dad786d489 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -102,9 +102,7 @@ certifi==2021.5.30 # elasticsearch # requests cffi==1.14.5 - # via - # -r requirements/edx/../edx-sandbox/shared.txt - # cryptography + # via cryptography chardet==4.0.0 # via # -r requirements/edx/paver.txt @@ -115,7 +113,6 @@ chem==1.2.0 click==7.1.2 # via # -c requirements/edx/../constraints.txt - # -r requirements/edx/../edx-sandbox/shared.txt # code-annotations # nltk # user-util @@ -133,10 +130,9 @@ coreschema==0.0.4 # drf-yasg crowdsourcehinter-xblock==0.6 # via -r requirements/edx/base.in -cryptography==3.2.1 +cryptography==3.4.7 # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/../edx-sandbox/shared.txt + # -r requirements/edx/base.in # django-fernet-fields # edx-enterprise # pyjwt @@ -554,9 +550,8 @@ isodate==0.6.0 # python3-saml itypes==1.2.0 # via coreapi -jinja2==2.11.3 +jinja2==3.0.1 # via - # -c requirements/edx/../constraints.txt # code-annotations # coreschema jmespath==0.10.0 @@ -566,7 +561,6 @@ jmespath==0.10.0 joblib==0.14.1 # via # -c requirements/edx/../constraints.txt - # -r requirements/edx/../edx-sandbox/shared.txt # nltk jsondiff==1.3.0 # via edx-enterprise @@ -602,7 +596,7 @@ lti-consumer-xblock==2.9.1 lxml==4.5.0 # via # -c requirements/edx/../constraints.txt - # -r requirements/edx/../edx-sandbox/shared.txt + # -r requirements/edx/base.in # capa # edxval # lti-consumer-xblock @@ -628,9 +622,8 @@ markdown==3.3.4 # xblock-poll markey==0.8 # via enmerkar-underscore -markupsafe==1.1.1 +markupsafe==2.0.1 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/paver.txt # chem # jinja2 @@ -661,7 +654,7 @@ newrelic==6.4.0.157 # edx-django-utils nltk==3.6.2 # via - # -r requirements/edx/../edx-sandbox/shared.txt + # -r requirements/edx/base.in # chem nodeenv==1.6.0 # via -r requirements/edx/base.in @@ -724,9 +717,7 @@ pycontracts==1.8.12 pycountry==20.7.3 # via -r requirements/edx/base.in pycparser==2.20 - # via - # -r requirements/edx/../edx-sandbox/shared.txt - # cffi + # via cffi pycryptodomex==3.10.1 # via # -r requirements/edx/base.in @@ -842,9 +833,7 @@ recommender-xblock==2.0.1 redis==3.5.3 # via -r requirements/edx/base.in regex==2021.4.4 - # via - # -r requirements/edx/../edx-sandbox/shared.txt - # nltk + # via nltk requests-oauthlib==1.3.0 # via # -r requirements/edx/base.in @@ -903,7 +892,6 @@ simplejson==3.17.2 # xblock-utils six==1.16.0 # via - # -r requirements/edx/../edx-sandbox/shared.txt # -r requirements/edx/base.in # -r requirements/edx/paver.txt # analytics-python @@ -911,7 +899,6 @@ six==1.16.0 # chem # codejail # crowdsourcehinter-xblock - # cryptography # django-countries # edx-ace # edx-bulk-grades @@ -936,7 +923,6 @@ six==1.16.0 # python-swiftclient # social-auth-app-django # social-auth-core - # stevedore slumber==0.7.1 # via # edx-bulk-grades @@ -963,9 +949,8 @@ sqlparse==0.4.1 # django staff-graded-xblock==1.5.1 # via -r requirements/edx/base.in -stevedore==1.32.0 +stevedore==3.3.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # -r requirements/edx/paver.txt # code-annotations @@ -990,9 +975,7 @@ text-unidecode==1.3 tincan==1.0.0 # via edx-event-routing-backends tqdm==4.61.0 - # via - # -r requirements/edx/../edx-sandbox/shared.txt - # nltk + # via nltk ua-parser==0.10.0 # via django-cookies-samesite unicodecsv==0.14.1 diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index d09d244ceb..3410eadb82 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -18,15 +18,12 @@ inflect==3.0.2 # jinja2-pluralize jinja2-pluralize==0.3.0 # via diff-cover -jinja2==2.11.3 +jinja2==3.0.1 # via - # -c requirements/edx/../constraints.txt # diff-cover # jinja2-pluralize -markupsafe==1.1.1 - # via - # -c requirements/edx/../constraints.txt - # jinja2 +markupsafe==2.0.1 + # via jinja2 more-itertools==8.8.0 # via zipp pluggy==0.13.1 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 4acf866285..9b19b4ac5e 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -179,9 +179,8 @@ coverage==5.5 # pytest-cov crowdsourcehinter-xblock==0.6 # via -r requirements/edx/testing.txt -cryptography==3.2.1 +cryptography==3.4.7 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # django-fernet-fields # edx-enterprise @@ -717,9 +716,8 @@ jinja2-pluralize==0.3.0 # via # -r requirements/edx/testing.txt # diff-cover -jinja2==2.11.3 +jinja2==3.0.1 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # code-annotations # coreschema @@ -814,9 +812,8 @@ markey==0.8 # via # -r requirements/edx/testing.txt # enmerkar-underscore -markupsafe==1.1.1 +markupsafe==2.0.1 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # chem # jinja2 @@ -1234,7 +1231,6 @@ six==1.16.0 # chem # codejail # crowdsourcehinter-xblock - # cryptography # django-countries # edx-ace # edx-bulk-grades @@ -1266,7 +1262,6 @@ six==1.16.0 # social-auth-app-django # social-auth-core # sphinxcontrib-httpdomain - # stevedore # tox # transifex-client # virtualenv @@ -1299,9 +1294,8 @@ soupsieve==2.2.1 # via # -r requirements/edx/testing.txt # beautifulsoup4 -sphinx==3.5.4 +sphinx==4.0.2 # via - # -c requirements/edx/../constraints.txt # edx-sphinx-theme # sphinxcontrib-httpdomain sphinxcontrib-applehelp==1.0.2 @@ -1327,9 +1321,8 @@ sqlparse==0.4.1 # django-debug-toolbar staff-graded-xblock==1.5.1 # via -r requirements/edx/testing.txt -stevedore==1.32.0 +stevedore==3.3.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # code-annotations # edx-ace diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index a3a3ec4b40..72a5f07837 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -32,15 +32,12 @@ idna==2.10 # via requests imagesize==1.2.0 # via sphinx -jinja2==2.11.3 +jinja2==3.0.1 # via - # -c requirements/edx/../constraints.txt # code-annotations # sphinx -markupsafe==1.1.1 - # via - # -c requirements/edx/../constraints.txt - # jinja2 +markupsafe==2.0.1 + # via jinja2 packaging==20.9 # via sphinx pbr==5.6.0 @@ -60,16 +57,13 @@ pyyaml==5.4.1 requests==2.25.1 # via sphinx six==1.16.0 - # via - # edx-sphinx-theme - # stevedore + # via edx-sphinx-theme smmap==4.0.0 # via gitdb snowballstemmer==2.1.0 # via sphinx -sphinx==3.5.4 +sphinx==4.0.2 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.in # edx-sphinx-theme sphinxcontrib-applehelp==1.0.2 @@ -84,10 +78,8 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -stevedore==1.32.0 - # via - # -c requirements/edx/../constraints.txt - # code-annotations +stevedore==3.3.0 + # via code-annotations text-unidecode==1.3 # via python-slugify urllib3==1.26.5 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 86c5ed37c3..1abb994b79 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -16,10 +16,8 @@ lazy==1.4 # via -r requirements/edx/paver.in libsass==0.10.0 # via -r requirements/edx/paver.in -markupsafe==1.1.1 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/paver.in +markupsafe==2.0.1 + # via -r requirements/edx/paver.in mock==4.0.3 # via -r requirements/edx/paver.in path==13.1.0 @@ -46,10 +44,8 @@ six==1.16.0 # libsass # paver # python-memcached - # stevedore -stevedore==1.32.0 +stevedore==3.3.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/paver.in # edx-opaque-keys urllib3==1.26.5 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 71872ee8f6..1cfdc26a74 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -169,9 +169,8 @@ coverage==5.5 # pytest-cov crowdsourcehinter-xblock==0.6 # via -r requirements/edx/base.txt -cryptography==3.2.1 +cryptography==3.4.7 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # django-fernet-fields # edx-enterprise @@ -686,9 +685,8 @@ jinja2-pluralize==0.3.0 # via # -r requirements/edx/coverage.txt # diff-cover -jinja2==2.11.3 +jinja2==3.0.1 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # -r requirements/edx/coverage.txt # code-annotations @@ -777,9 +775,8 @@ markey==0.8 # via # -r requirements/edx/base.txt # enmerkar-underscore -markupsafe==1.1.1 +markupsafe==2.0.1 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # -r requirements/edx/coverage.txt # chem @@ -1171,7 +1168,6 @@ six==1.16.0 # chem # codejail # crowdsourcehinter-xblock - # cryptography # django-countries # edx-ace # edx-bulk-grades @@ -1200,7 +1196,6 @@ six==1.16.0 # singledispatch # social-auth-app-django # social-auth-core - # stevedore # tox # transifex-client # virtualenv @@ -1235,9 +1230,8 @@ sqlparse==0.4.1 # django staff-graded-xblock==1.5.1 # via -r requirements/edx/base.txt -stevedore==1.32.0 +stevedore==3.3.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # code-annotations # edx-ace