diff --git a/GitPython-2.1.11.1531661757.92a4819.tar.xz b/GitPython-2.1.11.1531661757.92a4819.tar.xz deleted file mode 100644 index ee42dc2..0000000 --- a/GitPython-2.1.11.1531661757.92a4819.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16131a0c8a9624f58288c2a09cba7b9ad467c884b536d15172cf38ff04416859 -size 10173064 diff --git a/GitPython-3.0.2.1566444429.0765792.tar.xz b/GitPython-3.0.2.1566444429.0765792.tar.xz new file mode 100644 index 0000000..462954d --- /dev/null +++ b/GitPython-3.0.2.1566444429.0765792.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7cd30941ae703493a99bc8d8ec0f5ad5b50aab47899a2ba256a629bc6a0e573 +size 10336088 diff --git a/_service b/_service index 0172ee6..2855094 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ - 2.1.11 + 3.0.2 git://github.com/gitpython-developers/GitPython git yes enable enable - refs/tags/2.1.11 + refs/tags/3.0.2 xz diff --git a/merged_pr_793.patch b/merged_pr_793.patch deleted file mode 100644 index 474b5a5..0000000 --- a/merged_pr_793.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -ur GitPython-2.1.11-orig/git/objects/submodule/base.py GitPython-2.1.11/git/objects/submodule/base.py ---- GitPython-2.1.11-orig/git/objects/submodule/base.py 2019-03-13 17:12:27.055299102 +0700 -+++ GitPython-2.1.11/git/objects/submodule/base.py 2019-03-13 17:14:33.840773626 +0700 -@@ -1160,7 +1160,7 @@ - try: - parser = cls._config_parser(repo, pc, read_only=True) - except IOError: -- raise StopIteration -+ return - # END handle empty iterator - - rt = pc.tree # root tree -diff -ur GitPython-2.1.11-orig/git/repo/base.py GitPython-2.1.11/git/repo/base.py ---- GitPython-2.1.11-orig/git/repo/base.py 2019-03-13 17:12:29.187300315 +0700 -+++ GitPython-2.1.11/git/repo/base.py 2019-03-13 17:14:33.884774474 +0700 -@@ -714,7 +714,10 @@ - - stream = (line for line in data.split(b'\n') if line) - while True: -- line = next(stream) # when exhausted, causes a StopIteration, terminating this function -+ try: -+ line = next(stream) # when exhausted, causes a StopIteration, terminating this function -+ except StopIteration: -+ return - hexsha, orig_lineno, lineno, num_lines = line.split() - lineno = int(lineno) - num_lines = int(num_lines) -@@ -724,7 +727,10 @@ - # for this commit - props = {} - while True: -- line = next(stream) -+ try: -+ line = next(stream) -+ except StopIteration: -+ return - if line == b'boundary': - # "boundary" indicates a root commit and occurs - # instead of the "previous" tag -@@ -749,7 +755,10 @@ - # Discard all lines until we find "filename" which is - # guaranteed to be the last line - while True: -- line = next(stream) # will fail if we reach the EOF unexpectedly -+ try: -+ line = next(stream) # will fail if we reach the EOF unexpectedly -+ except StopIteration: -+ return - tag, value = line.split(b' ', 1) - if tag == b'filename': - orig_filename = value diff --git a/python-GitPython.changes b/python-GitPython.changes index 57f49f6..4725a0d 100644 --- a/python-GitPython.changes +++ b/python-GitPython.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Sep 24 09:03:41 UTC 2019 - tchvatal@suse.com + +- Update to version 3.0.2.1566444429.0765792: + * prepare next release + * BF: remove ddt from requirements.txt since no ddt required at run time. + * Bump version to 3.0.1 + * Remove dependency on 'gitdb'; fixes #908 + * Changelog information + * Adding test + * Returning commit object instead of hash value + * Snack case as requested in #903 + * Method stating which commit is being played during an halted rebase + * Fix performance regression, see #906 +- Drop merged patch merged_pr_793.patch +- Rebase patch test-skips.patch + ------------------------------------------------------------------- Fri Mar 15 13:52:47 UTC 2019 - tchvatal@suse.com diff --git a/python-GitPython.spec b/python-GitPython.spec index fc61cbd..826e8d8 100644 --- a/python-GitPython.spec +++ b/python-GitPython.spec @@ -17,8 +17,9 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-GitPython -Version: 2.1.11.1531661757.92a4819 +Version: 3.0.2.1566444429.0765792 Release: 0 Summary: Python Git Library License: BSD-3-Clause @@ -26,9 +27,7 @@ Group: Development/Languages/Python URL: https://github.com/gitpython-developers/GitPython Source: GitPython-%{version}.tar.xz Patch0: test-skips.patch -# Subset and rebase of merged https://github.com/gitpython-developers/GitPython/pull/793 -Patch1: merged_pr_793.patch -Patch2: test_blocking_lock_file-extra-time.patch +Patch1: test_blocking_lock_file-extra-time.patch BuildRequires: %{python_module ddt >= 1.1.1} BuildRequires: %{python_module gitdb2 >= 2.0.0} BuildRequires: %{python_module nose} @@ -58,6 +57,8 @@ are 'cgit' and pure python, which is the default. %setup -q -n GitPython-%{version} echo y | ./init-tests-after-clone.sh %autopatch -p1 +# do not pull in extra deps +sed -i -e '/tox/d' -e '/flake8/d' -e '/coverage/d' test-requirements.txt %build %python_build diff --git a/test-skips.patch b/test-skips.patch index 3f65350..a64c264 100644 --- a/test-skips.patch +++ b/test-skips.patch @@ -1,7 +1,8 @@ -diff -u GitPython-2.1.11-orig/git/test/test_base.py GitPython-2.1.11/git/test/test_base.py ---- GitPython-2.1.11-orig/git/test/test_base.py 2019-03-13 15:54:50.126688903 +0700 -+++ GitPython-2.1.11/git/test/test_base.py 2019-03-13 16:11:54.287675238 +0700 -@@ -112,7 +112,7 @@ +Index: GitPython-3.0.2.1566444429.0765792/git/test/test_base.py +=================================================================== +--- GitPython-3.0.2.1566444429.0765792.orig/git/test/test_base.py ++++ GitPython-3.0.2.1566444429.0765792/git/test/test_base.py +@@ -112,7 +112,7 @@ class TestBase(TestBase): assert not rw_repo.config_reader("repository").getboolean("core", "bare") assert osp.isdir(osp.join(rw_repo.working_tree_dir, 'lib')) @@ -10,9 +11,10 @@ diff -u GitPython-2.1.11-orig/git/test/test_base.py GitPython-2.1.11/git/test/te @with_rw_and_rw_remote_repo('0.1.6') def test_with_rw_remote_and_rw_repo(self, rw_repo, rw_remote_repo): assert not rw_repo.config_reader("repository").getboolean("core", "bare") -diff -u GitPython-2.1.11-orig/git/test/test_remote.py GitPython-2.1.11/git/test/test_remote.py ---- GitPython-2.1.11-orig/git/test/test_remote.py 2019-03-13 15:54:50.242689909 +0700 -+++ GitPython-2.1.11/git/test/test_remote.py 2019-03-13 16:23:59.918147844 +0700 +Index: GitPython-3.0.2.1566444429.0765792/git/test/test_remote.py +=================================================================== +--- GitPython-3.0.2.1566444429.0765792.orig/git/test/test_remote.py ++++ GitPython-3.0.2.1566444429.0765792/git/test/test_remote.py @@ -4,6 +4,7 @@ # This module is part of GitPython and is released under # the BSD License: http://www.opensource.org/licenses/bsd-license.php @@ -21,7 +23,7 @@ diff -u GitPython-2.1.11-orig/git/test/test_remote.py GitPython-2.1.11/git/test/ import random import tempfile from unittest import skipIf -@@ -397,7 +398,7 @@ +@@ -403,7 +404,7 @@ class TestRemote(TestBase): TagReference.delete(rw_repo, new_tag, other_tag) remote.push(":%s" % other_tag.path) @@ -30,11 +32,11 @@ diff -u GitPython-2.1.11-orig/git/test/test_remote.py GitPython-2.1.11/git/test/ @with_rw_and_rw_remote_repo('0.1.6') def test_base(self, rw_repo, remote_repo): num_remotes = 0 -@@ -630,6 +631,7 @@ +@@ -636,6 +637,7 @@ class TestRemote(TestBase): # will raise fatal: Will not delete all non-push URLs assert_raises(GitCommandError, remote.delete_url, test3) + @skipIf(os.environ.get('SKIP_GITHUB', 'false') == 'true', 'GitHub connection error') def test_fetch_error(self): rem = self.rorepo.remote('origin') - with self.assertRaisesRegex(GitCommandError, "Couldn't find remote ref __BAD_REF__"): + with self.assertRaisesRegex(GitCommandError, "[Cc]ouldn't find remote ref __BAD_REF__"):