From 0e78140d479253886055c28a2f5bd5a47a3032ae Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Fri, 13 Oct 2017 16:52:08 -0700
Subject: [PATCH] cryptography 2.1.1 seems to be the problem

---
 .travis.yml | 8 ++++----
 setup.py    | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a0c13b6..c75c6f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,11 +26,11 @@ services:
 - docker
 
 before_install:
-- ps -fHe
+- ps ww -fHe
 - sudo service docker restart ; sleep 10  # https://github.com/travis-ci/travis-ci/issues/4778
 - docker run -d --publish=28015:28015 rethinkdb
 - docker run -d --publish=8020:8020 --publish=50070:50070 --publish=50010:50010 --publish=50020:50020 --publish=50075:50075 chalimartines/cdh5-pseudo-distributed
-- ps -fHe
+- ps ww -fHe
 - virtualenv -p python3 /opt/trough-ve3
 - . /opt/trough-ve3/bin/activate
 - 'env | sort'
@@ -45,13 +45,13 @@ before_install:
 - 'uwsgi --venv=/opt/trough-ve3 --http :6222 --master --processes=2 --harakiri=240 --max-requests=50000 --vacuum --die-on-term --wsgi-file /opt/trough-ve3/bin/writer.py >>/tmp/trough-write.out 2>&1 &'
 - 'uwsgi --venv=/opt/trough-ve3 --http :6112 --master --processes=2 --harakiri=20 --max-requests=50000 --vacuum --die-on-term --wsgi-file /opt/trough-ve3/bin/write_provisioner_local.py >>/tmp/trough-write-provisioner-local.out 2>&1 &'
 - 'uwsgi --venv=/opt/trough-ve3 --http :6111 --master --processes=2 --harakiri=20 --max-requests=50000 --vacuum --die-on-term --wsgi-file /opt/trough-ve3/bin/write_provisioner_server.py >>/tmp/trough-write-provisioner-server.out 2>&1 &'
-- ps -fHe
+- ps ww -fHe
 
 install:
 - pip install . pytest requests warcio
 
 before_script:
-- ps -fHe
+- ps ww -fHe
 
 script:
 - py.test -v tests
diff --git a/setup.py b/setup.py
index 47852c9..aeb9455 100755
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,7 @@ deps = [
     'urlcanon>=0.1.dev16',
     'doublethink>=0.2.0.dev87',
     'PySocks',
+    'cryptography!=2.1.1', # 2.1.1 installation is failing on ubuntu
 ]
 try:
     import concurrent.futures