diff options
| author | Alastair Houghton <alastair@alastairs-place.net> | 2018-02-12 11:48:05 +0000 |
|---|---|---|
| committer | Alastair Houghton <alastair@alastairs-place.net> | 2018-02-12 11:48:05 +0000 |
| commit | e4a372066ba74709a02fbd003935989089e20425 (patch) | |
| tree | 415dcbe724b2b0952b76c2585efe80aec5d84095 | |
| parent | 89583f0ad251e332327009683edac8b4d80c6bdf (diff) | |
| download | netifaces-git-e4a372066ba74709a02fbd003935989089e20425.tar.gz | |
More work on getting Travis working - OS X is complicated.
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rwxr-xr-x | .travis/install.sh | 17 |
2 files changed, 13 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml index 647c66d..3d39211 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,19 @@ language: python -python: - - "2.7" - - "3.6" - install: - - ./.travis/install.sh + - | + if [[ $TRAVIS_OS_NAME == 'osx' ]]; then + # On OS X, we use the "generic" language and manually install Python so + # that we can specify the versions to test + curl -L raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash + export PATH=~/.pyenv/bin:$PATH + eval "$(pyenv init -)" + pyenv install --skip-existing $PYTHON_VERSION + pyenv global $PYTHON_VERSION + pyenv shell $PYTHON_VERSION + pip install -U pip setuptools wheel py + fi + pip install . script: - python test.py diff --git a/.travis/install.sh b/.travis/install.sh deleted file mode 100755 index c6d0215..0000000 --- a/.travis/install.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [[ $TRAVIS_OS_NAME == 'osx' ]]; then - - # On OS X, we use the "generic" language and manually install Python so - # that we can specify the versions to test - curl -L raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash - export PATH=~/.pyenv/bin:$PATH - eval "$(pyenv init -)" - pyenv install --skip-existing $PYTHON_VERSION - pyenv global $PYTHON_VERSION - pyenv shell $PYTHON_VERSION - pip install -U pip setuptools wheel py - -fi - -pip install . |