From 69d4cd68dc015ca74875942e4ad612dc02110277 Mon Sep 17 00:00:00 2001
From: Jake Moshenko <jake.moshenko@coreos.com>
Date: Thu, 28 Jan 2016 14:11:41 -0500
Subject: [PATCH] Fix conflict by removing pycrypto, dump python dep list

---
 Dockerfile             | 1 +
 requirements-nover.txt | 2 +-
 requirements.txt       | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 45343d121..41198828a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
diff --git a/requirements-nover.txt b/requirements-nover.txt
index 5a9949b75..146e4088a 100644
--- 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
diff --git a/requirements.txt b/requirements.txt
index 62ec5d263..1b35d3043 100644
--- 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