← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:fix-no-system-site-packages into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:fix-no-system-site-packages into launchpad:master.

Commit message:
Restore pinning of cffi and pycparser

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

As of the removal of --system-site-packages, these no longer need to be in setup-requirements.txt; but they're still in the virtualenv, so they need to be pinned somewhere.  Go back to pinning them in constraints.txt.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-no-system-site-packages into launchpad:master.
diff --git a/constraints.txt b/constraints.txt
index 0a146f7..ebe72da 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -87,9 +87,8 @@ transaction==2.4.0
 
 # zope.password needs these
 bcrypt==3.1.6
-# Handled in setup-requirements.txt instead.
-#cffi==1.12.2
-#pycparser==2.19
+cffi==1.12.2
+pycparser==2.19
 
 # Python2-only
 zope.untrustedpython==4.0.0