diff --git a/requirements/ci.in b/requirements/ci.in index 3797849..3586cbe 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -3,4 +3,3 @@ -c constraints.txt tox # Virtualenv management for tests -tox-battery # Makes tox aware of requirements file changes diff --git a/requirements/ci.txt b/requirements/ci.txt index dc227d3..a9f0168 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,6 +4,12 @@ # # make upgrade # +cachetools==5.3.2 + # via tox +chardet==5.2.0 + # via tox +colorama==0.4.6 + # via tox distlib==0.3.7 # via virtualenv filelock==3.13.1 @@ -22,19 +28,13 @@ platformdirs==3.11.0 # virtualenv pluggy==1.3.0 # via tox -py==1.11.0 - # via tox -six==1.16.0 +pyproject-api==1.6.1 # via tox tomli==2.0.1 # via # pyproject-api # tox -tox==3.28.0 - # via - # -r requirements/ci.in - # tox-battery -tox-battery==0.6.2 +tox==4.11.3 # via -r requirements/ci.in virtualenv==20.24.6 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index c7540b5..0401118 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -38,6 +38,10 @@ build==1.0.3 # via # -r requirements/pip-tools.txt # pip-tools +cachetools==5.3.2 + # via + # -r requirements/ci.txt + # tox celery==5.3.5 # via # -r requirements/quality.txt @@ -55,7 +59,10 @@ cffi==1.16.0 # cryptography # pynacl chardet==5.2.0 - # via diff-cover + # via + # -r requirements/ci.txt + # diff-cover + # tox charset-normalizer==3.3.2 # via # -r requirements/quality.txt @@ -88,6 +95,10 @@ code-annotations==1.5.0 # via # -r requirements/quality.txt # edx-toggles +colorama==0.4.6 + # via + # -r requirements/ci.txt + # tox coverage[toml]==7.3.2 # via # -r requirements/quality.txt @@ -285,6 +296,7 @@ packaging==23.2 # -r requirements/quality.txt # black # build + # pyproject-api # pytest # tox path==16.7.1 @@ -311,6 +323,7 @@ platformdirs==3.11.0 # -r requirements/ci.txt # -r requirements/quality.txt # black + # tox # virtualenv pluggy==1.3.0 # via @@ -329,10 +342,6 @@ psutil==5.9.6 # via # -r requirements/quality.txt # edx-django-utils -py==1.11.0 - # via - # -r requirements/ci.txt - # tox pycparser==2.21 # via # -r requirements/quality.txt @@ -356,6 +365,10 @@ pynacl==1.5.0 # edx-django-utils pypdf==3.17.1 # via -r requirements/quality.txt +pyproject-api==1.6.1 + # via + # -r requirements/ci.txt + # tox pyproject-hooks==1.0.0 # via # -r requirements/pip-tools.txt @@ -424,7 +437,6 @@ simplejson==3.19.2 # xblock six==1.16.0 # via - # -r requirements/ci.txt # -r requirements/quality.txt # dj-inmemorystorage # edx-ace @@ -432,7 +444,6 @@ six==1.16.0 # fs # openedx-completion-aggregator # python-dateutil - # tox sqlparse==0.4.4 # via # -r requirements/quality.txt @@ -457,14 +468,11 @@ tomli==2.0.1 # build # coverage # pip-tools + # pyproject-api # pyproject-hooks # pytest # tox -tox==3.28.0 - # via - # -r requirements/ci.txt - # tox-battery -tox-battery==0.6.2 +tox==4.11.3 # via -r requirements/ci.txt typing-extensions==4.8.0 # via diff --git a/tox.ini b/tox.ini index 70f04a0..2cde08d 100644 --- a/tox.ini +++ b/tox.ini @@ -44,7 +44,7 @@ setenv = PYTHONPATH = {toxinidir} # Adding the option here instead of as a default in the docs Makefile because that Makefile is generated by sphinx. SPHINXOPTS = -W -whitelist_externals = +allowlist_externals = make rm deps = @@ -59,7 +59,7 @@ commands = twine check dist/* [testenv:quality] -whitelist_externals = +allowlist_externals = make deps = -r{toxinidir}/requirements/quality.txt