← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/turnip:pygit2-0.24.2 into turnip:master

 

Colin Watson has proposed merging ~cjwatson/turnip:pygit2-0.24.2 into turnip:master.

Commit message:
Upgrade to pygit2 0.24.2

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

We hope that this (and the accompanying libgit2 upgrade in https://launchpad.net/~cjwatson/+archive/ubuntu/launchpad/+packages) will fix https://bugs.launchpad.net/turnip/+bug/1683546.

I also included a virtualenv creation tweak that'll be useful once we upgrade to xenial.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/turnip:pygit2-0.24.2 into turnip:master.
diff --git a/Makefile b/Makefile
index 8e57063..3855e69 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ endif
 	 echo "allow_hosts = ''"; \
 	 echo 'find_links = file://$(realpath $(PIP_SOURCE_DIR))/') \
 		>$(ENV)/.pydistutils.cfg
-	$(VIRTUALENV) $(ENV)
+	$(VIRTUALENV) --never-download $(ENV)
 	$(PIP) install $(PIP_CACHE_ARGS) -r bootstrap-requirements.txt
 	$(PIP) install $(PIP_CACHE_ARGS) -c requirements.txt \
 		-e '.[test,deploy]'
diff --git a/requirements.txt b/requirements.txt
index eafd823..914b1df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ pyasn1==0.1.7
 pycparser==2.10
 pycrypto==2.6.1
 pyflakes==0.8.1
-pygit2==0.22.1
+pygit2==0.24.2
 pyramid==1.5.4
 python-mimeparse==0.1.4
 # XXX: deryck 2012-08-10
diff --git a/setup.py b/setup.py
index be53437..36a1156 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ requires = [
     'cornice',
     'lazr.sshserver>=0.1.2',
     'Paste',
-    'pygit2>=0.22.1,<0.23.0',
+    'pygit2>=0.24.0,<0.25.0',
     'python-openid',
     'PyYAML',
     'Twisted',

References