From 345f9ce7941506073ed827638a7637858ba7b4a7 Mon Sep 17 00:00:00 2001 From: Forest Gregg Date: Fri, 15 Apr 2016 09:32:16 -0500 Subject: [PATCH 1/3] CI for travis and appveyor --- .travis.yml | 48 ++++++++++++++++++++++++++++++++++++++++-------- appveyor.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml index 4847904..226620c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,47 @@ language: python sudo: false -python: - - 2.7 - - 3.3 - - 3.4 - - 3.5 - - pypy - - pypy3 +matrix: + include: + - os: linux + python: 2.7 + - os: linux + python: 3.3 + - os: linux + python: 3.4 + - os: linux + python: 3.5 + - os: linux + python: pypy + - os: linux + python: pypy3 + - os: osx + language: generic + env: TERRYFY_PYTHON='homebrew 2' + - os: osx + language: generic + env: TERRYFY_PYTHON='homebrew 3' +before_install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/MacPython/terryfy; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source terryfy/travis_tools.sh; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then get_python_environment $TERRYFY_PYTHON venv; fi + - if [[ "$TERRYFY_PYTHON" == "homebrew 3" ]]; then alias pip=`which pip3` ; fi install: - - pip install . + - pip install -e . script: - python setup.py -q test -q notifications: email: false +after_success: + - echo [distutils] > ~/.pypirc + - echo index-servers = pypi >> ~/.pypirc + - echo [pypi] >> ~/.pypirc + - echo repository=https://pypi.python.org/pypi >> ~/.pypirc + - echo username=zope.wheelbuilder >> ~/.pypirc + - echo password=$PYPIPASSWORD >> ~/.pypirc + - if [[ $TRAVIS_TAG && "$TRAVIS_OS_NAME" == "osx" ]]; then pip install twine; fi + - if [[ $TRAVIS_TAG && "$TRAVIS_OS_NAME" == "osx" ]]; then python setup.py bdist_wheel; fi + - if [[ $TRAVIS_TAG && "$TRAVIS_OS_NAME" == "osx" ]]; then twine upload dist/*; fi + +env: + global: + secure: J8y6Yv7w8z1pch0RzXquJwNG5ln78/rqo21TfnwEtymQnLO10jLw+YafwQozBlI8SWpU+k/C7UQCwtMAFEvBfgnToh+3fR70kX7qDvte9DKsbo2qUBAg/Pw/mVYHcpWVFW7wj9YVYxoe4Hk1vmmLuDxYu81/c75nxJljH5xdo+0= \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..df418d6 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,40 @@ +environment: + password: + secure: RtpeKCle25vCixaUcJBu6Q== + + matrix: + - python : 27 + - python : 27-x64 + - python : 33 + - python : 33-x64 + - python : 34 + - python : 34-x64 + - python : 35 + - python : 35-x64 + +install: + - "SET PATH=C:\\Python%PYTHON%;c:\\Python%PYTHON%\\scripts;%PATH%" + - echo "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 > "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64\vcvars64.bat" + - pip install -e . + +build: false + +test_script: + - python setup.py -q test -q + +on_success: + - echo Build succesful! + +deploy_script: + - echo [distutils] > %USERPROFILE%\\.pypirc + - echo index-servers = >> %USERPROFILE%\\.pypirc + - echo pypi >> %USERPROFILE%\\.pypirc + - echo [pypi] >> %USERPROFILE%\\.pypirc + - echo repository=https://pypi.python.org/pypi >> %USERPROFILE%\\.pypirc + - echo username=zope.wheelbuilder >> %USERPROFILE%\\.pypirc + - echo password=%password% >> %USERPROFILE%\\.pypirc + - set HOME=%USERPROFILE% + - pip install wheel twine + - ps: if($env:APPVEYOR_REPO_TAG -eq $TRUE) { python -W ignore setup.py bdist_wheel bdist_egg; twine upload dist/* } + +deploy : on From 50f1152f2f1065dbe67cd48ad757cfecd239300f Mon Sep 17 00:00:00 2001 From: Forest Gregg Date: Tue, 24 May 2016 10:12:08 -0500 Subject: [PATCH 2/3] don't build eggs, build on os x, py 3.4 --- .travis.yml | 3 +++ appveyor.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 226620c..a52ebd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,9 @@ matrix: - os: osx language: generic env: TERRYFY_PYTHON='homebrew 2' + - os: osx + language: generic + env: TERRYFY_PYTHON='macpython 3.4' - os: osx language: generic env: TERRYFY_PYTHON='homebrew 3' diff --git a/appveyor.yml b/appveyor.yml index df418d6..de6586c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,6 +35,6 @@ deploy_script: - echo password=%password% >> %USERPROFILE%\\.pypirc - set HOME=%USERPROFILE% - pip install wheel twine - - ps: if($env:APPVEYOR_REPO_TAG -eq $TRUE) { python -W ignore setup.py bdist_wheel bdist_egg; twine upload dist/* } + - ps: if($env:APPVEYOR_REPO_TAG -eq $TRUE) { python -W ignore setup.py bdist_wheel; twine upload dist/* } deploy : on From d1ca5d49c71e52ad8d20f92cffe5f6fef7c02628 Mon Sep 17 00:00:00 2001 From: Forest Gregg Date: Sun, 29 May 2016 17:29:54 -0500 Subject: [PATCH 3/3] pypi password for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a52ebd8..4df71b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,4 +47,4 @@ after_success: env: global: - secure: J8y6Yv7w8z1pch0RzXquJwNG5ln78/rqo21TfnwEtymQnLO10jLw+YafwQozBlI8SWpU+k/C7UQCwtMAFEvBfgnToh+3fR70kX7qDvte9DKsbo2qUBAg/Pw/mVYHcpWVFW7wj9YVYxoe4Hk1vmmLuDxYu81/c75nxJljH5xdo+0= \ No newline at end of file + secure: "BEJhxAItA0fMiDS+2fV6VhoiTMXDuhWbVRpmjr3IhyMI4BSNRGVE46qvGY78/30reXMbvvEvmUPFhq4yLhq0O4UAgOis8318ramt9AoJLOtIkFTydytOysY9RZ2dDdFWRmpcFQ7K8xrasoJKZQRRGtbgIZ6hGtp1b4K3clNKaJ8=" \ No newline at end of file