[Python-modules-commits] [python-pygit2] 06/11: merge patched into master
Ondrej Novy
onovy at debian.org
Fri Jan 5 15:50:18 UTC 2018
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-pygit2.
commit f0c73aafe586079658452c130e442166a6dd7511
Merge: dc7f7b1 b78b78b
Author: Ondřej Nový <onovy at debian.org>
Date: Fri Jan 5 16:09:54 2018 +0100
merge patched into master
CHANGELOG.rst | 26 +++
debian/.git-dpm | 6 +-
debian/patches/0001-Remove-privacy-breach.patch | 2 +-
.../0002-Don-t-access-internet-during-build.patch | 2 +-
.../0003-Skip-broken-unit-tests-in-buildd.patch | 20 +--
docs/conf.py | 2 +-
docs/diff.rst | 6 +-
docs/install.rst | 10 +-
pygit2/_build.py | 2 +-
src/blob.c | 4 +-
src/diff.c | 89 ++++++++++-
src/patch.c | 77 +++++----
src/patch.h | 2 +-
src/pygit2.c | 2 +
src/types.h | 9 ++
test/test_blob.py | 30 ++++
test/test_diff.py | 18 +++
test/test_patch.py | 175 ++++++++++++++++++---
test/test_remote.py | 4 +
19 files changed, 390 insertions(+), 96 deletions(-)
diff --cc debian/.git-dpm
index fdd76d3,0000000..482995e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- d91a8634a64c9382fb1d29b3dc2406f25897a192
- d91a8634a64c9382fb1d29b3dc2406f25897a192
- 7805a11f624d8f04a14b02cb2b8b735772978e03
++b78b78b4f8ea680d0955f5fd1069c5d34d6768d6
++b78b78b4f8ea680d0955f5fd1069c5d34d6768d6
++cad87463cef2aed297dd01f16840c21484f2730d
+cad87463cef2aed297dd01f16840c21484f2730d
+python-pygit2_0.26.3.orig.tar.gz
+6dc04829d90f323172fd6bbd4d85f12606fc3fb0
+467760
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-privacy-breach.patch
index 8195ab6,0000000..71528df
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-privacy-breach.patch
+++ b/debian/patches/0001-Remove-privacy-breach.patch
@@@ -1,44 -1,0 +1,44 @@@
- From 1c571041fb6e0e80037618a067b77ea5d90df315 Mon Sep 17 00:00:00 2001
++From 72660680e8fc090a3e580f894349d07eebb00d15 Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Thu, 3 Aug 2017 23:32:27 +0200
+Subject: Remove privacy breach
+
+---
+ docs/_themes/sphinx_rtd_theme/layout.html | 3 ---
+ docs/development.rst | 9 ---------
+ 2 files changed, 12 deletions(-)
+
+diff --git a/docs/_themes/sphinx_rtd_theme/layout.html b/docs/_themes/sphinx_rtd_theme/layout.html
+index 8585a6b..bfe189a 100644
+--- a/docs/_themes/sphinx_rtd_theme/layout.html
++++ b/docs/_themes/sphinx_rtd_theme/layout.html
+@@ -70,9 +70,6 @@
+ {%- endblock %}
+ {%- block extrahead %} {% endblock %}
+
+- {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
+- <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
+-
+ </head>
+
+ <body class="wy-body-for-nav" role="document">
+diff --git a/docs/development.rst b/docs/development.rst
+index 44f25e8..f3a7c46 100644
+--- a/docs/development.rst
++++ b/docs/development.rst
+@@ -2,15 +2,6 @@
+ The development version
+ **********************************************************************
+
+-Unit tests
+-==========
+-
+-.. image:: https://travis-ci.org/libgit2/pygit2.svg?branch=master
+- :target: http://travis-ci.org/libgit2/pygit2
+-
+-.. image:: https://ci.appveyor.com/api/projects/status/edmwc0dctk5nacx0/branch/master?svg=true
+- :target: https://ci.appveyor.com/project/jdavid/pygit2/branch/master
+-
+ .. code-block:: sh
+
+ $ git clone git://github.com/libgit2/pygit2.git
diff --cc debian/patches/0002-Don-t-access-internet-during-build.patch
index adb985f,0000000..65bb917
mode 100644,000000..100644
--- a/debian/patches/0002-Don-t-access-internet-during-build.patch
+++ b/debian/patches/0002-Don-t-access-internet-during-build.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 1fdb65a327ec15befbf128b49ea2cd839e4971ad Mon Sep 17 00:00:00 2001
++From eedd81a32fd28422abc9867f1255f6bccb98fd74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
+Date: Fri, 1 Dec 2017 14:59:57 +0100
+Subject: Don't access internet during build
+
+---
+ test/utils.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/utils.py b/test/utils.py
+index e574a74..7eb76a8 100644
+--- a/test/utils.py
++++ b/test/utils.py
+@@ -41,7 +41,7 @@ import unittest
+ import pygit2
+
+
+-_no_network = None
++_no_network = True
+ def no_network():
+ global _no_network
+ if _no_network is None:
diff --cc debian/patches/0003-Skip-broken-unit-tests-in-buildd.patch
index 64fdc43,0000000..bc701f5
mode 100644,000000..100644
--- a/debian/patches/0003-Skip-broken-unit-tests-in-buildd.patch
+++ b/debian/patches/0003-Skip-broken-unit-tests-in-buildd.patch
@@@ -1,45 -1,0 +1,45 @@@
- From d91a8634a64c9382fb1d29b3dc2406f25897a192 Mon Sep 17 00:00:00 2001
++From b78b78b4f8ea680d0955f5fd1069c5d34d6768d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
+Date: Fri, 1 Dec 2017 19:04:56 +0100
+Subject: Skip broken unit tests in buildd
+
+---
+ test/test_patch.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/test_patch.py b/test/test_patch.py
- index 1855556..6b2c683 100644
++index 6774f37..fe66785 100644
+--- a/test/test_patch.py
++++ b/test/test_patch.py
+@@ -28,6 +28,7 @@
+ from __future__ import absolute_import
+ from __future__ import unicode_literals
+
++import unittest
+ import pygit2
+ from . import utils
+
- @@ -85,6 +86,7 @@ class PatchTest(utils.RepoTestCase):
++@@ -96,6 +97,7 @@ class PatchTest(utils.RepoTestCase):
+
+ self.assertEqual(patch.patch, BLOB_PATCH)
+
++ @unittest.skip("Doesn't work in buildd")
+ def test_patch_create_from_blobs(self):
- old_blob = self.repo.create_blob(BLOB_OLD_CONTENT)
- new_blob = self.repo.create_blob(BLOB_NEW_CONTENT)
- @@ -98,6 +100,7 @@ class PatchTest(utils.RepoTestCase):
++ old_blob = self.repo[BLOB_OLD_SHA]
++ new_blob = self.repo[BLOB_NEW_SHA]
++@@ -109,6 +111,7 @@ class PatchTest(utils.RepoTestCase):
+
- self.assertEqual(patch.patch, BLOB_PATCH)
++ self.assertEqual(patch.patch, BLOB_PATCH2)
+
++ @unittest.skip("Doesn't work in buildd")
+ def test_patch_create_from_blob_buffer(self):
- old_blob = self.repo.create_blob(BLOB_OLD_CONTENT)
++ old_blob = self.repo[BLOB_OLD_SHA]
+ patch = pygit2.Patch.create_from(
- @@ -119,6 +122,7 @@ class PatchTest(utils.RepoTestCase):
++@@ -130,6 +133,7 @@ class PatchTest(utils.RepoTestCase):
+
+ self.assertEqual(patch.patch, BLOB_PATCH_ADDED)
+
++ @unittest.skip("Doesn't work in buildd")
+ def test_patch_create_from_blob_buffer_delete(self):
- old_blob = self.repo.create_blob(BLOB_OLD_CONTENT)
++ old_blob = self.repo[BLOB_OLD_SHA]
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pygit2.git
More information about the Python-modules-commits
mailing list