Fixed Cygwin install issue with typed-ast on Appveyor; Enabled py38 o…

…n cygwin on Appveyor

Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>

appveyor.yml

@@ -48,16 +48,16 @@ environment:
 #      UNIX_PATH: none
 #      PYTHON_CMD: python
 
-    - TOX_ENV: win64_py38_64
-      UNIX_PATH: none
-      PYTHON_CMD: python
+#    - TOX_ENV: win64_py38_64
+#      UNIX_PATH: none
+#      PYTHON_CMD: python
 
-# 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
+## 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
 
 #    - TOX_ENV: cygwin64_py27
 #      UNIX_PATH: C:\cygwin64\bin
@@ -66,37 +66,23 @@ environment:
 
 #    - TOX_ENV: cygwin32_py36
 #      UNIX_PATH: C:\cygwin\bin
-#      PYTHON_CMD: python3.6m
+#      PYTHON_CMD: python3.6
 #      PIP_CMD: pip
 
-    - TOX_ENV: cygwin64_py36
-      UNIX_PATH: C:\cygwin64\bin
-      PYTHON_CMD: python3.6m
-      PIP_CMD: pip
-
-## TODO: Enable Python 3.7 once available on Appveyor in Cygwin
-##    - TOX_ENV: cygwin32_py37
-##      UNIX_PATH: C:\cygwin\bin
-##      PYTHON_CMD: python3.7m
-##      PIP_CMD: pip
-
-## TODO: Enable Python 3.7 once available on Appveyor in Cygwin
-##    - TOX_ENV: cygwin64_py37
-##      UNIX_PATH: C:\cygwin64\bin
-##      PYTHON_CMD: python3.7m
-##      PIP_CMD: pip
+#    - TOX_ENV: cygwin64_py36
+#      UNIX_PATH: C:\cygwin64\bin
+#      PYTHON_CMD: python3.6
+#      PIP_CMD: pip
 
-## TODO: Enable Python 3.8 once available on Appveyor in Cygwin
-##    - TOX_ENV: cygwin32_py38
-##      UNIX_PATH: C:\cygwin\bin
-##      PYTHON_CMD: python3.8m
-##      PIP_CMD: pip
+#    - TOX_ENV: cygwin32_py38
+#      UNIX_PATH: C:\cygwin\bin
+#      PYTHON_CMD: python3.8
+#      PIP_CMD: pip
 
-## TODO: Enable Python 3.8 once available on Appveyor in Cygwin
-##    - TOX_ENV: cygwin64_py38
-##      UNIX_PATH: C:\cygwin64\bin
-##      PYTHON_CMD: python3.8m
-##      PIP_CMD: pip
+    - TOX_ENV: cygwin64_py38
+      UNIX_PATH: C:\cygwin64\bin
+      PYTHON_CMD: python3.8
+      PIP_CMD: pip
 
 configuration:
 # These values will become the values of the PACKAGE_LEVEL env.var.
@@ -144,10 +130,14 @@ install:
 
   # Install Python 2.7 on CygWin
   # TODO: Verify whether python2 has again been installed by default
-  - if not "%UNIX_PATH%"=="none" ( bash --noprofile --norc -c "which %PYTHON_CMD%; echo which %PYTHON_CMD% returns rc=\$?" )
+  - if not "%UNIX_PATH%"=="none" ( bash --noprofile --norc -c "which %PYTHON_CMD%; echo which %PYTHON_CMD% returns rc=$?" )
   - 'if "%UNIX_PATH%"=="C:\cygwin\bin" ( C:\cygwin\setup-x86.exe -qnNdO -R C:/cygwin -P python2 )'
   - 'if "%UNIX_PATH%"=="C:\cygwin64\bin" ( C:\cygwin64\setup-x86_64.exe -qnNdO -R C:/cygwin64 -P python2 )'
 
+  # Install Python development packages on CygWin
+  - 'if "%UNIX_PATH%"=="C:\cygwin\bin" ( C:\cygwin\setup-x86.exe -qnNdO -R C:/cygwin -P python2-devel -P python3-devel )'
+  - 'if "%UNIX_PATH%"=="C:\cygwin64\bin" ( C:\cygwin64\setup-x86_64.exe -qnNdO -R C:/cygwin64 -P python2-devel -P python3-devel )'
+
   # Verify that Python command is available, and fail if not
   - if "%UNIX_PATH%"=="none" ( where %PYTHON_CMD% )
   - if not "%UNIX_PATH%"=="none" ( bash --noprofile --norc -c "which %PYTHON_CMD%" )

tox.ini

@@ -25,8 +25,9 @@ envlist =
     win64_py38_64
     cygwin32_py27
     cygwin64_py27
+    cygwin32_py36
     cygwin64_py36
-    cygwin64_py37
+    cygwin32_py38
     cygwin64_py38
 
 # For Appveyor, missing interpreters should fail. For local use, you may
@@ -143,14 +144,18 @@ basepython = python2.7
 platform = cygwin
 basepython = python2.7
 
+[testenv:cygwin32_py36]
+platform = cygwin
+basepython = python3.6
+
 [testenv:cygwin64_py36]
 platform = cygwin
-basepython = python3.6m
+basepython = python3.6
 
-[testenv:cygwin64_py37]
+[testenv:cygwin32_py38]
 platform = cygwin
-basepython = python3.7m
+basepython = python3.8
 
 [testenv:cygwin64_py38]
 platform = cygwin
-basepython = python3.8m
+basepython = python3.8