diff --git a/.gitignore b/.gitignore index 3414d8e..e290fa4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /pygit2-0.21.0.tar.gz /pygit2-0.21.1.tar.gz /pygit2-0.21.2.tar.gz +/pygit2-0.21.3.tar.gz diff --git a/0001-Fix-syntax-error.patch b/0001-Fix-syntax-error.patch deleted file mode 100644 index c689315..0000000 --- a/0001-Fix-syntax-error.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 309a844793a56a7a71f075e841faa75d5b17a192 Mon Sep 17 00:00:00 2001 -From: Mathieu Bridon -Date: Tue, 12 Aug 2014 11:24:03 +0200 -Subject: [PATCH] Fix syntax error - -https://github.com/libgit2/pygit2/pull/401 ---- - pygit2/py2.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pygit2/py2.py b/pygit2/py2.py -index 3c57fba..a2d2359 100644 ---- a/pygit2/py2.py -+++ b/pygit2/py2.py -@@ -54,4 +54,4 @@ def to_str(s): - if type(s) is unicode: - return s.encode() - -- raise TypeError, 'unexpected type "%s"' % repr(s) -+ raise TypeError('unexpected type "%s"' % repr(s)) --- -1.9.3 - diff --git a/0001-Remove-remote-calling-unit-tests.patch b/0001-Remove-remote-calling-unit-tests.patch index e5cce41..d26182f 100644 --- a/0001-Remove-remote-calling-unit-tests.patch +++ b/0001-Remove-remote-calling-unit-tests.patch @@ -1,6 +1,6 @@ -From f56fb3697c1ac9d42585cd1a0bb33b6d8d1304cb Mon Sep 17 00:00:00 2001 +From c846d973b2797ad52fa6991f86f0794c8373d961 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon -Date: Sun, 29 Jun 2014 18:27:33 +0200 +Date: Fri, 19 Sep 2014 17:25:38 +0200 Subject: [PATCH] Remove remote-calling unit tests These can only fail when building in Koji, as the builder can't access @@ -39,10 +39,10 @@ index 3bdeb6f..22dbacc 100644 if __name__ == '__main__': unittest.main() diff --git a/test/test_repository.py b/test/test_repository.py -index 4d6472e..7ba9c73 100644 +index 72a5e64..9cbca66 100644 --- a/test/test_repository.py +++ b/test/test_repository.py -@@ -477,14 +477,6 @@ class CloneRepositoryTest(utils.NoRepoTestCase): +@@ -454,14 +454,6 @@ class CloneRepositoryTest(utils.NoRepoTestCase): clone_into(repo, remote) self.assertTrue('refs/remotes/origin/master' in repo.listall_references()) @@ -54,9 +54,9 @@ index 4d6472e..7ba9c73 100644 - - self.assertFalse(repo.is_empty) - - # FIXME The tests below are commented because they are broken: - # - # - test_clone_push_url: Passes, but does nothing useful. + def test_clone_with_checkout_branch(self): + # create a test case which isolates the remote + test_repo = clone_repository('./test/data/testrepo.git', -- -1.9.3 +2.1.0 diff --git a/python-pygit2.spec b/python-pygit2.spec index 1a09cf5..cef2177 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -6,8 +6,8 @@ %endif Name: python-%{pkgname} -Version: 0.21.2 -Release: 3%{?dist} +Version: 0.21.3 +Release: 1%{?dist} Summary: Python 2.x bindings for libgit2 URL: http://www.pygit2.org Source: http://pypi.python.org/packages/source/p/%{pkgname}/%{pkgname}-%{version}.tar.gz @@ -22,7 +22,6 @@ BuildRequires: python-setuptools Requires: python-cffi Patch0: 0001-Remove-remote-calling-unit-tests.patch -Patch1: 0001-Fix-syntax-error.patch %description pygit2 is a set of Python bindings to the libgit2 library, which implements @@ -57,7 +56,6 @@ Documentation for %{name}. %setup -qn %{pkgname}-%{version} %patch0 -p1 -%patch1 -p1 rm -rf %{py3dir} cp -a . %{py3dir} @@ -108,6 +106,9 @@ popd %changelog +* Fri Sep 19 2014 Mathieu Bridon - 0.21.3-1 +- Update to 0.21.3 + * Sun Aug 17 2014 Fedora Release Engineering - 0.21.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index e1bb6c3..5e32e83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcb35b873e70628ad1c8f72cb137f310 pygit2-0.21.2.tar.gz +c929bb958f91ffaa942cac754218aa92 pygit2-0.21.3.tar.gz