[skip travis] Upgrade AppVeyor config

Author: PMeira

.travis.yml

@@ -6,7 +6,7 @@ matrix:
       os: linux
       sudo: required
       env: 
-        - DOCKER_IMAGE=pmeira/manylinux_wheel_cmake_fpc
+        - DOCKER_IMAGE=pmeira/manylinux_wheel_cmake_fpc320
         - DSS_CAPI_TAG=0.10.7rc1
         - LINUX_X64=1
         - CONDA_SUBDIR=linux-64
@@ -31,7 +31,7 @@ matrix:
       os: linux
       sudo: required
       env: 
-        - DOCKER_IMAGE=pmeira/manylinux_wheel_cmake_fpc_i686
+        - DOCKER_IMAGE=pmeira/manylinux_wheel_cmake_fpc320_i686
         - DSS_CAPI_TAG=0.10.7rc1
         - CONDA_SUBDIR=linux-32
       services:

appveyor.yml

@@ -1,9 +1,7 @@
 version: '{build}'
 skip_non_tags: false
-image: Visual Studio 2017
+image: Visual Studio 2019
 clone_folder: c:\projects\dss_python
-cache:
-  - c:\projects\VCForPython27.msi
 environment:
   DSS_CAPI_TAG: 0.10.7rc1
   DSS_CAPI_PATH: c:\projects\dss_capi

ci/build_appveyor.bat

@@ -17,20 +17,25 @@ set originalpath=%path%
 IF "%CONDA_SUBDIR%"=="win-32" (
     SET MINICONDA_DIR=c:\miniconda3
     appveyor downloadfile https://github.com/dss-extensions/dss_capi/releases/download/%DSS_CAPI_TAG%/dss_capi_%DSS_CAPI_TAG%_win_x86.zip -FileName dss_capi.zip
+    call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
 )
 IF "%CONDA_SUBDIR%"=="win-64" (
     SET MINICONDA_DIR=c:\miniconda3-x64
     appveyor downloadfile https://github.com/dss-extensions/dss_capi/releases/download/%DSS_CAPI_TAG%/dss_capi_%DSS_CAPI_TAG%_win_x64.zip -FileName dss_capi.zip
+    call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
 )
 7z x -y -oC:\projects\ dss_capi.zip
 
-set path=c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
+
+set originalpath2=%path%
+
+set path=c:\cygwin64\bin;c:\cygwin64\usr\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath2%
 
 c:\cygwin64\bin\bash ci/build_windows.sh
 
 echo POST c:\cygwin64\bin\bash ci/build_windows.sh
 
-set path=c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
+set path=%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
 
 call %MINICONDA_DIR%\scripts\activate %MINICONDA_DIR%
 
@@ -42,7 +47,7 @@ REM IF "%DSS_PYTHON_BUILD_TAG%"=="1" conda-build --quiet --no-test --output-fold
 
 REM echo CONDA-BUILD CALLED 
 
-set path=c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
+set path=c:\cygwin64\bin;c:\cygwin64\usr\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath2%
 
 c:\cygwin64\bin\bash ci/upload_windows.sh
 

ci/build_windows.sh

@@ -8,8 +8,6 @@ ln -s /cygdrive/c /c
 cd ..
 export ARTIFACTS_FOLDER=`cygpath -a -w ./artifacts`
 
-export PATH="$PATH:/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
-
 BUILD_WHEELS=1
 if [ "$BUILD_WHEELS" == "1" ]; then
     # conda-build with wheels doesn't seem consistent so
@@ -18,16 +16,16 @@ if [ "$BUILD_WHEELS" == "1" ]; then
         # Use the official Python already installed in AppVeyor
         cd dss_python
 
-        # Python 27 is kept last since we rebuild klusolve for it
         if [ "$CONDA_SUBDIR" == "win-32" ]; then
-            PYTHON_VERSIONS="35 36 37 38"
+            PYTHON_VERSIONS="39 38 35 36 37"
         else
-            PYTHON_VERSIONS="35-x64 36-x64 37-x64 38-x64"
+            PYTHON_VERSIONS="39-x64 38-x64 35-x64 36-x64 37-x64"
         fi
 
         for A in $PYTHON_VERSIONS
         do
             echo Building for Python $A $CONDA_SUBDIR...
+            c:/Python${A}/python -m pip install --upgrade pip
             c:/Python${A}/scripts/pip install cffi wheel
             rm -rf .eggs build
             c:/Python${A}/python setup.py --quiet bdist_wheel --dist-dir="$ARTIFACTS_FOLDER"
@@ -82,27 +80,5 @@ else
     # conda install -q conda-build=3.10.9
 fi # BUILD_WHEELS
 
-# # Build conda packages
-# export CONDA_SUBDIR=win-32
-# conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda
-# export CONDA_SUBDIR=win-64
-# conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda
-
-# # # Build wheels with conda
-# # # (if we keep the output section always, the default package
-# # # is ignored, uses wrong names, etc.)
-# # rm -rf conda_wheels
-# # cp -R conda conda_wheels
-# # cat conda/meta_wheels.yaml >> conda_wheels/meta.yaml
-# # export CONDA_SUBDIR=win-32
-# # conda-build --output-folder ../artifacts conda_wheels
-# # export CONDA_SUBDIR=win-64
-# # conda-build --output-folder ../artifacts conda_wheels
-
-# # # undo the change, just in case
-# # git checkout conda/meta.yaml
-
-# if [ -n "$ANACONDA_API_TOKEN" ]; then 
-    # echo Upload artifacts to anaconda.org...
-    # find ../artifacts -name "*.whl" -or -name "*.tar.bz2" | xargs -I {} anaconda upload --no-progress -l main -u pmeira {}
-# fi
+# Build conda packages
+conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda

dss/__init__.py

@@ -6,4 +6,4 @@
 from .v7 import *
 from .patch_dss_com import patch_dss_com
 
-__version__ = '0.10.7rc1'
+__version__ = '0.10.7rc2'