Merge branch 'epel8-playground' into epel8

.gitignore

@@ -6,3 +6,4 @@
 /vcstool-0.2.4.tar.gz
 /vcstool-0.2.7.tar.gz
 /vcstool-0.2.8.tar.gz
+/vcstool-0.2.9.tar.gz

python-vcstool-0.2.8-old-git-syntax.patch

@@ -1,61 +0,0 @@
-From 247a7480aaa4b0d71289855f8fd8e1ae566b092b Mon Sep 17 00:00:00 2001
-From: Scott K Logan <logans@cottsay.net>
-Date: Sun, 10 May 2020 02:24:12 -0700
-Subject: [PATCH] Make tests compatible with git back to 1.8.3.1
-
----
- test/test_commands.py | 26 ++++++++++++++++++++++++--
- 1 file changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/test/test_commands.py b/test/test_commands.py
-index 6374b3d..eff1b82 100644
---- a/test/test_commands.py
-+++ b/test/test_commands.py
-@@ -92,7 +92,11 @@ def test_pull(self):
-         with self.assertRaises(subprocess.CalledProcessError) as e:
-             run_command('pull', args=['--workers', '1'])
-         expected = get_expected_output('pull')
--        self.assertEqual(e.exception.output, expected)
-+        # replace message from older git versions
-+        output = e.exception.output.replace(
-+            b'anch. Please specify which\nbranch you want to merge with. See',
-+            b'anch.\nPlease specify which branch you want to merge with.\nSee')
-+        self.assertEqual(output, expected)
- 
-     def test_pull_api(self):
-         try:
-@@ -131,8 +135,12 @@ def test_pull_api(self):
-             os.chdir(cwd_bck)
- 
-         assert rc == 1
-+        # replace message from older git versions
-+        output = stdout_stderr.getvalue().replace(
-+            'anch. Please specify which\nbranch you want to merge with. See',
-+            'anch.\nPlease specify which branch you want to merge with.\nSee')
-         expected = get_expected_output('pull').decode()
--        assert stdout_stderr.getvalue() == expected
-+        assert output == expected
- 
-     def test_reimport(self):
-         cwd_vcstool = os.path.join(TEST_WORKSPACE, 'vcstool')
-@@ -261,6 +269,20 @@ def run_command(command, args=None, subfolder=None):
-         [sys.executable, script] + (args or []),
-         stderr=subprocess.STDOUT, cwd=cwd, env=env)
-     # replace message from older git versions
-+    output = output.replace(
-+        b'git checkout -b new_branch_name',
-+        b'git checkout -b <new-branch-name>')
-+    output = output.replace(
-+        b'(detached from ', b'(HEAD detached at ')
-+    output = output.replace(
-+        b"ady on 'master'\n=",
-+        b"ady on 'master'\nYour branch is up-to-date with 'origin/master'.\n=")
-+    output = output.replace(
-+        b'# HEAD detached at ',
-+        b'HEAD detached at ')
-+    output = output.replace(
-+        b'# On branch master',
-+        b"On branch master\nYour branch is up-to-date with 'origin/master'.\n")
-     # the following seems to have changed between git 2.17.1 and 2.25.1
-     output = output.replace(
-         b"Note: checking out '", b"Note: switching to '")

python-vcstool.spec

@@ -4,7 +4,7 @@
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.8
+Version:        0.2.9
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -12,9 +12,6 @@ License:        ASL 2.0
 URL:            https://github.com/dirk-thomas/%{srcname}
 Source0:        https://github.com/dirk-thomas/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
-# Submitted upstream as dirk-thomas/vcstool#138
-Patch0:         %{name}-0.2.8-old-git-syntax.patch
-
 BuildArch:      noarch
 
 %description
@@ -209,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 
 %changelog
+* Fri May 29 2020 Scott K Logan <logans@cottsay.net> - 0.2.9-1
+- Update to 0.2.9 (rhbz#1838404)
+
 * Sun May 10 2020 Scott K Logan <logans@cottsay.net> - 0.2.8-1
 - Update to 0.2.8 (rhbz#1833742)
 

sources

@@ -1 +1 @@
-SHA512 (vcstool-0.2.8.tar.gz) = 251acbfe6122206b0ececb5306b963eec9089c20aac39da8ff0ab7f5b0512d56a153636731f376014912df9d06126392bac9a0fcdaa992938e83e270991afa3f
+SHA512 (vcstool-0.2.9.tar.gz) = d243360402d695385d36a3a325075a9524f4f771e84a0c013d39e08d25c4114740a4c6135a395771e795ec5fc23118422afd305159841c4dedfe4b50ddad1aa4