From 78a8984c324cb0b2db352b74281924595ea5d74b3b79c23ddb8ed8f4a3d46f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 20 Aug 2020 10:54:23 +0000 Subject: [PATCH] - Update to version 2.1.7.1594621338.176838a3: - refresed test-skips.patch and test_blocking_lock_file-extra-time.patch - used pytest as test runner * bump patch level * Fixed broken file paths. * bump patch level * test: add installation test * tools: update tool scripts after moving tests * MANIFEST.in: update to exclude tests * setup.py: exclude all test files * tests: move to root dir * bump patch level * Revert moving tests out of 'git' folder, related to #1030 * bump patch level * tools: update tool scripts after moving tests * MANIFEST.in: update to exclude tests * setup.py: exclude all test files * tests: move to root dir * Add Ram Rachum to AUTHORS * Fix exception causes all over the codebase * Fix exception causes in 7 modules * Fix exception causes in cmd.py OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-GitPython?expand=0&rev=39 --- GitPython-3.1.3.1590895281.24cd6da.tar.xz | 3 --- GitPython-3.1.7.1594621338.176838a3.tar.xz | 3 +++ _service | 4 ++-- _servicedata | 2 +- python-GitPython.changes | 26 ++++++++++++++++++++++ python-GitPython.spec | 6 ++--- test-skips.patch | 18 +++++++-------- test_blocking_lock_file-extra-time.patch | 6 ++--- 8 files changed, 47 insertions(+), 21 deletions(-) delete mode 100644 GitPython-3.1.3.1590895281.24cd6da.tar.xz create mode 100644 GitPython-3.1.7.1594621338.176838a3.tar.xz diff --git a/GitPython-3.1.3.1590895281.24cd6da.tar.xz b/GitPython-3.1.3.1590895281.24cd6da.tar.xz deleted file mode 100644 index 56b3dc8..0000000 --- a/GitPython-3.1.3.1590895281.24cd6da.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c74a945e293046b9d77dbdc4f5390354bd015d5310c02f351375e08c253ce15b -size 10858384 diff --git a/GitPython-3.1.7.1594621338.176838a3.tar.xz b/GitPython-3.1.7.1594621338.176838a3.tar.xz new file mode 100644 index 0000000..e3f2379 --- /dev/null +++ b/GitPython-3.1.7.1594621338.176838a3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16a7372fe6d96f9f6ee3fb2f1e6fa7c724baed3a21c50bdb8c3261a29626181f +size 10997856 diff --git a/_service b/_service index 063ef6d..5abf9a6 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ - 3.1.3 + 3.1.7 git://github.com/gitpython-developers/GitPython git yes enable enable - refs/tags/3.1.3 + refs/tags/3.1.7 xz diff --git a/_servicedata b/_servicedata index fa93c4d..f08c2e7 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/gitpython-developers/GitPython - 24cd6dafc0008f155271f9462ae6ba6f0c0127a4 \ No newline at end of file + 176838a364fa36613cd57488c352f56352be3139 \ No newline at end of file diff --git a/python-GitPython.changes b/python-GitPython.changes index c3a3b60..964e1d2 100644 --- a/python-GitPython.changes +++ b/python-GitPython.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Aug 20 10:32:30 UTC 2020 - mimi.vx@gmail.com + +- Update to version 3.1.7.1594621338.176838a3: +- refresed test-skips.patch and test_blocking_lock_file-extra-time.patch +- used pytest as test runner + * bump patch level + * Fixed broken file paths. + * bump patch level + * test: add installation test + * tools: update tool scripts after moving tests + * MANIFEST.in: update to exclude tests + * setup.py: exclude all test files + * tests: move to root dir + * bump patch level + * Revert moving tests out of 'git' folder, related to #1030 + * bump patch level + * tools: update tool scripts after moving tests + * MANIFEST.in: update to exclude tests + * setup.py: exclude all test files + * tests: move to root dir + * Add Ram Rachum to AUTHORS + * Fix exception causes all over the codebase + * Fix exception causes in 7 modules + * Fix exception causes in cmd.py + ------------------------------------------------------------------- Sun Jun 14 08:43:10 UTC 2020 - dmueller@suse.com diff --git a/python-GitPython.spec b/python-GitPython.spec index 93d5c78..49eddef 100644 --- a/python-GitPython.spec +++ b/python-GitPython.spec @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-GitPython -Version: 3.1.3.1590895281.24cd6da +Version: 3.1.7.1594621338.176838a3 Release: 0 Summary: Python Git Library License: BSD-3-Clause @@ -29,6 +29,7 @@ Patch0: test-skips.patch Patch1: test_blocking_lock_file-extra-time.patch BuildRequires: %{python_module ddt >= 1.1.1} BuildRequires: %{python_module gitdb >= 4.0.1} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module smmap >= 3.0.1} BuildRequires: fdupes @@ -62,7 +63,6 @@ sed -i -e '/tox/d' -e '/flake8/d' -e '/coverage/d' test-requirements.txt %install %python_install -%python_expand rm -r %{buildroot}%{$python_sitelib}/git/test/ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -78,7 +78,7 @@ export GIT_PYTHON_TEST_GIT_REPO_BASE=${PWD} git config --global user.email "you@example.com" git config --global user.name "Your Name" -%python_exec setup.py test --test-suite=git.test +%pytest -k 'not test_installation' test %files %{python_files} %license LICENSE diff --git a/test-skips.patch b/test-skips.patch index 452fa54..1dd51fe 100644 --- a/test-skips.patch +++ b/test-skips.patch @@ -1,7 +1,7 @@ -Index: GitPython-3.1.0.1582544583.8c9da73/git/test/test_base.py +Index: GitPython-3.1.7.1594621338.176838a3/test/test_base.py =================================================================== ---- GitPython-3.1.0.1582544583.8c9da73.orig/git/test/test_base.py -+++ GitPython-3.1.0.1582544583.8c9da73/git/test/test_base.py +--- GitPython-3.1.7.1594621338.176838a3.orig/test/test_base.py ++++ GitPython-3.1.7.1594621338.176838a3/test/test_base.py @@ -111,7 +111,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')) @@ -11,10 +11,10 @@ Index: GitPython-3.1.0.1582544583.8c9da73/git/test/test_base.py @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") -Index: GitPython-3.1.0.1582544583.8c9da73/git/test/test_remote.py +Index: GitPython-3.1.7.1594621338.176838a3/test/test_remote.py =================================================================== ---- GitPython-3.1.0.1582544583.8c9da73.orig/git/test/test_remote.py -+++ GitPython-3.1.0.1582544583.8c9da73/git/test/test_remote.py +--- GitPython-3.1.7.1594621338.176838a3.orig/test/test_remote.py ++++ GitPython-3.1.7.1594621338.176838a3/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 @@ -40,10 +40,10 @@ Index: GitPython-3.1.0.1582544583.8c9da73/git/test/test_remote.py def test_fetch_error(self): rem = self.rorepo.remote('origin') with self.assertRaisesRegex(GitCommandError, "[Cc]ouldn't find remote ref __BAD_REF__"): -Index: GitPython-3.1.0.1582544583.8c9da73/git/test/test_submodule.py +Index: GitPython-3.1.7.1594621338.176838a3/test/test_submodule.py =================================================================== ---- GitPython-3.1.0.1582544583.8c9da73.orig/git/test/test_submodule.py -+++ GitPython-3.1.0.1582544583.8c9da73/git/test/test_submodule.py +--- GitPython-3.1.7.1594621338.176838a3.orig/test/test_submodule.py ++++ GitPython-3.1.7.1594621338.176838a3/test/test_submodule.py @@ -420,12 +420,13 @@ class TestSubmodule(TestBase): def test_base_bare(self, rwrepo): self._do_base_tests(rwrepo) diff --git a/test_blocking_lock_file-extra-time.patch b/test_blocking_lock_file-extra-time.patch index 5051803..96dc00b 100644 --- a/test_blocking_lock_file-extra-time.patch +++ b/test_blocking_lock_file-extra-time.patch @@ -1,7 +1,7 @@ -Index: GitPython-3.1.0.1582544583.8c9da73/git/test/test_util.py +Index: GitPython-3.1.7.1594621338.176838a3/test/test_util.py =================================================================== ---- GitPython-3.1.0.1582544583.8c9da73.orig/git/test/test_util.py -+++ GitPython-3.1.0.1582544583.8c9da73/git/test/test_util.py +--- GitPython-3.1.7.1594621338.176838a3.orig/test/test_util.py ++++ GitPython-3.1.7.1594621338.176838a3/test/test_util.py @@ -165,9 +165,7 @@ class TestUtils(TestBase): self.assertRaises(IOError, wait_lock._obtain_lock) elapsed = time.time() - start