From bd7d20750e33f4d032dc54e8c057c2e674d8e38f Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Wed, 15 Nov 2023 16:53:16 +0500 Subject: [PATCH] feat: add tox 4.0 support --- CHANGELOG.rst | 5 +++-- requirements/dev.in | 1 - requirements/dev.txt | 3 --- tox.ini | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9c200077..be5c0b25 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,10 +14,11 @@ Change Log Unreleased ~~~~~~~~~~ +* Removed usage of ``tox-battery`` and added support for ``tox 4.0`` * Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is deprecated. See https://github.com/openedx/edx-sphinx-theme/issues/184 for - more details. - + more details. + [0.1.0] - 2021-08-08 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/requirements/dev.in b/requirements/dev.in index 2c949248..e2af3931 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -7,5 +7,4 @@ diff-cover # Changeset diff test coverage edx-i18n-tools # For i18n_tool dummy -tox-battery # Makes tox aware of requirements file changes django-debug-toolbar # Debugging DB queries primarily diff --git a/requirements/dev.txt b/requirements/dev.txt index af7157e1..f505facf 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -484,9 +484,6 @@ tox==3.28.0 # via # -c requirements/constraints.txt # -r requirements/ci.txt - # tox-battery -tox-battery==0.6.2 - # via -r requirements/dev.in twine==4.0.2 # via -r requirements/quality.txt types-pytz==2023.3.1.1 diff --git a/tox.ini b/tox.ini index 284b213f..4f57a857 100644 --- a/tox.ini +++ b/tox.ini @@ -52,7 +52,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 = @@ -66,7 +66,7 @@ commands = python setup.py check --restructuredtext --strict [testenv:quality] -whitelist_externals = +allowlist_externals = make rm touch