Merge lp:~cjwatson/launchpad/ampoule-0.2.0.post1 into lp:launchpad

[Colin Watson]

Upgrade to ampoule 0.2.0.post1, with any luck fixing mysterious job-runner-related test failures.

The failures in question are (for example) http://lpbuildbot.canonical.com/builders/lp-devel-precise/builds/1588/steps/shell_9/logs/summary. I'm only guessing that this will solve them, since I can't reproduce them locally, but from the log output we have I'm at least reasonably sure that the problem is somewhere in ampoule, and this seems a likely suspect.

The forked ampoule branch is https://code.launchpad.net/~launchpad/ampoule/lp; the substantive changes in it are https://code.launchpad.net/~cjwatson/ampoule/process-error-not-ready/+merge/330848 and https://code.launchpad.net/~cjwatson/ampoule/fix-manifest/+merge/330857.

I'd prefer to version this as 0.2.0+lp1, per PEP 440's "Local version identifiers" scheme, but our pre-Cambrian version of setuptools doesn't like that; so I went for 0.2.0.post1 on the basis that old setuptools more or less tolerates it and it will sort properly under new setuptools once we upgrade.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'versions.cfg'
--- versions.cfg	2017-09-13 11:12:39 +0000
+++ versions.cfg	2017-09-15 19:57:33 +0000
@@ -7,7 +7,10 @@
 [versions]
 # Alphabetical, case-insensitive, please! :-)
 
-ampoule = 0.2.0
+# lp:~launchpad/ampoule/lp
+# post1 Don't add a process back to the ready set if it received an error
+# such as a timeout.
+ampoule = 0.2.0.post1
 amqp = 1.4.9
 amqplib = 1.0.2
 anyjson = 0.3.3