Fix conflict by removing pycrypto, dump python dep list

2016-01-28 14:11:41 -05:00 · 2016-01-28 14:11:41 -05:00 · 69d4cd68dc
commit 69d4cd68dc
parent a132d984e5
3 changed files with 2 additions and 2 deletions
--- a/1
+++ b/1
@ -15,6 +15,7 @@ RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62 libjp
 ADD requirements.txt requirements.txt
 RUN virtualenv --distribute venv
 RUN venv/bin/pip install -r requirements.txt
+RUN venv/bin/pip freeze

 # Install the binary dependencies
 ADD binary_dependencies binary_dependencies
--- a/requirements-nover.txt
+++ b/requirements-nover.txt
@ -29,7 +29,7 @@ reportlab==2.7
 raven
 peewee
 python-ldap
-pycrypto
+pycryptodome
 psycopg2
 pyyaml
 git+https://github.com/DevTable/aniso8601-fake.git
--- a/requirements.txt
+++ b/requirements.txt
@ -65,7 +65,6 @@ psycopg2==2.6.1
 py-bcrypt==0.4
 pyasn1==0.1.9
 pycparser==2.14
-pycrypto==2.6.1
 pycryptodome==3.3.1
 PyGithub==1.25.2
 pygpgme==0.3