Skip to content

Commit

Permalink
Merge 49a8fb2 into 94cc8eb
Browse files Browse the repository at this point in the history
  • Loading branch information
andy-maier committed Jun 21, 2020
2 parents 94cc8eb + 49a8fb2 commit 614e884
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 33 deletions.
66 changes: 39 additions & 27 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -55,27 +58,33 @@ 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
# PYTHON_CMD: python2.7
# 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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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.
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 614e884

Please sign in to comment.