Merge pull request #171 from jzelinskie/fixpyetcd

deps: refresh requirements & apt-get update cache

Dockerfile

@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV HOME /root
 
 # Install the dependencies.
-RUN apt-get update  # 29JAN2015
+RUN apt-get update  # 24JUN2015
 
 # New ubuntu packages should be added as their own apt-get install lines below the existing install commands
 RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62 libjpeg62-dev libevent-2.0.5 libevent-dev gdebi-core g++ libmagic1 phantomjs nodejs npm libldap-2.4-2 libldap2-dev libsasl2-modules libsasl2-dev libpq5 libpq-dev libfreetype6-dev libffi-dev libgpgme11 libgpgme11-dev

requirements-nover.txt

@@ -12,11 +12,10 @@ pymysql
 stripe
 gunicorn<19.0
 gevent
-mixpanel-py
+mixpanel
 beautifulsoup4
 marisa-trie
 apscheduler
-paramiko
 xhtml2pdf
 redis
 hiredis
@@ -27,18 +26,15 @@ alembic
 sqlalchemy
 python-magic
 reportlab==2.7
-blinker
 raven
 python-ldap
 pycrypto
-logentries
 psycopg2
 pyyaml
 git+https://github.com/DevTable/aniso8601-fake.git
 git+https://github.com/DevTable/anunidecode.git
 git+https://github.com/DevTable/pygithub.git
 git+https://github.com/DevTable/container-cloud-config.git
-git+https://github.com/DevTable/python-etcd.git@sslfix
 git+https://github.com/coreos/peewee.git
 git+https://github.com/coreos/py-bitbucket.git
 git+https://github.com/coreos/pyapi-gitlab.git
@@ -54,3 +50,4 @@ python-swiftclient
 python-keystoneclient
 Flask-Testing
 pyjwt
+python-etcd

requirements.txt

@@ -1,100 +1,98 @@
+aiowsgi==0.5
+alembic==0.7.6
 APScheduler==3.0.3
+autobahn==0.9.3-3
 Babel==1.3
+beautifulsoup4==4.3.2
+blinker==1.3
+boto==2.38.0
+cachetools==1.0.2
+cffi==1.1.2
+cryptography==0.9.1
+debtcollector==0.5.0
+enum34==1.0.4
 Flask==0.10.1
 Flask-Login==0.2.11
 Flask-Mail==0.9.1
 Flask-Principal==0.4.0
 Flask-RESTful==0.2.12
 Flask-Testing==0.4.2
-Jinja2==2.7.3
-Logentries==0.7
-Mako==1.0.1
-MarkupSafe==0.23
-Pillow==2.8.1
-PyMySQL==0.6.6
-PyPDF2==1.24
-PyYAML==3.11
-PyJWT==1.3.0
-SQLAlchemy==1.0.3
-WebOb==1.4.1
-Werkzeug==0.10.4
-aiowsgi==0.5
-alembic==0.7.5.post2
-argparse==1.3.0
-autobahn==0.9.3-3
-backports.ssl-match-hostname==3.4.0.2
-beautifulsoup4==4.3.2
-blinker==1.3
-boto==2.38.0
-cachetools==1.0.0
-certifi==2015.04.28
-cffi==0.9.2
-cryptography==0.8.2
-ecdsa==0.13
-enum34==1.0.4
 funcparserlib==0.3.6
-futures==2.2.0
+functools32==3.2.3-1
-gevent==1.0.1
+futures==3.0.3
+gevent==1.0.2
 gipc==0.5.0
-greenlet==0.4.5
+greenlet==0.4.7
 gunicorn==18.0
 hiredis==0.2.0
 html5lib==0.99999
+idna==2.0
+ipaddress==1.0.7
 iso8601==0.1.10
 itsdangerous==0.24
-jsonschema==2.4.0
+Jinja2==2.7.3
+jsonschema==2.5.1
+Mako==1.0.1
 marisa-trie==0.7.2
-mixpanel-py==4.0.2
+MarkupSafe==0.23
+mixpanel==4.1.0
 mock==1.0.1
 msgpack-python==0.4.6
 netaddr==0.7.14
 netifaces==0.10.4
 oauthlib==0.7.2
-oslo.config==1.11.0
+oslo.config==1.12.1
-oslo.i18n==1.6.0
+oslo.i18n==2.0.0
-oslo.serialization==1.5.0
+oslo.serialization==1.6.0
-oslo.utils==1.5.0
+oslo.utils==1.6.0
-paramiko==1.15.2
+pbr==1.2.0
-pbr==0.11.0
+Pillow==2.8.2
 prettytable==0.7.2
-psutil==2.2.1
+psutil==3.0.1
-psycopg2==2.6
+psycopg2==2.6.1
 py-bcrypt==0.4
-pyOpenSSL==0.15.1
+pyasn1==0.1.8
-pyasn1==0.1.7
+pycparser==2.14
-pycparser==2.12
 pycrypto==2.6.1
 pygpgme==0.3
+PyJWT==1.3.0
+PyMySQL==0.6.6
+pyOpenSSL==0.15.1
+PyPDF2==1.24
 python-dateutil==2.4.2
-python-keystoneclient==1.4.0
+python-etcd==0.3.3
+python-keystoneclient==1.6.0
 python-ldap==2.4.19
 python-magic==0.4.6
 python-swiftclient==2.4.0
-pytz==2015.2
+pytz==2015.4
-raven==5.3.0
+PyYAML==3.11
+raven==5.3.1
 redis==2.10.3
 reportlab==2.7
-requests==2.6.2
+requests==2.7.0
-requests-oauthlib==0.4.2
+requests-oauthlib==0.5.0
-simplejson==3.7.1
+simplejson==3.7.3
 six==1.9.0
-stevedore==1.4.0
+SQLAlchemy==1.0.5
+stevedore==1.5.0
 stringscore==0.1.0
-stripe==1.22.2
+stripe==1.22.3
 trollius==1.0.4
-tzlocal==1.1.3
+tzlocal==1.2
-urllib3==1.10.3
+urllib3==1.10.4
 waitress==0.8.9
-websocket-client==0.30.0
+WebOb==1.4.1
-wsgiref==0.1.2
+Werkzeug==0.10.4
+wrapt==1.10.4
 xhtml2pdf==0.0.6
+
 git+https://github.com/DevTable/aniso8601-fake.git
 git+https://github.com/DevTable/anunidecode.git
 git+https://github.com/DevTable/pygithub.git
 git+https://github.com/DevTable/container-cloud-config.git
-git+https://github.com/DevTable/python-etcd.git@sslfix
-git+https://github.com/NateFerrero/oauth2lib.git
 git+https://github.com/coreos/peewee.git
 git+https://github.com/coreos/py-bitbucket.git
 git+https://github.com/coreos/pyapi-gitlab.git
 git+https://github.com/coreos/mockldap.git
+git+https://github.com/NateFerrero/oauth2lib.git