Fix travis tests (#154)

* added readme change * update cryptography * maybe 2.0 works * try updating cffi * added cffi comments
lyft · Oct 11, 2017 · 2208815 · 2208815
1 parent 3fc5d9b
commit 2208815
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-confidant
+Confidant
 =========
 
 Your secret keeper. Stores secrets in DynamoDB, encrypted at rest.

diff --git a/piptools_requirements.in b/piptools_requirements.in
@@ -3,7 +3,14 @@
 # License: BSD
 # Upstream url: https://github.com/pyca/cryptography
 # Use: For encryption
-cryptography==1.7.1
+cryptography==2.0
+
+# C Foreign Function Interface for Python.
+# License: MIT
+# Upstream url: https://bitbucket.org/cffi/cffi
+# Use: Required by cryptography package to be installed. This should be removed
+# once crytography updates their depenencies to require cffi>=1.10.0.
+cffi==1.10.0
 
 # Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL
 # License: BSD

diff --git a/piptools_requirements.txt b/piptools_requirements.txt
@@ -5,9 +5,10 @@
 #    control run piptools.compile confidant
 #
 appdirs==1.4.2
+asn1crypto==0.23.0        # via cryptography
 certifi==2016.9.26
-cffi==1.9.1               # via cryptography
-cryptography==1.7.1
+cffi==1.10.0
+cryptography==2.0
 enum34==1.1.6             # via cryptography
 idna==2.2
 ipaddress==1.0.17         # via cryptography

diff --git a/requirements.in b/requirements.in
@@ -35,7 +35,14 @@ pynamodb==1.5.3
 # License: BSD
 # Upstream url: https://github.com/pyca/cryptography
 # Use: For encryption
-cryptography==1.7.1
+cryptography==2.0
+
+# C Foreign Function Interface for Python.
+# License: MIT
+# Upstream url: https://bitbucket.org/cffi/cffi
+# Use: Required by cryptography package to be installed. This should be removed
+# once crytography updates their depenencies to require cffi>=1.10.0.
+cffi==1.10.0
 
 # License: BSD
 # Upstream url: https://github.com/fengsp/flask-session

diff --git a/requirements.txt b/requirements.txt
@@ -5,14 +5,15 @@
 #    control run piptools.compile confidant
 #
 appdirs==1.4.2
+asn1crypto==0.23.0
 authomatic==0.1.0.post1
 babel==2.4.0              # via delorean
 boto3==1.4.0
 botocore==1.4.58
 certifi==2016.9.26
-cffi==1.9.1
+cffi==1.10.0
 coverage==3.7.1
-cryptography==1.7.1
+cryptography==2.0
 defusedxml==0.4.1         # via python-saml
 delorean==0.6.0           # via pynamodb
 dm.xmlsec.binding==1.3.2  # via python-saml