From 747beee6bb5af2f280ef15b1ec6f96c806cd3b19 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 9 Jan 2014 09:19:47 -0800
Subject: Simplify the authors section

---
 cryptography/__about__.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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"
-- 
cgit v1.2.3


From dcbc911263a33b36ed630d6f8f3b5deadaf40bfc Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 9 Jan 2014 10:07:30 -0800
Subject: easy_install is awful, don't use it

---
 .travis/install.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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
             ;;
-- 
cgit v1.2.3


From 4af88912575473a02c590680ff25402a87a3b758 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 9 Jan 2014 10:10:26 -0800
Subject: Style nit

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 92ee221b..d28fef5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ 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
-- 
cgit v1.2.3


From 3914dd0c27e4f52b8b3a173912bb1a558384484a Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Thu, 9 Jan 2014 18:23:12 -0600
Subject: temporary workaround for travis-ci bug

bug: https://github.com/travis-ci/travis-ci/issues/1844
---
 .travis.yml | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d28fef5b..babea99b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,19 +6,25 @@ 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
-- 
cgit v1.2.3