vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix conflict by removing pycrypto, dump python dep list

Browse source
This commit is contained in:
Jake Moshenko 2016-01-28 14:11:41 -05:00
parent a132d984e5
commit 69d4cd68dc
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -15,6 +15,7 @@ RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62 libjp
ADD requirements.txt requirements.txt ADD requirements.txt requirements.txt
RUN virtualenv --distribute venv RUN virtualenv --distribute venv
RUN venv/bin/pip install -r requirements.txt RUN venv/bin/pip install -r requirements.txt
RUN venv/bin/pip freeze
# Install the binary dependencies # Install the binary dependencies
ADD binary_dependencies binary_dependencies ADD binary_dependencies binary_dependencies

2
requirements-nover.txt
View file

@ -29,7 +29,7 @@ reportlab==2.7
raven raven
peewee peewee
python-ldap python-ldap
pycrypto pycryptodome
psycopg2 psycopg2
pyyaml pyyaml
git+https://github.com/DevTable/aniso8601-fake.git git+https://github.com/DevTable/aniso8601-fake.git

1
requirements.txt
View file

@ -65,7 +65,6 @@ psycopg2==2.6.1
py-bcrypt==0.4 py-bcrypt==0.4
pyasn1==0.1.9 pyasn1==0.1.9
pycparser==2.14 pycparser==2.14
pycrypto==2.6.1
pycryptodome==3.3.1 pycryptodome==3.3.1
PyGithub==1.25.2 PyGithub==1.25.2
pygpgme==0.3 pygpgme==0.3