Simplify windows wheel builds

Author: jbaiter

.travis.yml

@@ -1,10 +1,6 @@
 notifications:
   email: false
 
-os:
-  - linux
-  - osx
-
 matrix:
   include:
     - os: osx
@@ -21,19 +17,17 @@ matrix:
     #       PRE_CMD=linux32
 
 install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux"]]; then sudo pip install appveyor-artifacts; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux"]]; then docker pull $DOCKER_IMAGE; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo pip install appveyor-artifacts; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull $DOCKER_IMAGE; fi
 
 script:
-  - if [[ "$TRAVIS_OS_NAME" == "osx"]]; then ./build-wheels $TRAVIS_OS_NAME; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux"]]; then docker run --rm -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD /io/build-wheels.sh $TRAVIS_OS_NAME; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./build-wheels.sh $TRAVIS_OS_NAME; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --rm -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD /io/build-wheels.sh $TRAVIS_OS_NAME; fi
   - ls wheelhouse/
 
 after_success:
-  - appveyor-artifacts -c $(git rev-parse HEAD) -o jbaiter -n python-rust-fst download
-  - mkdir -p dist
-  - mv wheelhouse/* dist
-  - ls dist
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then appveyor-artifacts -c $(git rev-parse HEAD) -o jbaiter -n python-rust-fst download; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir -p dist; mv wheelhouse/* dist; ls dist; fi
 
 deploy:
   - provider: releases

appveyor.yml

@@ -1,44 +1,44 @@
 environment:
   matrix:
-    - PYTHON: "C:\\Python27"
+    - PYARCH: ""
       RUST_TARGET: "i686-pc-windows-msvc"
-    - PYTHON: "C:\\Python33"
-      RUST_TARGET: "i686-pc-windows-msvc"
-    - PYTHON: "C:\\Python34"
-      RUST_TARGET: "i686-pc-windows-msvc"
-    - PYTHON: "C:\\Python35"
-      RUST_TARGET: "i686-pc-windows-msvc"
-    - PYTHON: "C:\\Python27-x64"
-      RUST_TARGET: "x86_64-pc-windows-msvc"
-    - PYTHON: "C:\\Python33-x64"
-      DISTUTILS_USE_SDK: "1"
-      RUST_TARGET: "x86_64-pc-windows-msvc"
-    - PYTHON: "C:\\Python34-x64"
-      DISTUTILS_USE_SDK: "1"
-      RUST_TARGET: "x86_64-pc-windows-msvc"
-    - PYTHON: "C:\\Python35-x64"
+    - PYARCH: "-x64"
       RUST_TARGET: "x86_64-pc-windows-msvc"
 
 install:
+  - SET PYTHON=C:\Python27%PYARCH%
   - "%PYTHON%\\python -m pip install -U pip setuptools wheel"
   - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:RUST_TARGET}.exe"
   - rust-nightly-%RUST_TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
   - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
   - SET PATH=%PATH%;C:\MinGW\bin
 
 build_script:
-  - ".build.cmd %PYTHON%\\python -m pip install cffi pytest"
-    # We build the shared library outside of setuptools since we run into problems
-    # with the %PATH% set by .build.cmd...
-  - "cargo build --manifest-path fstwrapper/Cargo.toml --release"
-  - ".build.cmd %PYTHON%\\python -m pip -v wheel . -w .\\wheelhouse"
+  - "%PYTHON%\\python -m pip install pytest"
+  - "%PYTHON%\\python -m pip -v wheel . -w .\\wheelhouse"
+    # Rename the wheel so it is valid for all Python versions
+    # This is possible since our shared library does not link against any
+    # Python ABI
+    # TODO: This leaves the old Python ABI/ABI tags in the 'WHEEL' file inside
+    #       of the wheel. However, `pip` does not seem to validate against that
+    #       currently, so we're safe until they change it...
+  - ps: |
+      get-childItem wheelhouse\*-cp*-win*.whl | rename-item -newname {
+          $_.name -replace '-cp.*?-cp.*?-','-py2.py3-none-' 
+      }
   - dir wheelhouse
 
 test_script:
   - SET PROJPATH=C:\Projects\python-rust-fst
   - cd c:\projects
-  - "%PYTHON%\\python -m pip -v install rust_fst --no-index -f %PROJPATH%\\wheelhouse"
-  - "%PYTHON%\\python -m pytest --verbose %PROJPATH%\\tests"
+  - ps: |
+      $PyVersions = @("27", "33", "34", "35")
+      foreach ($pyver in $PyVersions) {
+        $python = "C:\\Python$pyver${env:PYARCH}\\python"
+        &$python -m pip install -U pip setuptools wheel pytest cffi
+        &$python -m pip -v install rust_fst --no-index -f "${env:PROJPATH}\wheelhouse"
+        &$python -m pytest "${env:PROJPATH}\tests"
+      }
 
 artifacts:
   - path: wheelhouse\rust_fst*.whl

build-wheels.sh

@@ -58,15 +58,16 @@ RUST_CHANNEL=nightly
 # use the oldest supported one
 if [[ $1 == "osx" ]]; then
     brew update
-    brew install python2.7 mmv
+    brew install python mmv
+    pip install -U pip setuptools wheel
     install_rust $RUST_CHANNEL
-    pip wheel /io/ -w /io/wheelhouse
-    mmv "/io/wheelhouse/rust_fst-*-cp*-none-macosx*.whl" \
-        "/io/wheelhouse/rust_fst-#1-py2.py3-none-macosx#3.whl"
-    pip install -v rust_fst --no-index -f /io/wheelhouse
+    pip wheel . -w ./wheelhouse
+    mmv "./wheelhouse/rust_fst-*-cp*-cp*-macosx*.whl" \
+        "./wheelhouse/rust_fst-#1-py2.py3-none-macosx#4.whl"
+    pip install -v rust_fst --no-index -f ./wheelhouse
     pip install pytest
-    cd /
-    py.test /io/tests
+    cd ../
+    py.test ./python-rust-fst/tests
 else
     PYBIN=/opt/python/cp27-cp27m/bin
     # Clean build files
@@ -89,11 +90,11 @@ else
     ${PYBIN}/python -m pip wheel /io/ -w /wheelhouse/
 
     # Move pure wheels to target directory
+    mkdir -p /io/wheelhouse
     mv /wheelhouse/*any.whl /io/wheelhouse || echo "No pure wheels to move"
 
     # Bundle external shared libraries into the wheel
     for whl in /wheelhouse/*.whl; do
-        cp $whl /io/wheelhouse/
         auditwheel repair $whl -w /io/wheelhouse/
     done