← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:six-1.14.0 into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:six-1.14.0 into launchpad:master.

Commit message:
Upgrade to six 1.14.0

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/379616

The new six.moves.collections_abc will come in handy.

(Leaving the old version commented out is my current convention for indicating divergences from the versions imported from https://github.com/zopefoundation/zopetoolkit.  I think we should probably build constraints.txt from a few different input files rather than doing this manually, but I haven't got round to sorting that out yet.)

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/379615
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:six-1.14.0 into launchpad:master.
diff --git a/constraints.txt b/constraints.txt
index e794c78..6468fa7 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -76,7 +76,8 @@ python-gettext==4.0
 pytz==2018.9
 # Handled in setup-requirements.txt instead.
 #setuptools==41.0.0
-six==1.12.0
+#six==1.12.0
+six==1.14.0
 transaction==2.4.0
 
 # zope.password needs these