From 49a8fb28e65b5b089130ffe34171344cb5333062 Mon Sep 17 00:00:00 2001 From: Andreas Maier Date: Sat, 20 Jun 2020 14:25:35 +0200 Subject: [PATCH] Appveyor+Tox: Cleaned up py34 and cygwin 32-bit envs Signed-off-by: Andreas Maier --- appveyor.yml | 66 +++++++++++++++++++++++++++++++--------------------- tox.ini | 12 +++++----- 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7421139ab..1bed34a5f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,21 +5,24 @@ environment: matrix: - - TOX_ENV: win64_py27_32 - UNIX_PATH: none - PYTHON_CMD: python +# TEMP: Re-enable again +# - TOX_ENV: win64_py27_32 +# UNIX_PATH: none +# PYTHON_CMD: python # - TOX_ENV: win64_py27_64 # UNIX_PATH: none # PYTHON_CMD: python +# TEMP: Try out # - TOX_ENV: win64_py34_32 # UNIX_PATH: none # PYTHON_CMD: python -# - TOX_ENV: win64_py34_64 -# UNIX_PATH: none -# PYTHON_CMD: python +# TEMP: Try out + - TOX_ENV: win64_py34_64 + UNIX_PATH: none + PYTHON_CMD: python # - TOX_ENV: win64_py35_32 # UNIX_PATH: none @@ -55,13 +58,18 @@ environment: # Note: On CygWin with Python 3.x, LC_ALL/LANG need to be set to utf-8 for Click to install/work -# TODO: Disabled because python2.7 with cygwin 32-bit fails with: -# "virtualenv is not compatible with this system or executable" -# - TOX_ENV: cygwin32_py27 -# UNIX_PATH: C:\cygwin\bin -# PYTHON_CMD: python2.7 -# PIP_CMD: pip -# CYGWIN_PYTHON_DEVEL: python27-devel +# Note: The 32-bit versions of CygWin do not work and have been removed from +# appveyor.yml and tox.ini: +# - Python 2.7 with cygwin 32-bit fails with "virtualenv is not compatible with +# this system or executable". +# - On Python 3.6 and upwards, Tox returns success but does not do anything. + +# TEMP: Try out + - TOX_ENV: cygwin32_py27 + UNIX_PATH: C:\cygwin\bin + PYTHON_CMD: python2.7 + PIP_CMD: pip + CYGWIN_PYTHON_DEVEL: python27-devel # - TOX_ENV: cygwin64_py27 # UNIX_PATH: C:\cygwin64\bin @@ -69,13 +77,14 @@ environment: # PIP_CMD: pip # CYGWIN_PYTHON_DEVEL: python27-devel -# - TOX_ENV: cygwin32_py36 -# UNIX_PATH: C:\cygwin\bin -# PYTHON_CMD: python3.6 -# PIP_CMD: pip -# CYGWIN_PYTHON_DEVEL: python36-devel -# LC_ALL: C.UTF-8 -# LANG: C.UTF-8 +# TEMP: Try out + - TOX_ENV: cygwin32_py36 + UNIX_PATH: C:\cygwin\bin + PYTHON_CMD: python3.6 + PIP_CMD: pip + CYGWIN_PYTHON_DEVEL: python36-devel + LC_ALL: C.UTF-8 + LANG: C.UTF-8 # - TOX_ENV: cygwin64_py36 # UNIX_PATH: C:\cygwin64\bin @@ -85,6 +94,7 @@ environment: # LC_ALL: C.UTF-8 # LANG: C.UTF-8 +# TEMP: Try out # - TOX_ENV: cygwin32_py37 # UNIX_PATH: C:\cygwin\bin # PYTHON_CMD: python3.7 @@ -101,6 +111,7 @@ environment: # LC_ALL: C.UTF-8 # LANG: C.UTF-8 +# TEMP: Try out # - TOX_ENV: cygwin32_py38 # UNIX_PATH: C:\cygwin\bin # PYTHON_CMD: python3.8 @@ -109,13 +120,14 @@ environment: # LC_ALL: C.UTF-8 # LANG: C.UTF-8 - - TOX_ENV: cygwin64_py38 - UNIX_PATH: C:\cygwin64\bin - PYTHON_CMD: python3.8 - PIP_CMD: pip - CYGWIN_PYTHON_DEVEL: python38-devel - LC_ALL: C.UTF-8 - LANG: C.UTF-8 +# TEMP: Re-enable again +# - TOX_ENV: cygwin64_py38 +# UNIX_PATH: C:\cygwin64\bin +# PYTHON_CMD: python3.8 +# PIP_CMD: pip +# CYGWIN_PYTHON_DEVEL: python38-devel +# LC_ALL: C.UTF-8 +# LANG: C.UTF-8 configuration: # These values will become the values of the PACKAGE_LEVEL env.var. diff --git a/tox.ini b/tox.ini index a71eb2266..dba110742 100644 --- a/tox.ini +++ b/tox.ini @@ -167,26 +167,26 @@ basepython = python2.7 platform = cygwin basepython = python2.7 -[testenv:cygwin64_py36] +[testenv:cygwin32_py36] platform = cygwin basepython = python3.6 -[testenv:cygwin32_py36] +[testenv:cygwin64_py36] platform = cygwin basepython = python3.6 -[testenv:cygwin64_py37] +[testenv:cygwin32_py37] platform = cygwin basepython = python3.7 -[testenv:cygwin32_py37] +[testenv:cygwin64_py37] platform = cygwin basepython = python3.7 -[testenv:cygwin64_py38] +[testenv:cygwin32_py38] platform = cygwin basepython = python3.8 -[testenv:cygwin32_py38] +[testenv:cygwin64_py38] platform = cygwin basepython = python3.8