Install cryptography==2.0.3

Latest pyca/cryptography requires setuptools>18.5, which we do not have on prod installs. In order to make this transition in the next minor release however, we can temporarily pin to a slightly older version of pyca/cryptography, such that we can install it using the version of setuptools that we have. For the Docker dev env, we need libffi-dev installed to pip install cryptography.
freedomofpress · May 18, 2018 · 117acb6 · 117acb6
1 parent 2377dca
commit 117acb6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/securedrop/Dockerfile b/securedrop/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && \
     apt-get install -y devscripts \
                        python-pip libpython2.7-dev libssl-dev secure-delete \
                        gnupg2 ruby redis-server firefox git xvfb haveged curl \
-                       gettext paxctl x11vnc enchant
+                       gettext paxctl x11vnc enchant libffi-dev
 
 RUN gem install sass -v 3.4.23
 

diff --git a/securedrop/requirements/securedrop-app-code-requirements.in b/securedrop/requirements/securedrop-app-code-requirements.in
@@ -1,4 +1,4 @@
-cryptography
+cryptography==2.0.3
 cssmin
 Flask-Assets
 Flask-Babel

diff --git a/securedrop/requirements/securedrop-app-code-requirements.txt b/securedrop/requirements/securedrop-app-code-requirements.txt
@@ -8,15 +8,17 @@ asn1crypto==0.24.0        # via cryptography
 babel==2.5.1              # via flask-babel
 cffi==1.11.5              # via cryptography
 click==6.7                # via flask, rq
-cryptography==2.2.2
+cryptography==2.0.3
 cssmin==0.2.0
+enum34==1.1.6             # via cryptography
 flask-assets==0.12
 flask-babel==0.11.2
 flask-sqlalchemy==2.3.2
 flask-wtf==0.14.2
 flask==0.12.2
 gnupg==2.3.1
 idna==2.6                 # via cryptography
+ipaddress==1.0.22         # via cryptography
 itsdangerous==0.24        # via flask
 jinja2==2.10
 jsmin==2.2.2