ditch extra requirements.txt

debian/rules

@@ -19,11 +19,11 @@ override_dh_auto_build:
 	true
 
 override_dh_installdocs:
-	tox -i http://pypi.yelpcorp.com -e manpages
+	tox -e manpages
 
 # do not call `make test` as part of packaging
 override_dh_auto_test:
 	true
 
 override_dh_virtualenv:
-	dh_virtualenv --pypi-url='http://pypi.yelpcorp.com/simple' --python=/usr/bin/python2.7
+	dh_virtualenv --extra-index-url 'http://pypi.yelpcorp.com/simple' --python=/usr/bin/python2.7

requirements.txt

@@ -20,7 +20,7 @@ lockfile==0.9.1
 -e git://github.com/yelp/marathon-python.git@e7e2116159528c45afdbb8b01c03fbd0333e0108#egg=marathon-python
 mccabe==0.3.1
 mesos.cli==0.1.3
-mesos.interface==0.22.1
+mesos.interface==0.22.1.2
 ordereddict==1.1
 path.py==8.1
 ply==3.4
@@ -42,5 +42,5 @@ thriftpy==0.1.15
 tron==0.6.1.1
 websocket-client==0.32.0
 wsgiref==0.1.2
-yelp-clog==2.2.9
+yelp-clog==2.2.10
 zope.interface==4.1.2

tox.ini

@@ -2,6 +2,9 @@
 usedevelop=True
 basepython = python2.7
 envlist = py
+indexserver =
+    default = https://pypi.python.org/simple
+    private = http://pypi.yelpcorp.com
 
 [flake8]
 max-line-length = 120
@@ -40,7 +43,10 @@ commands =
 [testenv:manpages]
 # This tox invocation is called by dh-virtualenv inside a container
 # and needs the full path so it can work regardless of the current directory
-deps = -r/work/requirements.txt
+deps =
+    :private:yelp-cgeom==1.3.1
+    :private:yelp-logging==1.0.37
+    -r/work/requirements.txt
 commands = ./build-manpages.sh
 
 [testenv:paasta_itests]

yelp_package/Makefile

@@ -26,9 +26,6 @@ build_lucid_docker:
 	[ -d ../dist ] || mkdir ../dist
 	cd dockerfiles/lucid/ && docker build -t "paastatools_lucid_container" .
 package_lucid_yelp: build_lucid_docker
-	cp ../requirements.txt requirements.txt.bak
-	cat requirements-extras.txt >> ../requirements.txt
-	mv requirements.txt.bak ../requirements.txt
 	$(DOCKER_RUN_LUCID) /bin/bash -c "dpkg-buildpackage -d && mv ../*.deb dist/"
 	$(DOCKER_RUN_LUCID) chown -R $(UID):$(GID) /work
 itest_lucid_yelp: package_lucid_yelp
@@ -39,9 +36,6 @@ build_trusty_docker:
 	[ -d ../dist ] || mkdir ../dist
 	cd dockerfiles/trusty/ && docker build -t "paastatools_trusty_container" .
 package_trusty_yelp: build_trusty_docker
-	cp ../requirements.txt requirements.txt.bak
-	cat requirements-extras.txt >> ../requirements.txt
-	mv requirements.txt.bak ../requirements.txt
 	$(DOCKER_RUN_TRUSTY) /bin/bash -c "dpkg-buildpackage -d && mv ../*.deb dist/"
 	$(DOCKER_RUN_TRUSTY) chown -R $(UID):$(GID) /work
 itest_trusty_yelp: package_trusty_yelp