Skip to content

Commit

Permalink
CI cleaner and cleaner
Browse files Browse the repository at this point in the history
  • Loading branch information
MuellerSeb committed Dec 20, 2018
1 parent d5a2d21 commit f0b9a9e
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 11 deletions.
35 changes: 25 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ language: python

matrix:
include:
# Linux Python 2.7
- sudo: required
- name: "Linux py27"
sudo: required
language: python
python: 2.7
services: docker
Expand All @@ -12,8 +12,8 @@ matrix:
- CIBW_BUILD="cp27-*"
- COVER="off"

# Linux Python 3.5
- sudo: required
- name: "Linux py35"
sudo: required
language: python
python: 3.5
services: docker
Expand All @@ -22,8 +22,8 @@ matrix:
- CIBW_BUILD="cp35-*"
- COVER="off"

# Linux Python 3.6
- sudo: required
- name: "Linux py36"
sudo: required
language: python
python: 3.6
services: docker
Expand All @@ -32,18 +32,33 @@ matrix:
- CIBW_BUILD="cp36-*"
- COVER="on"

# mac os py2+py3
- os: osx
- name: "MacOS py27"
os: osx
language: generic
env:
- PIP=pip2
- CIBW_SKIP="cp34-* cp37-*"
- CIBW_BUILD="cp27-*"
- COVER="off"

- name: "MacOS py35"
os: osx
language: generic
env:
- PIP=pip2
- CIBW_BUILD="cp35-*"
- COVER="off"

- name: "MacOS py36"
os: osx
language: generic
env:
- PIP=pip2
- CIBW_BUILD="cp36-*"
- COVER="off"

env:
global:
- TWINE_USERNAME=geostatframework
# - CIBW_SKIP="cp34-* cp37-*"
- CIBW_BEFORE_BUILD="pip install cython numpy"
- CIBW_TEST_REQUIRES=pytest-cov
# inplace cython build and test run
Expand Down
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ environment:
TWINE_USERNAME: geostatframework
CIBW_SKIP: "cp34-* cp37-*"
CIBW_BEFORE_BUILD: pip install cython numpy
# Note: TWINE_PASSWORD is set in Appveyor settings

build_script:
- pip install https://github.com/joerick/cibuildwheel/archive/master.zip
Expand Down

0 comments on commit f0b9a9e

Please sign in to comment.