From 65bfbda9e753fcae81537489feec35cc5dd56fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0ar=C5=ABnas=20Nejus?= Date: Tue, 4 Jun 2024 18:24:44 +0100 Subject: [PATCH] Remove windows windows/tox specific instructions On Python 3.8 this is irrelevant since in all cases tox v4 will be installed which works fine. --- .github/workflows/ci.yaml | 10 +--------- CONTRIBUTING.rst | 12 +----------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 55e47674a..0463c38f6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,15 +25,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - # tox fails on Windows if version > 3.8.3 - - name: Install base dependencies - Windows - if: matrix.platform == 'windows-latest' - run: | - python -m pip install --upgrade pip - python -m pip install tox==3.8.3 sphinx - - - name: Install base dependencies - Ubuntu - if: matrix.platform != 'windows-latest' + - name: Install base dependencies run: | python -m pip install --upgrade pip python -m pip install tox sphinx diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 671d6dc3f..6eb66e14e 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -282,7 +282,7 @@ Running the Tests To run the tests for multiple Python versions, compile the docs, and check style, use `tox`_. Just type ``tox`` or use something like -``tox -e py27`` to test a specific configuration. You can use the +``tox -e py38`` to test a specific configuration. You can use the ``--parallel`` flag to make this go faster. You can disable a hand-selected set of "slow" tests by setting the @@ -294,13 +294,6 @@ Other ways to run the tests: - ``python -m unittest discover -p 'test_*'`` (ditto) - `pytest`_ -You can also see the latest test results on `Linux`_ and on `Windows`_. - -Note, if you are on Windows and are seeing errors running tox, it may be related to `this issue`_, -in which case you may have to install tox v3.8.3 e.g. ``python -m pip install tox==3.8.3`` - -.. _this issue: https://github.com/tox-dev/tox/issues/1550 - Coverage ^^^^^^^^ @@ -360,9 +353,6 @@ others. See `unittest.mock`_ for more info. .. _pytest-random: https://github.com/klrmn/pytest-random .. _tox: https://tox.readthedocs.io/en/latest/ .. _pytest: https://docs.pytest.org/en/stable/ -.. _Linux: https://github.com/beetbox/beets/actions -.. _Windows: https://ci.appveyor.com/project/beetbox/beets/ -.. _`https://github.com/beetbox/beets/blob/master/setup.py#L99`: https://github.com/beetbox/beets/blob/master/setup.py#L99 .. _test: https://github.com/beetbox/beets/tree/master/test .. _`https://github.com/beetbox/beets/blob/master/test/test_template.py#L224`: https://github.com/beetbox/beets/blob/master/test/test_template.py#L224 .. _unittest: https://docs.python.org/3/library/unittest.html