launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:pip-20.0.2 into launchpad:master.

Commit message:
Upgrade to pip 20.0.2

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

We no longer need to restate extras specifications from setup.py in constraints.txt.

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/378517
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:pip-20.0.2 into launchpad:master.

diff --git a/constraints.txt b/constraints.txt
index b863478..bbb3f4e 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -10,10 +10,7 @@ zope.browserpage==4.3.0
 zope.browserresource==4.3
 zope.cachedescriptors==4.3.1
 zope.catalog==4.2.1
-# Tell pip about extras to work around https://github.com/pypa/pip/issues/3046
-# XXX cjwatson 2017-09-03: This should be fixed in pip 9.0.0, but apparently
-# isn't.
-zope.component[hook,zcml]==4.5
+zope.component==4.5
 zope.componentvocabulary==2.2.0
 zope.configuration==4.3.1
 zope.container==4.2.2
@@ -68,7 +65,7 @@ zope.tales==5.0
 zope.testing==4.7
 #zope.testrunner==5.0
 # lp:~launchpad-committers/zope.testrunner:launchpad
-zope.testrunner[subunit]==5.1+lp2
+zope.testrunner==5.1+lp2
 zope.traversing==4.3.1
 zope.viewlet==4.2.1
 
@@ -170,7 +167,7 @@ Automat==0.6.0
 Babel==2.5.1
 backports.functools-lru-cache==1.5
 backports.lzma==0.0.3
-beautifulsoup4[lxml]==4.7.1
+beautifulsoup4==4.7.1
 billiard==3.5.0.5
 bleach==3.1.0
 breezy==3.0.1
@@ -303,7 +300,7 @@ testresources==0.2.7
 testscenarios==0.4
 timeline==0.0.7
 treq==18.6.0
-Twisted[conch,tls]==19.2.1
+Twisted==19.2.1
 txAMQP==0.6.2
 txfixtures==0.4.2
 txpkgupload==0.2
@@ -328,7 +325,7 @@ zope.app.http==4.0.1
 zope.app.publication==4.3.1
 zope.app.publisher==4.2.0
 zope.app.server==4.0.0
-zope.app.wsgi[testlayer]==4.1.0
+zope.app.wsgi==4.1.0
 zope.server==4.0.2
 zope.testbrowser==5.5.1
 zope.vocabularyregistry==1.1.1
diff --git a/pip-requirements.txt b/pip-requirements.txt
index 433e330..9e1ff37 100644
--- a/pip-requirements.txt
+++ b/pip-requirements.txt
@@ -1 +1 @@
-pip==9.0.1
+pip==20.0.2