From 51227866ee6e6104ab05f017ab38271e07d7ae89 Mon Sep 17 00:00:00 2001 From: James Addison Date: Tue, 13 Dec 2022 13:41:59 +0000 Subject: [PATCH 1/2] tox.ini: update 'py-darwin' environment to use the same Python keyword arguments as the tox upstream default ('python -I -m pip install ') Ref: https://tox.wiki/en/latest/config.html#install_command --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index fd8d8a35b..466be2b6a 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ commands = coverage run -m unittest {posargs} platform = py-darwin: darwin install_command = - py-darwin: python -m pip install --only-binary=lxml {opts} {packages} + py-darwin: python -I -m pip install --only-binary=lxml {opts} {packages} [testenv:lint] skip_install = true From e72d9ccbfa405e292022772c3281935c86c1396e Mon Sep 17 00:00:00 2001 From: James Addison Date: Tue, 13 Dec 2022 17:25:11 +0000 Subject: [PATCH 2/2] GitHub Actions workflows: version-constrain 'tox' to less-than v4, pending resolution of environment-name / platform matching issues Ref: https://github.com/hhursev/recipe-scrapers/issues/698 --- .github/workflows/linters.yaml | 2 +- .github/workflows/unittests.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml index 5277c0e8d..41560332f 100644 --- a/.github/workflows/linters.yaml +++ b/.github/workflows/linters.yaml @@ -17,5 +17,5 @@ jobs: uses: actions/setup-python@v4 with: python-version: "3.x" - - run: pip install tox + - run: pip install "tox<4" - run: tox -e lint diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index 87f60e10a..330a50c49 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -34,7 +34,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - run: pip install tox + - run: pip install "tox<4" - run: tox -e ${{ matrix.toxenv }} # Provide code coverage reports if Linux and last py version - if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11'