revert travis osx changes

This commit is contained in:
Thomas Kriechbaumer 2016-07-09 22:31:00 +02:00
parent dc6266e08e
commit 22c0db3b19
2 changed files with 12 additions and 11 deletions

View File

@ -20,9 +20,12 @@ matrix:
include:
- python: 3.5
env: TOXENV=lint
- os: osx
language: generic
env: TOXENV=py35
- language: generic
os: osx
osx_image: xcode7.1
git:
depth: 9999999
env: TOXENV=py27
- python: 3.5
env: TOXENV=py35
- python: 3.5
@ -42,9 +45,7 @@ install:
then
brew update || brew update # try again if it fails
brew outdated openssl || brew upgrade openssl
brew install python python3
pip install -U pip setuptools wheel
pip3 install -U pip setuptools wheel
brew install python
fi
- pip install tox
@ -54,9 +55,9 @@ after_success:
- |
if [[ $TRAVIS_OS_NAME == "osx" && $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG) ]]
then
pip3 install -U virtualenv
./dev.sh 3.5
source venv3.5/bin/activate
pip install -U virtualenv
./dev.sh
source venv/bin/activate
pip install -e ./release
python ./release/rtool.py bdist
python ./release/rtool.py upload-snapshot --bdist --wheel

View File

@ -1,3 +1,3 @@
https://maximilianhils.com/upload/2016-06/lxml-3.6.0-cp35-cp35m-win32.whl ; sys_platform == 'win32' and python_version == '3.5'
https://maximilianhils.com/upload/2016-06/lxml-3.6.0-cp35-cp35m-win32.whl; sys_platform == 'win32' and python_version == '3.5'
-e .[dev,examples,contentviews]
-e ./release
-e ./release