diff --git a/requirements/constraints.txt b/requirements/constraints.txt index e48b7a6fdba9..f25769440752 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -97,5 +97,9 @@ py2neo<2022 # Sphinx requires docutils<0.18. This pin can be removed once https://github.com/sphinx-doc/sphinx/issues/9777 is closed. docutils<0.18 -# Temporary constraint on openedx-calc. Latest openedx-calc also contains symmath, which may upend symmath package version -openedx-calc==2.0.1 +# mistune is a dependency of m2r (which is a dependency of sphinxcontrib-openapi) +# m2r fails to specify the version of mistune that it needs leading to the error message: +# AttributeError: module 'mistune' has no attribute 'BlockGrammar' +# https://github.com/miyakogi/m2r/issues/66 +mistune<2.0.0 + diff --git a/requirements/edx-sandbox/py38.in b/requirements/edx-sandbox/py38.in index ac1af4fcf966..9d90dcba97a9 100644 --- a/requirements/edx-sandbox/py38.in +++ b/requirements/edx-sandbox/py38.in @@ -20,4 +20,3 @@ numpy>=1.16.0,<1.17.0 # 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 index 9fcf62978f85..a30930bf4a5b 100644 --- a/requirements/edx-sandbox/py38.txt +++ b/requirements/edx-sandbox/py38.txt @@ -4,9 +4,7 @@ # # make upgrade # -common/lib/sandbox-packages - # via -r requirements/edx-sandbox/py38.in -common/lib/symmath +-e common/lib/sandbox-packages # via -r requirements/edx-sandbox/py38.in cffi==1.15.0 # via cryptography @@ -30,8 +28,11 @@ lxml==4.5.0 # via # -c requirements/edx-sandbox/../constraints.txt # -r requirements/edx-sandbox/py38.in + # openedx-calc markupsafe==2.0.1 - # via chem + # via + # chem + # openedx-calc matplotlib==3.3.4 # via # -c requirements/edx-sandbox/../constraints.txt @@ -53,10 +54,8 @@ numpy==1.16.6 # matplotlib # openedx-calc # scipy -openedx-calc==2.0.1 - # via - # -c requirements/edx-sandbox/../constraints.txt - # -r requirements/edx-sandbox/py38.in +openedx-calc==3.0.0 + # via -r requirements/edx-sandbox/py38.in pillow==9.0.0 # via matplotlib pycparser==2.21 @@ -88,6 +87,6 @@ sympy==1.6.2 # via # -c requirements/edx-sandbox/../constraints.txt # -r requirements/edx-sandbox/py38.in - # symmath + # openedx-calc tqdm==4.62.3 # via nltk diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1456f6176757..b294c19c39e9 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -24,8 +24,6 @@ # via -r requirements/edx/local.in -e common/lib/sandbox-packages # via -r requirements/edx/local.in --e common/lib/symmath - # via -r requirements/edx/local.in -e openedx/core/lib/xblock_builtin/xblock_discussion # via -r requirements/edx/local.in -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive @@ -626,6 +624,7 @@ lxml==4.5.0 # edxval # lti-consumer-xblock # olxcleaner + # openedx-calc # ora2 # safe-lxml # xblock @@ -653,6 +652,7 @@ markupsafe==2.0.1 # chem # jinja2 # mako + # openedx-calc # xblock maxminddb==2.2.0 # via geoip2 @@ -700,10 +700,8 @@ oauthlib==3.0.1 # lti-consumer-xblock # requests-oauthlib # social-auth-core -openedx-calc==2.0.1 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.in +openedx-calc==3.0.0 + # via -r requirements/edx/base.in openedx-events==0.7.1 # via -r requirements/edx/base.in openedx-filters==0.4.3 @@ -1002,7 +1000,7 @@ super-csv==2.1.2 sympy==1.6.2 # via # -c requirements/edx/../constraints.txt - # symmath + # openedx-calc tableauserverclient==0.17.0 # via edx-enterprise testfixtures==6.18.3 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 1ba68ca41996..f80d14a1e249 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -24,8 +24,6 @@ # via -r requirements/edx/testing.txt -e common/lib/sandbox-packages # via -r requirements/edx/testing.txt --e common/lib/symmath - # via -r requirements/edx/testing.txt -e openedx/core/lib/xblock_builtin/xblock_discussion # via -r requirements/edx/testing.txt -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive @@ -837,6 +835,7 @@ lxml==4.5.0 # edxval # lti-consumer-xblock # olxcleaner + # openedx-calc # ora2 # pyquery # safe-lxml @@ -869,6 +868,7 @@ markupsafe==2.0.1 # chem # jinja2 # mako + # openedx-calc # xblock maxminddb==2.2.0 # via @@ -878,8 +878,10 @@ mccabe==0.6.1 # via # -r requirements/edx/testing.txt # pylint -mistune==2.0.2 - # via m2r +mistune==0.8.4 + # via + # -c requirements/edx/../constraints.txt + # m2r mock==4.0.3 # via # -r requirements/edx/testing.txt @@ -933,10 +935,8 @@ oauthlib==3.0.1 # lti-consumer-xblock # requests-oauthlib # social-auth-core -openedx-calc==2.0.1 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/testing.txt +openedx-calc==3.0.0 + # via -r requirements/edx/testing.txt openedx-events==0.7.1 # via -r requirements/edx/testing.txt openedx-filters==0.4.3 @@ -1421,7 +1421,7 @@ sympy==1.6.2 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt - # symmath + # openedx-calc tableauserverclient==0.17.0 # via # -r requirements/edx/testing.txt diff --git a/requirements/edx/local.in b/requirements/edx/local.in index e0252e71cee8..d60eab5e641f 100644 --- a/requirements/edx/local.in +++ b/requirements/edx/local.in @@ -3,7 +3,6 @@ -e common/lib/capa -e common/lib/safe_lxml -e common/lib/sandbox-packages --e common/lib/symmath -e common/lib/xmodule -e openedx/core/lib/xblock_builtin/xblock_discussion diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index cb7171a39506..df0c571a333c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -24,8 +24,6 @@ # via -r requirements/edx/base.txt -e common/lib/sandbox-packages # via -r requirements/edx/base.txt --e common/lib/symmath - # via -r requirements/edx/base.txt -e openedx/core/lib/xblock_builtin/xblock_discussion # via -r requirements/edx/base.txt -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive @@ -796,6 +794,7 @@ lxml==4.5.0 # edxval # lti-consumer-xblock # olxcleaner + # openedx-calc # ora2 # pyquery # safe-lxml @@ -827,6 +826,7 @@ markupsafe==2.0.1 # chem # jinja2 # mako + # openedx-calc # xblock maxminddb==2.2.0 # via @@ -883,10 +883,8 @@ oauthlib==3.0.1 # lti-consumer-xblock # requests-oauthlib # social-auth-core -openedx-calc==2.0.1 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.txt +openedx-calc==3.0.0 + # via -r requirements/edx/base.txt openedx-events==0.7.1 # via -r requirements/edx/base.txt openedx-filters==0.4.3 @@ -1316,7 +1314,7 @@ sympy==1.6.2 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt - # symmath + # openedx-calc tableauserverclient==0.17.0 # via # -r requirements/edx/base.txt