Revert "Merge pull request Yelp#2712 from Yelp/u/kawaiwan/fix-setupto…

…ols"

This reverts commit 784b36f, reversing
changes made to 59e8fd5.

debian/rules

@@ -18,4 +18,4 @@ override_dh_auto_test:
 	true
 
 override_dh_virtualenv:
-	dh_virtualenv -i $(PIP_INDEX_URL) --python=/usr/bin/python3.6 --preinstall no-manylinux1 --preinstall=-rrequirements-bootstrap.txt --pip-tool pip-custom-platform
+	dh_virtualenv -i $(PIP_INDEX_URL) --python=/usr/bin/python3.6 --preinstall no-manylinux1 --preinstall pip==18.1 --preinstall pip-custom-platform --pip-tool pip-custom-platform

requirements.txt

@@ -20,7 +20,6 @@ choice==0.1
 click==6.6
 cookiecutter==1.4.0
 croniter==0.3.20
-cryptography==2.3.1
 decorator==4.1.2
 docker-py==1.2.3
 docutils==0.12

yelp_package/dockerfiles/mesos-paasta/Dockerfile

@@ -16,11 +16,10 @@ RUN mkdir -p /nail/etc
 RUN ln -s /etc/mesos-slave-secret /nail/etc/mesos-slave-secret
 RUN ln -s /etc/paasta/mesos-cli.json /nail/etc/mesos-cli.json
 
-ADD requirements.txt requirements-dev.txt requirements-bootstrap.txt /paasta/
+ADD requirements.txt requirements-dev.txt /paasta/
 RUN pip install virtualenv==15.1.0
 RUN virtualenv /venv -ppython3.6
 ENV PATH=/venv/bin:$PATH
-RUN pip install -r /paasta/requirements-bootstrap.txt
 RUN pip install -r /paasta/requirements.txt
 
 ADD ./yelp_package/dockerfiles/mesos-paasta/cron.d /etc/cron.d

yelp_package/dockerfiles/playground/Dockerfile

@@ -13,10 +13,9 @@ RUN mkdir -p /var/log/paasta_logs /var/run/sshd /nail/etc
 RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
 RUN ln -s /etc/paasta/mesos-cli.json /nail/etc/mesos-cli.json
 
-ADD requirements.txt requirements-dev.txt requirements-bootstrap.txt /paasta/
+ADD requirements.txt requirements-dev.txt /paasta/
 RUN virtualenv /venv -ppython3.6
 ENV PATH=/venv/bin:$PATH
-RUN pip install -r /paasta/requirements-bootstrap.txt
 RUN pip install -r /paasta/requirements.txt
 
 ADD ./yelp_package/dockerfiles/playground/start.sh /start.sh