aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSviatoslav Sydorenko <wk@sydorenko.org.ua>2020-01-14 13:46:08 +0100
committerSviatoslav Sydorenko <wk@sydorenko.org.ua>2020-01-20 03:01:07 +0100
commit53d1343eacf565be5bf885960989c106accfb691 (patch)
tree557fb98237de87ddd52108c5090f7d124b9cb056
parentf8af062c7345e6aaf82eed9a5fdf9f04c68d275f (diff)
downloadexternal_python_setuptools-53d1343eacf565be5bf885960989c106accfb691.tar.gz
external_python_setuptools-53d1343eacf565be5bf885960989c106accfb691.tar.bz2
external_python_setuptools-53d1343eacf565be5bf885960989c106accfb691.zip
Support PyPy2
-rw-r--r--.github/workflows/python-tests.yml4
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 286e022c..4dc997e5 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -77,13 +77,13 @@ jobs:
- name: 'Initialize tox envs: ${{ matrix.env.TOXENV }}'
run: |
- ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version || 'pypy2' == matrix.python-version) && 'py27' || '$TOXENV' }}
+ ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version && 'py27') || ('pypy2' == matrix.python-version && 'pypy2') || '$TOXENV' }}
python -m tox --parallel auto --notest --skip-missing-interpreters false
env: ${{ matrix.env }}
- name: Test with tox
run: |
${{ startsWith(matrix.os, 'windows-') && 'setx NETWORK_REQUIRED ' || 'export NETWORK_REQUIRED=' }}1
- ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version || 'pypy2' == matrix.python-version) && 'py27' || '$TOXENV' }}
+ ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version && 'py27') || ('pypy2' == matrix.python-version && 'pypy2') || '$TOXENV' }}
python -m tox \
--parallel 0 \
-- \
diff --git a/tox.ini b/tox.ini
index a70dff87..683b1454 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ install_command = {[helpers]pip} install {opts} {packages}
list_dependencies_command = {[helpers]pip} freeze --all
setenv =
COVERAGE_FILE={toxworkdir}/.coverage.{envname}
- py27: PIP_IGNORE_REQUIRES_PYTHON=true
+ py{27,py2}: PIP_IGNORE_REQUIRES_PYTHON=true
# TODO: The passed environment variables came from copying other tox.ini files
# These should probably be individually annotated to explain what needs them.
passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED