fix yelp make targets

Makefile

@@ -26,7 +26,7 @@ itest: test
 	tox -e paasta_itests
 
 # See the makefile in yelp_package/Makefile for packaging stuff
-itest_%:
+itest_%_yelp:
 	make -C yelp_package $@
 
 # Steps to release
@@ -43,4 +43,3 @@ clean:
 	find . -name '*.pyc' -delete
 	find . -name '__pycache__' -delete
 	rm -rf .tox
-

debian/rules

@@ -19,7 +19,7 @@ override_dh_auto_build:
 	true
 
 override_dh_installdocs:
-	tox -e manpages
+	tox -i http://pypi.yelpcorp.com -e manpages
 
 # do not call `make test` as part of packaging
 override_dh_auto_test:

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.2
+mesos.interface==0.22.1
 ordereddict==1.1
 path.py==8.1
 ply==3.4

yelp_package/Makefile

@@ -26,7 +26,7 @@ build_lucid_docker:
 	[ -d ../dist ] || mkdir ../dist
 	cd dockerfiles/lucid/ && docker build -t "paastatools_lucid_container" .
 package_lucid_yelp: build_lucid_docker
-	cp setup.py ../; cp requirements.txt ../
+	cat requirements-extras.txt >> ../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
@@ -37,7 +37,7 @@ build_trusty_docker:
 	[ -d ../dist ] || mkdir ../dist
 	cd dockerfiles/trusty/ && docker build -t "paastatools_trusty_container" .
 package_trusty_yelp: build_trusty_docker
-	cp setup.py ../; cp requirements.txt ../
+	cat requirements-extras.txt >> ../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

yelp_package/dockerfiles/lucid/Dockerfile

@@ -18,7 +18,7 @@ MAINTAINER Kyle Anderson <[email protected]>
 # Make sure we get a package suitable for building this package correctly.
 # Per dnephin we need https://github.com/spotify/dh-virtualenv/pull/20
 # Which at this time is in this package
-RUN apt-get update && apt-get -y install dpkg-dev python-tox python-setuptools python-dev debhelper dh-virtualenv=0.6-yelp2 python-yaml python-pytest pyflakes python2.7 python2.7-dev help2man zsh
+RUN apt-get update && apt-get -y install dpkg-dev python-tox python-setuptools python-dev debhelper dh-virtualenv=0.6-yelp2 python-yaml python-pytest pyflakes python2.7 python2.7-dev help2man zsh git
 
 ENV HOME /work
 ENV PWD /work

yelp_package/requirements-extras.txt

@@ -0,0 +1,2 @@
+yelp-cgeom==1.3.1
+yelp-logging==1.0.37