From 17cbd47dd901b9482a613e2dd4174937c31eed61 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <55629213+LorenDB@users.noreply.github.com>
Date: Thu, 22 Dec 2022 14:24:28 -0500
Subject: [PATCH 01/16] Fix Markdown link in README

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ced7255f..7a00701b 100644
--- a/README.md
+++ b/README.md
@@ -133,8 +133,7 @@ under the `tests/fixtures/` subdirectory.
 ### gbp
 The `obs_gbp` service can be used to create Debian source artefacts
 (.dsc, .orig.tar.gz and if non-native .debian.tar.gz or .diff.gz) from
-Git repositories, following the very popular [git-buildpackage workflow.]
-(https://honk.sigxcpu.org/piki/projects/git-buildpackage/)
+Git repositories, following the very popular [git-buildpackage workflow](https://honk.sigxcpu.org/piki/projects/git-buildpackage/).
 Requires git-buildpackage to be installed.
 
 ## Archive Formats

From 7bd6d476d1c327ed2888b8bf9dc4d830e0cb26a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 19 May 2023 14:10:06 +0200
Subject: [PATCH 02/16] avoid _scmsync.obsinfo files in global globbing

---
 TarSCM/tasks.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/TarSCM/tasks.py b/TarSCM/tasks.py
index cefff3a8..55fd7f36 100644
--- a/TarSCM/tasks.py
+++ b/TarSCM/tasks.py
@@ -115,8 +115,9 @@ def generate_list(self):
             files = glob.glob('*.obsinfo')
             if files:
                 for obsinfo in files:
-                    args.obsinfo = obsinfo
-                    self.task_list.append(copy.copy(args))
+                    if obsinfo != '_scmsync.obsinfo':
+                        args.obsinfo = obsinfo
+                        self.task_list.append(copy.copy(args))
             else:
                 # Fallback if there are no obsinfo files
                 self.task_list.append(args)

From a38e20874b4e6693ec8d3c0f3925efd084b0fab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 19 May 2023 14:40:32 +0200
Subject: [PATCH 03/16] 0.10.35 release

---
 dist/obs-service-tar_scm.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/obs-service-tar_scm.spec b/dist/obs-service-tar_scm.spec
index 1b065d57..0ca1d7b4 100644
--- a/dist/obs-service-tar_scm.spec
+++ b/dist/obs-service-tar_scm.spec
@@ -120,7 +120,7 @@ Recommends:     %{use_python}-keyrings.alt                      \
 %define pkg_name obs-service-tar_scm
 Name:           %{pkg_name}%{nsuffix}
 %define version_unconverted 0.10.18.1600256320.569e5be
-Version:        0.10.18.1600256320.569e5be
+Version:        0.10.35
 Release:        0
 Summary:        An OBS source service: create tar ball from svn/git/hg
 License:        GPL-2.0-or-later

From cf704bc3d3eaa7867c2ca6c029112c26b58294ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 19 May 2023 14:54:18 +0200
Subject: [PATCH 04/16] add git 3.10 and 3.11 to github test suite runs

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 046c1488..5ac51c16 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '2.7', '3.7', '3.8', '3.9' ]
+        python-version: [ '2.7', '3.7', '3.8', '3.9', '3.10', '3.11']
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

From 4675ebda78fe7fd5d82d71888790c73440a4c075 Mon Sep 17 00:00:00 2001
From: Frank Schreiner <schreiner@suse.de>
Date: Tue, 13 Jun 2023 11:10:08 +0200
Subject: [PATCH 05/16] updated KankuFile to Tumbleweed and removed python2
 tests

---
 KankuFile | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/KankuFile b/KankuFile
index c1956825..90c7ebfa 100644
--- a/KankuFile
+++ b/KankuFile
@@ -4,7 +4,7 @@ Kanku::Util::IPTables:
 
 
 domain_name: obs-service-tar_scm
-default_job: kanku-job
+default_job: tw
 login_user: root
 login_pass: kankudai
 
@@ -12,7 +12,7 @@ qemu:
   user: 
 
 jobs:
- kanku-job:
+ tw:
   -
     use_module: Kanku::Handler::SetJobContext
     options:
@@ -25,9 +25,9 @@ jobs:
       # https://build.opensuse.org/project/show/devel:kanku:immages
       # to find more official Images
       project: devel:kanku:images
-      repository: images_leap_15_3
-      package: openSUSE-Leap-15.3-JeOS
-      use_oscrc: 0
+      package: openSUSE-Tumbleweed-JeOS:ext4
+      repository: images_tumbleweed
+      arch: x86_64
   -
     use_module: Kanku::Handler::ImageDownload
     options:
@@ -47,7 +47,6 @@ jobs:
     options:
       commands:
         - zypper -n in git bzr mercurial subversion make tar
-        - zypper -n in python2-PyYAML python2-python-dateutil python2-mock python2-pylint python2-flake8
         - zypper -n in python3-PyYAML python3-python-dateutil python3-pylint python3-flake8
   -
     use_module: Kanku::Handler::ExecuteCommandViaSSH
@@ -56,5 +55,3 @@ jobs:
       commands:
         # test python3
         - make -C /tmp/kanku clean check3
-        # test python2
-        - make -C /tmp/kanku clean test2

From cd6645b4c3fe1150825a088fe3920e2a5cc8ff6a Mon Sep 17 00:00:00 2001
From: Frank Schreiner <schreiner@suse.de>
Date: Tue, 13 Jun 2023 11:10:39 +0200
Subject: [PATCH 06/16] fixed fixtures and new Exception class

* added GitError exceptions because of deprecation warnings for
  upcomming python versions
* set expiry date for gpg keys in git test fixtures to 30 years
---
 TarSCM/exceptions.py                          |   4 ++++
 TarSCM/scm/git.py                             |   3 ++-
 .../test_find_valid_commit/fixtures.tar       | Bin 501760 -> 552960 bytes
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/TarSCM/exceptions.py b/TarSCM/exceptions.py
index 4a8e946b..8442d343 100644
--- a/TarSCM/exceptions.py
+++ b/TarSCM/exceptions.py
@@ -1,2 +1,6 @@
 class OptionsError(BaseException):
     pass
+
+
+class GitError(BaseException):
+    pass
diff --git a/TarSCM/scm/git.py b/TarSCM/scm/git.py
index dba0ccfa..87bdfdb6 100644
--- a/TarSCM/scm/git.py
+++ b/TarSCM/scm/git.py
@@ -5,6 +5,7 @@
 import shutil
 
 from TarSCM.scm.base import Scm
+from TarSCM.exceptions import GitError
 
 
 def search_tags(comment, limit=None):
@@ -585,7 +586,7 @@ def get_parents(self, sha1):
         parents = result[1].rstrip().split(" ")
         fcm = parents.pop(0)
         if fcm != sha1:
-            raise Exception("First commit %s no equal sha1 %s" % (fcm, sha1))
+            raise GitError("First commit %s no equal sha1 %s" % (fcm, sha1))
         if parents:
             return parents
         return []
diff --git a/tests/fixtures/GitTests/test_find_valid_commit/fixtures.tar b/tests/fixtures/GitTests/test_find_valid_commit/fixtures.tar
index 621b1bd7d62f52aadfedb402cf0ac11c9c0ea742..d711ab9c8259b5c37245d6bce276d973e71ee722 100644
GIT binary patch
delta 42875
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

delta 40934
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
U?x;*$oO@jR+yDRDa}H_$4*-yfu>b%7


From ab8f822da0ed8876fe2d72c8a76373ed8eb49e66 Mon Sep 17 00:00:00 2001
From: Frank Schreiner <schreiner@suse.de>
Date: Tue, 13 Jun 2023 11:38:58 +0200
Subject: [PATCH 07/16] removed unittest2 from BuildRequires in spec

---
 dist/obs-service-tar_scm.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dist/obs-service-tar_scm.spec b/dist/obs-service-tar_scm.spec
index 0ca1d7b4..80c6d05e 100644
--- a/dist/obs-service-tar_scm.spec
+++ b/dist/obs-service-tar_scm.spec
@@ -138,7 +138,6 @@ BuildRequires:  %{pkg_name} = %{version}
 BuildRequires:  %{use_python}-keyring
 BuildRequires:  %{use_python}-keyrings.alt
 BuildRequires:  %{use_python}-six
-BuildRequires:  %{use_python}-unittest2
 BuildRequires:  bzr
 BuildRequires:  git-core
 BuildRequires:  mercurial

From c0e7760d31005a7d5b62546e358e43cc662e1a85 Mon Sep 17 00:00:00 2001
From: Frank Schreiner <schreiner@suse.de>
Date: Tue, 13 Jun 2023 12:01:06 +0200
Subject: [PATCH 08/16] disabled pylint 'no-member' because of false positives
 in py311

---
 .pylintrc      | 2 +-
 .pylinttestsrc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 740cdc01..4fe13a90 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -93,7 +93,7 @@ confidence=
 # * E0015 - unrecognized-option
 
 
-disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,consider-using-with,consider-using-f-string,duplicate-code,R0022,W0012,E0012,E0015
+disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,consider-using-with,consider-using-f-string,duplicate-code,R0022,W0012,E0012,E0015,no-member
 
 
 [REPORTS]
diff --git a/.pylinttestsrc b/.pylinttestsrc
index 946686d5..84d315ad 100644
--- a/.pylinttestsrc
+++ b/.pylinttestsrc
@@ -92,7 +92,7 @@ confidence=
 # * W0012 - unknown-option-value
 # * E0015 - unrecognized-option
 
-disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,duplicate-code,too-many-public-methods,protected-access,too-many-locals,consider-using-with,consider-using-f-string,super-with-arguments,E0012,R0022,W0012,E0015
+disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,duplicate-code,too-many-public-methods,protected-access,too-many-locals,consider-using-with,consider-using-f-string,super-with-arguments,E0012,R0022,W0012,E0015,no-member
 
 
 [REPORTS]

From a0669d629bc8d38b092d0446adc35aec183fb3d4 Mon Sep 17 00:00:00 2001
From: Frank Schreiner <schreiner@suse.de>
Date: Tue, 13 Jun 2023 15:39:11 +0200
Subject: [PATCH 09/16] updated debian files

---
 debian/changelog |  5 +++++
 dist/debian.dsc  | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 dist/debian.dsc

diff --git a/debian/changelog b/debian/changelog
index faa4ebbd..e2a279f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,8 @@
+obs-service-tar-scm (0.10.37) unstable; urgency=medium
+
+  [ Frank Schreiner]
+  * update to version 0.10.37
+
 obs-service-tar-scm (0.10.14) unstable; urgency=medium
 
   [ Roman Neuhauser ]
diff --git a/dist/debian.dsc b/dist/debian.dsc
new file mode 100644
index 00000000..d876c10e
--- /dev/null
+++ b/dist/debian.dsc
@@ -0,0 +1,19 @@
+Format: 1.0
+Source: obs-service-tar-scm
+Version: 0.10.36
+Provides: obs-service-obs_scm, obs-service-tar
+Binary: obs-service-tar_scm
+Maintainer: Adrian Schroeter <adrian@suse.de>
+Architecture: all
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 8.0.0), python3, python3-dateutil, dh-python, python3-yaml
+
+Package: obs-service-tar-scm
+Architecture: all
+Provides: obs-service-obs-scm, obs-service-tar
+Depends: ${misc:Depends}, ${python3:Depends}, bzr, git, subversion, cpio, python3-dateutil, python3-yaml
+Recommends: mercurial
+Description: An OBS source service: fetches SCM tarballs
+ This is a source service for openSUSE Build Service.
+ It supports downloading from svn, git, hg and bzr repositories.
+

From 590fb273171a019e935aff57a97ff89f7d2b56c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dirk=20M=C3=BCller?= <dirk@dmllr.de>
Date: Wed, 5 Jul 2023 14:09:34 +0200
Subject: [PATCH 10/16] FD leak / flake8 / py311 fixes

Also delete leftover travis.yml
---
 .travis.yml       | 15 ---------------
 tests/gittests.py | 47 ++++++++++++++++++++++++-----------------------
 2 files changed, 24 insertions(+), 38 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 48d00cfe..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-language: python
-python:
-  - "2.7"
-  - "3.6"
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq bzr git subversion tar
-  - sudo locale-gen en_US.UTF-8
-install:
-  - pip install -r requirements.txt
-  - mkdir bin
-  - ln -s /usr/bin/true bin/obs-service-download_files # we don't test other services here
-  - export PATH="$PWD/bin:$PATH"
-  - export TAR_SCM_TC=UnitTestCases,TasksTestCases,SCMBaseTestCases,GitTests,SvnTests,TarTestCases
-script: PV=${TRAVIS_PYTHON_VERSION:0:1};echo $PV;make check$PV
diff --git a/tests/gittests.py b/tests/gittests.py
index 8c23c7ca..bc456d31 100644
--- a/tests/gittests.py
+++ b/tests/gittests.py
@@ -155,10 +155,10 @@ def test_submodule_update(self):
                          '--version', 'tag3')
         tar_path = os.path.join(self.outdir,
                                 self.basename(version='tag3') + '.tar')
-        tar = tarfile.open(tar_path)
-        submod_path = os.path.join(self.basename(version='tag3'),
-                                   submod_name, 'a')
-        self.assertTarMemberContains(tar, submod_path, '5')
+        with tarfile.open(tar_path) as tar:
+            submod_path = os.path.join(
+                self.basename(version='tag3'), submod_name, 'a')
+            self.assertTarMemberContains(tar, submod_path, '5')
 
     def test_submodule_disabled_update(self):
         submod_name = 'submod1'
@@ -169,9 +169,9 @@ def test_submodule_disabled_update(self):
                          '--version', 'tag3')
         tar_path = os.path.join(self.outdir,
                                 self.basename(version='tag3') + '.tar')
-        tar = tarfile.open(tar_path)
-        self.assertRaises(KeyError, tar.getmember, os.path.join(
-            self.basename(version='tag3'), submod_name, 'a'))
+        with tarfile.open(tar_path) as tar:
+            self.assertRaises(KeyError, tar.getmember, os.path.join(
+                self.basename(version='tag3'), submod_name, 'a'))
 
     def test_submodule_in_other_branch(self):
         submod_name = 'submod1'
@@ -185,10 +185,10 @@ def test_submodule_in_other_branch(self):
                          '--version', rev)
         tar_path = os.path.join(self.outdir,
                                 self.basename(version=rev) + '.tar')
-        tar = tarfile.open(tar_path)
-        submod_path = os.path.join(self.basename(version=rev),
-                                   submod_name, 'a')
-        self.assertTarMemberContains(tar, submod_path, '3')
+        with tarfile.open(tar_path) as tar:
+            submod_path = os.path.join(self.basename(version=rev),
+                                       submod_name, 'a')
+            self.assertTarMemberContains(tar, submod_path, '3')
 
     def test_latest_submodule_in_other_branch(self):  # pylint: disable=C0103
         submod_name = 'submod1'
@@ -202,10 +202,10 @@ def test_latest_submodule_in_other_branch(self):  # pylint: disable=C0103
                          '--version', rev)
         tar_path = os.path.join(self.outdir,
                                 self.basename(version=rev) + '.tar')
-        tar = tarfile.open(tar_path)
-        submod_path = os.path.join(self.basename(version=rev),
-                                   submod_name, 'a')
-        self.assertTarMemberContains(tar, submod_path, '5')
+        with tarfile.open(tar_path) as tar:
+            submod_path = os.path.join(
+                self.basename(version=rev), submod_name, 'a')
+            self.assertTarMemberContains(tar, submod_path, '5')
 
     def _check_servicedata(self, expected_dirents=2, revision=2):
         expected_sha1 = self.sha1s('tag%d' % revision)
@@ -289,12 +289,12 @@ def test_gitlab_github_files(self):
                          'gitlab_hub', "--versionformat", "@PARENT_TAG@")
         tar_path = os.path.join(self.outdir,
                                 self.basename(version='gitlab_hub') + '.tar')
-        tar = tarfile.open(tar_path)
-        submod_path = os.path.join(self.basename(version='gitlab_hub'))
-        hub_path = os.path.join(submod_path, '.github/test')
-        lab_path = os.path.join(submod_path, '.gitlab/test')
-        self.assertTarMemberContains(tar, hub_path, '')
-        self.assertTarMemberContains(tar, lab_path, '')
+        with tarfile.open(tar_path) as tar:
+            submod_path = os.path.join(self.basename(version='gitlab_hub'))
+            hub_path = os.path.join(submod_path, '.github/test')
+            lab_path = os.path.join(submod_path, '.gitlab/test')
+            self.assertTarMemberContains(tar, hub_path, '')
+            self.assertTarMemberContains(tar, lab_path, '')
 
     def test_no_parent_tag(self):
         fix = self.fixtures
@@ -439,11 +439,12 @@ def test_find_valid_commit(self):
         tar_path = os.path.join(basedir, 'fixtures', cln, fnn, 'fixtures.tar')
         if not os.path.isfile(tar_path):
             raise AssertionError("File does not exist: %s" % tar_path)
-        basedir = os.path.abspath(os.path.join(os.getcwd(),'..'))
+        basedir = os.path.abspath(os.path.join(os.getcwd(), '..'))
         org_gnupghome = os.getenv('GNUPGHOME')
         os.environ["GNUPGHOME"] = os.path.join(basedir, '.gnupg')
         with tarfile.open(tar_path, "r") as tar:
             tar.extractall(basedir)
+            tar.close()
 
         # prepare test
         f_args  = FakeCli()
@@ -556,7 +557,7 @@ def test_find_valid_commit(self):
             rev = git.find_latest_signed_commit(case[0])
             self.assertEqual(rev, case[1])
 
-        empty=git.merge_is_empty('181fb87')
+        empty = git.merge_is_empty('181fb87')
         self.assertEqual(empty, 0)
 
         if org_gnupghome:

From dbfc64cf4075dd22073a5c9f2521132ce810b2c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dirk=20M=C3=BCller?= <dirk@dmllr.de>
Date: Wed, 5 Jul 2023 14:18:05 +0200
Subject: [PATCH 11/16] Python 2 is no longer supported by GitHub actions, stop
 testing it

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5ac51c16..9dd844bb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '2.7', '3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11']
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

From ce886908f2586834a3e8d123ea758ff332bd07c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dirk=20M=C3=BCller?= <dirk@dmllr.de>
Date: Wed, 5 Jul 2023 18:59:51 +0200
Subject: [PATCH 12/16] Add gpg as a dependency (needed for gpg validation)

---
 dist/obs-service-tar_scm.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist/obs-service-tar_scm.spec b/dist/obs-service-tar_scm.spec
index 80c6d05e..efe3dcdc 100644
--- a/dist/obs-service-tar_scm.spec
+++ b/dist/obs-service-tar_scm.spec
@@ -139,6 +139,7 @@ BuildRequires:  %{use_python}-keyring
 BuildRequires:  %{use_python}-keyrings.alt
 BuildRequires:  %{use_python}-six
 BuildRequires:  bzr
+BuildRequires:  gpg
 BuildRequires:  git-core
 BuildRequires:  mercurial
 BuildRequires:  subversion

From fcc67ed7542a8205b713dd7f60888baa9b3e4ee4 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
Date: Fri, 7 Jul 2023 14:29:44 +0200
Subject: [PATCH 13/16] Switch from ConfigParser.readfp to
 ConfigParser.read_string

That's what the code intents to do anyway.

Fixes #474
---
 TarSCM/config.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/TarSCM/config.py b/TarSCM/config.py
index 013e44f2..704cc605 100644
--- a/TarSCM/config.py
+++ b/TarSCM/config.py
@@ -66,11 +66,9 @@ def _init_config(self, fname):
 
         if self.fakeheader:
             logging.debug("Using fakeheader for file '%s'", fname)
-            tmp_fp = StringIO()
-            tmp_fp.write('[' + self.default_section + ']\n')
-            tmp_fp.write(open(fname, 'r').read())
-            tmp_fp.seek(0, os.SEEK_SET)
-            config.readfp(tmp_fp)
+            fake_header = '[' + self.default_section + ']\n'
+            config.read_string(fake_header + open(fname, 'r').read(),
+                               source=fname)
         else:
             config.read(fname)
 

From 95e306fa93709f17c82085c88118d4766e85047a Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
Date: Fri, 7 Jul 2023 14:30:16 +0200
Subject: [PATCH 14/16] Add Python 3.12 to GitHub Actions

Not released yet, but useful.
---
 .github/workflows/main.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9dd844bb..ed59fd84 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -39,9 +39,10 @@ jobs:
           locale
 
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
 
       - name: Install python dependencies
         run: pip install -r requirements.txt

From 2e20b290fae9a1100d6e671502674995317db21c Mon Sep 17 00:00:00 2001
From: Frank Schreiner <schreiner@suse.de>
Date: Tue, 18 Jul 2023 14:18:48 +0200
Subject: [PATCH 15/16] [dist] updated debian changelog

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e2a279f0..98778b78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
+obs-service-tar-scm (0.10.40) unstable; urgency=medium
+
+  * update to upstream version 0.10.40 
+
+ -- Frank Schreiner <fschreiner@suse.de>  Tue, 18 Jul 2023 14:08:09 +0200
+
 obs-service-tar-scm (0.10.37) unstable; urgency=medium
 
   [ Frank Schreiner]
   * update to version 0.10.37
 
+ -- Frank Schreiner <fschreiner@suse.de>  Tue, 13 Jun 2023 15:39:11 +0200
+
 obs-service-tar-scm (0.10.14) unstable; urgency=medium
 
   [ Roman Neuhauser ]

From e7c0883fcf4afb987947516640e0505a1d4bed1e Mon Sep 17 00:00:00 2001
From: Frank Schreiner <schreiner@suse.de>
Date: Thu, 20 Jul 2023 15:55:47 +0200
Subject: [PATCH 16/16] fix for python2

---
 TarSCM/config.py | 14 +++++++++++---
 debian/changelog |  6 ++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/TarSCM/config.py b/TarSCM/config.py
index 704cc605..92891d82 100644
--- a/TarSCM/config.py
+++ b/TarSCM/config.py
@@ -66,9 +66,17 @@ def _init_config(self, fname):
 
         if self.fakeheader:
             logging.debug("Using fakeheader for file '%s'", fname)
-            fake_header = '[' + self.default_section + ']\n'
-            config.read_string(fake_header + open(fname, 'r').read(),
-                               source=fname)
+            try:
+                fake_header = '[' + self.default_section + ']\n'
+                config.read_string(fake_header + open(fname, 'r').read(),
+                                   source=fname)
+            except AttributeError:
+                tmp_fp = StringIO()
+                tmp_fp.write('[' + self.default_section + ']\n')
+                tmp_fp.write(open(fname, 'r').read())
+                tmp_fp.seek(0, os.SEEK_SET)
+                config.readfp(tmp_fp)
+
         else:
             config.read(fname)
 
diff --git a/debian/changelog b/debian/changelog
index 98778b78..73ff774b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+obs-service-tar-scm (0.10.41) unstable; urgency=medium
+
+  * update to upstream version 0.10.41 
+
+ -- Frank Schreiner <fschreiner@suse.de>  Thu, 20 Jul 2023 15:55:12 +0200
+
 obs-service-tar-scm (0.10.40) unstable; urgency=medium
 
   * update to upstream version 0.10.40