Consolidate linux and osx builds

jonathanunderwood · jonathanunderwood · commit 2e0ec77dd4d2 · 2018-12-21T18:55:51.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,9 @@
+env:
+  global:
+    - CIBW_BEFORE_BUILD="pip install -U pip"
+    - CIBW_TEST_REQUIRES="pytest!=3.3.0 pytest-cov codecov psutil coveralls"
+    - CIBW_TEST_COMMAND="pytest --cov=lz4 {project}/tests && codecov --required ; coveralls"
+
 matrix:
   include:
     - name: linux-py27
@@ -9,6 +15,7 @@ matrix:
       env:
         - PIP=pip
         - CIBW_BUILD=cp27-*
+
     - name: linux-py34
       language: python
       python: 3.4
@@ -18,6 +25,7 @@ matrix:
       env:
         - PIP=pip
         - CIBW_BUILD=cp34-*
+
     - name: linux-py35
       language: python
       python: 3.5
@@ -27,6 +35,7 @@ matrix:
       env:
         - PIP=pip3
         - CIBW_BUILD=cp35-*
+
     - name: linux-py36
       language: python
       python: 3.6
@@ -36,6 +45,7 @@ matrix:
       env:
         - PIP=pip3
         - CIBW_BUILD=cp36-*
+
     - name: linux-py37
       language: python
       python: 3.7
@@ -46,80 +56,46 @@ matrix:
       env:
         - PIP=pip3
         - CIBW_BUILD=cp37-*
+
     - name: osx-py27
       os: osx
       language: generic
       env:
         - PATH="/Library/Frameworks/Python.framework/Versions/2.7/bin:$PATH"
         - PIP=pip
         - CIBW_BUILD=cp27-*
-        - CIBW_BEFORE_BUILD="${PIP} install -U pip"
-        - CIBW_TEST_REQUIRES="pytest!=3.3.0 psutil"
-        - CIBW_TEST_COMMAND="pytest {project}/tests"
-      install:
-        - ${PIP} install cibuildwheel==0.10.0
-      script:
-        - cibuildwheel --output-dir dist
+
     - name: osx-py34
       os: osx
       language: generic
       env:
         - PIP=pip2
         - CIBW_BUILD=cp34-*
-        - CIBW_BEFORE_BUILD="${PIP} install -U pip; ${PIP} install pytest!=3.3.0 psutil"
-        - CIBW_TEST_REQUIRES="pytest!=3.3.0 psutil"
-        - CIBW_TEST_COMMAND="pytest {project}/tests"
-      install:
-        - ${PIP} install cibuildwheel==0.10.0
-      script:
-        - cibuildwheel --output-dir dist
+
     - name: osx-py35
       os: osx
       language: generic
       env:
         - PIP=pip2
         - CIBW_BUILD=cp35-*
-        - CIBW_BEFORE_BUILD="${PIP} install -U pip"
-        - CIBW_TEST_REQUIRES="pytest!=3.3.0 psutil"
-        - CIBW_TEST_COMMAND="pytest {project}/tests"
-      install:
-        - ${PIP} install cibuildwheel==0.10.0
-      script:
-        - cibuildwheel --output-dir dist
+
     - name: osx-py36
       os: osx
       language: generic
       env:
         - PIP=pip2
         - CIBW_BUILD=cp36-*
-        - CIBW_BEFORE_BUILD="${PIP} install -U pip"
-        - CIBW_TEST_REQUIRES="pytest!=3.3.0 pytest-cov codecov psutil coveralls"
-        - CIBW_TEST_COMMAND="pytest --cov=lz4 {project}/tests; codecov --required; coveralls"
-      install:
-        - ${PIP} install cibuildwheel==0.10.0
-      script:
-        - cibuildwheel --output-dir dist
+
     - name: osx-py37
       os: osx
       language: generic
       env:
         - PIP=pip2
         - CIBW_BUILD=cp37-*
-        - CIBW_BEFORE_BUILD="${PIP} install -U pip"
-        - CIBW_TEST_REQUIRES="pytest!=3.3.0 psutil"
-        - CIBW_TEST_COMMAND="pytest {project}/tests"
-      install:
-        - ${PIP} install cibuildwheel==0.10.0
-      script:
-        - cibuildwheel --output-dir dist
+
 install:
-  - ${PIP} install -U pip
   - ${PIP} install cibuildwheel==0.10.0
-  - ${PIP} install codecov tox
 script:
-  - tox tests
-  - codecov --required
-  - git stash --all # Restore fresh checkout
   - cibuildwheel --output-dir dist
 deploy:
   - provider: pypi
