← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~ilkeremrekoc/launchpad:fix-pyparsing-requirements into launchpad:master

 

İlker Emre Koç has proposed merging ~ilkeremrekoc/launchpad:fix-pyparsing-requirements into launchpad:master.

Commit message:
fix requirements for pyparsing

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

- Reverted the pyparsing version change to ztk-versions.cfg
- Added upgraded pyparsing version into launchpad.txt
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ilkeremrekoc/launchpad:fix-pyparsing-requirements into launchpad:master.
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 0486e8a..0a9acd8 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -140,6 +140,7 @@ pymacaroons==0.13.0
 pymemcache==3.5.0
 PyNaCl==1.3.0
 pyOpenSSL==17.5.0
+pyparsing==3.1.4
 pystache==0.6.6
 python-dateutil==2.9.0.post0
 python-debian==0.1.32
diff --git a/requirements/ztk-versions.cfg b/requirements/ztk-versions.cfg
index cf0d93e..7d2a868 100644
--- a/requirements/ztk-versions.cfg
+++ b/requirements/ztk-versions.cfg
@@ -94,7 +94,7 @@ fixtures = 3.0.0
 linecache2 = 1.0.0
 manuel = 1.10.1
 pbr = 5.5.0
-pyparsing = 3.1.4
+pyparsing = 2.4.7
 python-mimeparse = 1.6.0
 python-subunit = 1.4.0
 testtools = 2.4.0