diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-17 09:46:13 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-17 09:46:13 -0700 |
| commit | 7eaf4882be55304dc69209aa537c7e9efeb1e0bb (patch) | |
| tree | 8fcabd73f3fc038754488d877274b5d80663f73e | |
| parent | 44450da83212f96b46ddfff96301dbf74e0e0e55 (diff) | |
| parent | f855b2896d2881e9dd3487d1d05b1dc904a672e4 (diff) | |
| download | cryptography-7eaf4882be55304dc69209aa537c7e9efeb1e0bb.tar.gz cryptography-7eaf4882be55304dc69209aa537c7e9efeb1e0bb.tar.bz2 cryptography-7eaf4882be55304dc69209aa537c7e9efeb1e0bb.zip | |
Merge pull request #820 from reaperhulk/test-python34
add python 3.4 to osx and linux builders
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | .travis/install.sh | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index b7fa090e..7d5663d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,13 @@ env: - TOX_ENV=py27 - TOX_ENV=py32 - TOX_ENV=py33 + - TOX_ENV=py34 - TOX_ENV=pypy - TOX_ENV=py26 OPENSSL=0.9.8 - TOX_ENV=py27 OPENSSL=0.9.8 - TOX_ENV=py32 OPENSSL=0.9.8 - TOX_ENV=py33 OPENSSL=0.9.8 + - TOX_ENV=py34 OPENSSL=0.9.8 - TOX_ENV=pypy OPENSSL=0.9.8 - TOX_ENV=docs - TOX_ENV=pep8 @@ -60,6 +62,9 @@ matrix: env: TOX_ENV=py33 compiler: gcc - os: osx + env: TOX_ENV=py34 + compiler: gcc + - os: osx env: TOX_ENV=pypy compiler: gcc - os: osx @@ -75,6 +80,9 @@ matrix: env: TOX_ENV=py33 OPENSSL=0.9.8 compiler: gcc - os: osx + env: TOX_ENV=py34 OPENSSL=0.9.8 + compiler: gcc + - os: osx env: TOX_ENV=pypy OPENSSL=0.9.8 compiler: gcc - os: osx diff --git a/.travis/install.sh b/.travis/install.sh index bd08740a..58d7404d 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -56,6 +56,11 @@ if [[ "$(uname -s)" == "Darwin" ]]; then pyenv global 3.3.5 pip install virtualenv ;; + py34) + pyenv install 3.4.0 + pyenv global 3.4.0 + pip install virtualenv + ;; docs) curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py sudo python get-pip.py @@ -78,6 +83,9 @@ else py33) sudo apt-get install python3.3 python3.3-dev ;; + py34) + sudo apt-get install python3.4 python3.4-dev + ;; py3pep8) sudo apt-get install python3.3 python3.3-dev ;; |