Skip to content

Commit 02366ff

Browse files
committed
tox-gh-actions is not yet compatible with tox>=4
1 parent c722ce7 commit 02366ff

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/workflows/ci-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- name: Upgrade setuptools and install tox
5858
run: |
5959
pip install -U pip setuptools wheel
60-
pip install "tox<4" tox-gh-actions
60+
pip install "tox<4" "tox-gh-actions<3"
6161
6262
- name: MyPy cache
6363
if: ${{ matrix.step == 'mypy' }}
@@ -102,7 +102,7 @@ jobs:
102102
- name: Upgrade setuptools and install tox
103103
run: |
104104
pip install -U pip setuptools wheel
105-
pip install tox tox-gh-actions
105+
pip install "tox<4" "tox-gh-actions<3"
106106
107107
- if: ${{ matrix.step == 'pydocstyle' && github.event_name == 'pull_request'}}
108108
name: Create local branch for diff-quality for PRs
@@ -224,7 +224,7 @@ jobs:
224224
- name: Upgrade setuptools and install tox
225225
run: |
226226
pip install -U pip setuptools wheel
227-
pip install tox tox-gh-actions
227+
pip install "tox<4" "tox-gh-actions<3"
228228
# # docker for mac install is not currently stable
229229
# - name: 'SETUP MacOS: load Homebrew cache'
230230
# uses: actions/cache@v3

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ To run the basic tests after installing `cwltool` execute the following:
716716
To run various tests in all supported Python environments, we use `tox <https://github.com/common-workflow-language/cwltool/tree/main/tox.ini>`_. To run the test suite in all supported Python environments
717717
first clone the complete code repository (see the ``git clone`` instructions above) and then run
718718
the following in the terminal:
719-
``pip install tox; tox -p``
719+
``pip install "tox<4"; tox -p``
720720

721721
List of all environment can be seen using:
722722
``tox --listenvs``

tox.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ setenv =
6161
py3{6,7,8,9,10,11}-unit: LC_ALL = C.UTF-8
6262

6363
commands_pre =
64-
py311-lintreadme: python -m build --outdir ${TOX_PACKAGE}
64+
py3{6,7,8,9,10,11}-unit: python -m pip install -U pip setuptools wheel
65+
py311-lintreadme: python -m build --outdir {distdir}
6566

6667
commands =
6768
py3{6,7,8,9,10,11}-unit: make coverage-report coverage.xml PYTEST_EXTRA={posargs}
@@ -71,7 +72,7 @@ commands =
7172
py37-mypy: make mypy_3.6
7273
py311-shellcheck: make shellcheck
7374
py311-pydocstyle: make diff_pydocstyle_report
74-
py311-lintreadme: twine check ${TOX_PACKAGE}/*
75+
py311-lintreadme: twine check {distdir}/*
7576

7677
skip_install =
7778
py3{6,7,8,9,10,11}-{bandit,lint,mypy,shellcheck,pydocstyle,lintreadme}: true

0 commit comments

Comments
 (0)