← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:ampoule-19.12.0 into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:ampoule-19.12.0 into launchpad:master.

Commit message:
Upgrade to ampoule 19.12.0

I happened to notice that this is maintained upstream again, and the latest upstream release includes a patch that's close enough to the one in our local branch to allow us to drop our local branch.

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/377973

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/377974
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:ampoule-19.12.0 into launchpad:master.
diff --git a/constraints.txt b/constraints.txt
index 723963f..163e70e 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -157,10 +157,7 @@ zc.recipe.testrunner==2.0.0
 
 # Alphabetical, case-insensitive, please! :-)
 
-# 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
+ampoule==19.12.0
 amqp==2.4.2
 anyjson==0.3.3
 appdirs==1.4.3