diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index be7180e37cc7..7253f5792032 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -3,11 +3,6 @@ # See BOM-2721 for more details. # Below is the copied and edited version of common_constraints -# This is a temporary solution to override the real common_constraints.txt -# In edx-lint, until the pyjwt constraint in edx-lint has been removed. -# See BOM-2721 for more details. -# Below is the copied and edited version of common_constraints - # A central location for most common version constraints # (across edx repos) for pip-installation. # @@ -35,3 +30,7 @@ setuptools<60 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 + +# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. +# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 +tox<4.0.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 1f8abe4f7ef8..813e8b43abfe 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -25,7 +25,7 @@ django-storages<1.9 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==3.58.18 +edx-enterprise==3.59.0 # oauthlib>3.0.1 causes test failures ( also remove the django-oauth-toolkit constraint when this is fixed ) oauthlib==3.0.1 diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt index 35ac57169f6b..70304e97b164 100644 --- a/requirements/edx-sandbox/py38.txt +++ b/requirements/edx-sandbox/py38.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 115304ffcc89..05c78387f81f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # @@ -172,7 +172,6 @@ defusedxml==0.7.1 # python3-openid # python3-saml # social-auth-core - # tableauserverclient deprecated==1.2.13 # via # jwcrypto @@ -478,7 +477,7 @@ edx-drf-extensions==8.3.1 # edx-when # edxval # learner-pathway-progress -edx-enterprise==3.58.18 +edx-enterprise==3.59.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in @@ -779,7 +778,6 @@ packaging==21.3 # drf-yasg # py2neo # redis - # tableauserverclient pansi==2020.7.3 # via py2neo path==16.5.0 @@ -986,7 +984,6 @@ requests==2.28.1 # slumber # snowflake-connector-python # social-auth-core - # tableauserverclient requests-oauthlib==1.3.1 # via # -r requirements/edx/base.in @@ -1097,8 +1094,6 @@ super-csv==3.0.1 # edx-bulk-grades sympy==1.11.1 # via openedx-calc -tableauserverclient==0.23 - # via edx-enterprise testfixtures==7.0.2 # via edx-enterprise text-unidecode==1.3 @@ -1127,7 +1122,6 @@ urllib3==1.26.12 # py2neo # requests # snowflake-connector-python - # tableauserverclient user-util==1.0.0 # via -r requirements/edx/base.in vine==5.0.0 diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 35cffbb2ec82..ad4d6752d7c5 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 76789af5cbb2..561a1f2b4323 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # @@ -253,7 +253,6 @@ defusedxml==0.7.1 # python3-openid # python3-saml # social-auth-core - # tableauserverclient deprecated==1.2.13 # via # -r requirements/edx/testing.txt @@ -598,7 +597,7 @@ edx-drf-extensions==8.3.1 # edx-when # edxval # learner-pathway-progress -edx-enterprise==3.58.18 +edx-enterprise==3.59.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt @@ -1035,7 +1034,6 @@ packaging==21.3 # pytest # redis # sphinx - # tableauserverclient # tox pact-python==1.6.0 # via -r requirements/edx/testing.txt @@ -1368,7 +1366,6 @@ requests==2.28.1 # snowflake-connector-python # social-auth-core # sphinx - # tableauserverclient requests-oauthlib==1.3.1 # via # -r requirements/edx/testing.txt @@ -1540,10 +1537,6 @@ sympy==1.11.1 # via # -r requirements/edx/testing.txt # openedx-calc -tableauserverclient==0.23 - # via - # -r requirements/edx/testing.txt - # edx-enterprise testfixtures==7.0.2 # via # -r requirements/edx/testing.txt @@ -1575,6 +1568,7 @@ tomlkit==0.11.6 # pylint tox==3.27.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/testing.txt # tox-battery tox-battery==0.6.1 @@ -1615,7 +1609,6 @@ urllib3==1.26.12 # requests # selenium # snowflake-connector-python - # tableauserverclient user-util==1.0.0 # via -r requirements/edx/testing.txt uvicorn==0.19.0 diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 600af935cff3..86879489762e 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 717c778e5acd..67a45d0a6788 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # diff --git a/requirements/edx/pip-tools.txt b/requirements/edx/pip-tools.txt index 076b1cb6abab..c2a2811e917f 100644 --- a/requirements/edx/pip-tools.txt +++ b/requirements/edx/pip-tools.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # diff --git a/requirements/edx/pip.txt b/requirements/edx/pip.txt index 5251582d388d..759f9b6ea190 100644 --- a/requirements/edx/pip.txt +++ b/requirements/edx/pip.txt @@ -1,13 +1,9 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # ---index-url http://edx.devstack.devpi:3141/root/pypi/+simple/ ---extra-index-url https://pypi.python.org/simple ---trusted-host edx.devstack.devpi - wheel==0.38.4 # via -r requirements/edx/pip.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 331937ff811c..08bab48c5f09 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # @@ -242,7 +242,6 @@ defusedxml==0.7.1 # python3-openid # python3-saml # social-auth-core - # tableauserverclient deprecated==1.2.13 # via # -r requirements/edx/base.txt @@ -578,7 +577,7 @@ edx-drf-extensions==8.3.1 # edx-when # edxval # learner-pathway-progress -edx-enterprise==3.58.18 +edx-enterprise==3.59.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -978,7 +977,6 @@ packaging==21.3 # py2neo # pytest # redis - # tableauserverclient # tox pact-python==1.6.0 # via -r requirements/edx/testing.in @@ -1290,7 +1288,6 @@ requests==2.28.1 # slumber # snowflake-connector-python # social-auth-core - # tableauserverclient requests-oauthlib==1.3.1 # via # -r requirements/edx/base.txt @@ -1432,10 +1429,6 @@ sympy==1.11.1 # via # -r requirements/edx/base.txt # openedx-calc -tableauserverclient==0.23 - # via - # -r requirements/edx/base.txt - # edx-enterprise testfixtures==7.0.2 # via # -r requirements/edx/base.txt @@ -1459,6 +1452,7 @@ tomlkit==0.11.6 # via pylint tox==3.27.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/testing.in # tox-battery tox-battery==0.6.1 @@ -1498,7 +1492,6 @@ urllib3==1.26.12 # requests # selenium # snowflake-connector-python - # tableauserverclient user-util==1.0.0 # via -r requirements/edx/base.txt uvicorn==0.19.0 diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index f5eca3ce3467..f0a03a85179b 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade #