Merge lp:~fginther/fake-juju/fix-makefile-python-path into lp:~landscape/fake-juju/trunk-old

[Francis Ginther]

Update Makefile and setup.py to install 'PyYAML' and with with yakkety python-setuptools.

Update Makefile and setup.py to install 'PyYAML' and with with yakkety python-setuptools.

Testing instructions:
1) Make yakkety, xenial, trusty and precise packages with sbuild

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 51
Branch: lp:~fginther/fake-juju/fix-makefile-python-path
Jenkins: https://ci.lscape.net/job/latch-test-xenial/974/

review: Approve (test results)

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

=== modified file 'Makefile'
--- Makefile	2016-11-18 12:49:28 +0000
+++ Makefile	2016-11-18 19:38:36 +0000
@@ -129,7 +129,11 @@
 ifndef PYTHON_INSTALLDIR
 PYTHON_INSTALLDIR = $(DESTDIR)/usr/lib/python2.7/dist-packages
 endif
-PYTHON_INSTALL_OPTION = --install-lib $(PYTHON_INSTALLDIR)
+ifndef PYTHON_SCRIPTDIR
+PYTHON_SCRIPTDIR = $(DESTDIR)/usr/local/bin
+endif
+MODULEDIR = $(DESTDIR)/usr/local/bin
+PYTHON_INSTALL_OPTION = --install-lib $(PYTHON_INSTALLDIR) --install-scripts $(PYTHON_SCRIPTDIR)
 
 PYTHON_LIB_ROOT = $(shell pwd)/python
 # TODO: read from python/fakejuju/__init__.py
@@ -149,7 +153,7 @@
 	if [ ! "$(SKIP_PYTHON_LIB)" ]; then \
 		mkdir -p $(PYTHON_INSTALLDIR); \
 		cd python; \
-		$(PYTHON) setup.py install $(PYTHON_INSTALL_OPTION); \
+		PYTHONPATH=$(PYTHON_INSTALLDIR):$$PYTHONPATH $(PYTHON) setup.py install $(PYTHON_INSTALL_OPTION); \
 	fi
 
 .PHONY: py-install-dev

=== modified file 'python/setup.py'
--- python/setup.py	2016-10-24 20:21:11 +0000
+++ python/setup.py	2016-11-18 19:38:36 +0000
@@ -45,8 +45,8 @@
 DEPS = ['fixtures',
         'testtools',
         'txjuju',
-        'twisted',
-        'yaml',
+        'Twisted',
+        'PyYAML',
         ]