← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:drop-py2-requirements into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:drop-py2-requirements into launchpad:master.

Commit message:
Drop some Python 2 entries from our requirements

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/413919
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:drop-py2-requirements into launchpad:master.
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 6322d9d..ab91d09 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -85,8 +85,7 @@ meliae==0.5.1
 mistune==0.8.3
 monotonic==1.5
 msgpack==1.0.2
-multipart==0.1.1+lp1; python_version < "3"
-multipart==0.2.4; python_version >= "3"
+multipart==0.2.4
 netaddr==0.7.19
 netifaces==0.11.0
 oauth==1.0
@@ -144,8 +143,7 @@ setproctitle==1.1.7
 setuptools-git==1.2
 setuptools-scm==3.4.3
 simplejson==3.8.2
-SimpleTAL==4.3; python_version < "3"
-SimpleTAL==5.2; python_version >= "3"
+SimpleTAL==5.2
 soupmatchers==0.4
 soupsieve==1.9
 statsd==3.3.0