Merge lp:~fginther/fake-juju/remove-txjuju-ppa into lp:~landscape/fake-juju/trunk-old

[Francis Ginther]

Remove automatic addition of ppa:landscape/txjuju-daily and move it to the README.

Remove automatic addition of ppa:landscape/txjuju-daily and move it to the README.

Testing instructions:
 1) Start with a clean environment
 2) Run ci-test, watch it fail to locate python-txjuju
 3) Execute the PPA instructions from the README
 4) Run ci-test again, it will install all dependencies this time

Once this is merged, the jenkins slaves will need to be cleaned.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 55
Branch: lp:~fginther/fake-juju/remove-txjuju-ppa
Jenkins: https://ci.lscape.net/job/latch-test-xenial/973/

review: Approve (test results)

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

=== modified file 'Makefile'
--- Makefile	2016-11-03 16:56:10 +0000
+++ Makefile	2016-11-18 13:13:12 +0000
@@ -182,7 +182,6 @@
 
 .PHONY: ci-test
 ci-test:
-	sudo add-apt-repository -y --update ppa:landscape/txjuju-daily
 	sudo apt-get -y install --force-yes \
 		wget \
 		python3-pip \
 
=== modified file 'README'
--- README	2016-05-17 18:29:45 +0000
+++ README	2016-11-18 13:13:12 +0000
@@ -14,12 +14,13 @@
 Dependencies
 ------------
 
-To run tests, the code will need a recent python-jujuclient package installed.
-One should add the juju-stable PPA to get a fresh enough version on at least
-trusty and vivid:
+To run tests, the code will need the latest python-jujuclient and python-txjuju
+packages installed. These builds are available from the juju-stable and
+txjuju-daily PPAs and can be added with:
 
-sudo add-apt-repository ppa:juju/stable
-sudo apt-get update && sudo apt-get install python-jujuclient
+sudo add-apt-repository -y ppa:juju/stable
+sudo add-apt-repository -y ppa:landscape/txjuju-daily
+sudo apt-get update && sudo apt-get install python-jujuclient python-txjuju
 
 Building
 ---------