diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-09 19:09:05 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-09 19:09:05 -0600 |
| commit | 588b0acac807f4aaa6da564be7f0363626415d4b (patch) | |
| tree | edb7131a6f11a5ef525c77a583ceaaa19e2119a6 | |
| parent | 79a230f81ff702d590ebc36169dc11392019839f (diff) | |
| parent | 3d5913d223ecac8e130c8b2a8fcb25a715f57f3b (diff) | |
| download | cryptography-588b0acac807f4aaa6da564be7f0363626415d4b.tar.gz cryptography-588b0acac807f4aaa6da564be7f0363626415d4b.tar.bz2 cryptography-588b0acac807f4aaa6da564be7f0363626415d4b.zip | |
Merge branch 'master' into common-crypto-binding
* master:
temporary workaround for travis-ci bug
Style nit
easy_install is awful, don't use it
Simplify the authors section
| -rw-r--r-- | .travis.yml | 34 | ||||
| -rwxr-xr-x | .travis/install.sh | 6 | ||||
| -rw-r--r-- | cryptography/__about__.py | 4 |
3 files changed, 25 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index 92ee221b..babea99b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,25 +6,31 @@ compiler: - clang - gcc env: - - TOX_ENV=py26 - - TOX_ENV=py27 - - TOX_ENV=py32 - - TOX_ENV=py33 - - 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=pypy OPENSSL=0.9.8 - - TOX_ENV=docs - - TOX_ENV=pep8 - - TOX_ENV=py3pep8 + # this global section can be removed when + # https://github.com/travis-ci/travis-ci/issues/1844 is fixed + global: + - CI=true + - TRAVIS=true + matrix: + - TOX_ENV=py26 + - TOX_ENV=py27 + - TOX_ENV=py32 + - TOX_ENV=py33 + - 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=pypy OPENSSL=0.9.8 + - TOX_ENV=docs + - TOX_ENV=pep8 + - TOX_ENV=py3pep8 install: - ./.travis/install.sh script: - - if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)";fi && source ~/.venv/bin/activate && tox -e $TOX_ENV + - if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)"; fi && source ~/.venv/bin/activate && tox -e $TOX_ENV after_success: - coveralls diff --git a/.travis/install.sh b/.travis/install.sh index d25ed941..8d6840f2 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -15,12 +15,14 @@ if [[ "$(uname -s)" == "Darwin" ]]; then if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi case "${TOX_ENV}" in py26) - sudo easy_install pip + curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py + sudo python get-pip.py sudo pip install setuptools --no-use-wheel --upgrade sudo pip install virtualenv ;; py27) - sudo easy_install pip + curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py + sudo python get-pip.py sudo pip install setuptools --no-use-wheel --upgrade sudo pip install virtualenv ;; diff --git a/cryptography/__about__.py b/cryptography/__about__.py index 169e2ff5..ee1d8a05 100644 --- a/cryptography/__about__.py +++ b/cryptography/__about__.py @@ -24,9 +24,7 @@ __uri__ = "https://github.com/pyca/cryptography" __version__ = "0.2.dev1" -__author__ = ("Alex Gaynor, Hynek Schlawack, Donald Stufft, " - "Laurens Van Houtven, Jean-Paul Calderone, Christian Heimes, " - "Paul Kehrer, Alex Stapleton, and individual contributors.") +__author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" __license__ = "Apache License, Version 2.0" |