Merge cff2712 into 962a52b

.travis.yml

@@ -10,9 +10,10 @@ script: py.test --cov news
 env:
   - SECRET_KEY=FOO DEBUG=False ALLOWED_HOSTS=* DATABASE_URL=mysql://root@localhost/basket SUPERTOKEN='foo'
 install:
-  - bin/peep.py install -r requirements/compiled.txt -r requirements/dev.txt
-  - pip install coveralls
+  - bin/pipstrap.py
+  - pip install --require-hashes -r requirements/travis.txt -r requirements/dev.txt
 after_success:
+  - pip install coveralls
   - coveralls
 notifications:
   irc:

Dockerfile

@@ -10,10 +10,13 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends build-essential python2.7 libpython2.7 python-dev \
         python-pip gettext python-mysqldb
 
+# Get pip 8
+COPY bin/pipstrap.py bin/pipstrap.py
+RUN bin/pipstrap.py
+
 # Install app
-COPY bin/peep.py bin/peep.py
 COPY requirements/base.txt requirements/prod.txt /app/requirements/
-RUN bin/peep.py install -r requirements/prod.txt
+RUN pip install --require-hashes -r requirements/prod.txt
 
 COPY . /app