diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 25782875f..759aab9db 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -53,9 +53,9 @@ jobs: file_handler.write('TOXENV=' + ("py" if impl == "CPython" else "pypy") + ("{}{}".format(major, minor) if impl == "CPython" else "3") + "\n") shell: python - name: Setup test suite - run: tox4 r -vv --notest + run: tox r -vv --notest - name: Run test suite - run: tox4 r --skip-pkg-install + run: tox r --skip-pkg-install env: PYTEST_ADDOPTS: "-vv --durations=20" CI_RUN: "yes" @@ -97,7 +97,7 @@ jobs: - name: Install self-tox run: python -m pip install . - name: Run check for ${{ matrix.tox_env }} - run: tox4 r -e ${{ matrix.tox_env }} + run: tox r -e ${{ matrix.tox_env }} env: UPGRADE_ADVISORY: "yes" diff --git a/.gitignore b/.gitignore index c99141761..00fa1d9b7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ build dist *.egg-info .tox -.tox4 /.*_cache .dmypy.json /docs/_draft.rst diff --git a/docs/changelog/2344.feature.rst b/docs/changelog/2344.feature.rst new file mode 100644 index 000000000..8235d1fc8 --- /dev/null +++ b/docs/changelog/2344.feature.rst @@ -0,0 +1 @@ +Use ``tox`` console entry point name instead of ``tox4`` - by :user:`gaborbernat`. diff --git a/setup.cfg b/setup.cfg index e6a4ecb24..1ffc47889 100644 --- a/setup.cfg +++ b/setup.cfg @@ -56,7 +56,7 @@ where = src [options.entry_points] console_scripts = - tox4 = tox.run:run + tox = tox.run:run [options.extras_require] docs = diff --git a/tests/test_call_modes.py b/tests/test_call_modes.py index 026fdd1e2..7f7cce08a 100644 --- a/tests/test_call_modes.py +++ b/tests/test_call_modes.py @@ -12,4 +12,4 @@ def test_call_as_module(empty_project: ToxProject) -> None: # noqa: U100 def test_call_as_exe(empty_project: ToxProject) -> None: # noqa: U100 - subprocess.check_output([str(Path(sys.executable).parent / "tox4"), "-h"]) + subprocess.check_output([str(Path(sys.executable).parent / "tox"), "-h"])