Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package obs-service-tar_scm for 
openSUSE:Factory checked in at 2023-07-06 18:28:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old)
 and      /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.23466 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "obs-service-tar_scm"

Thu Jul  6 18:28:30 2023 rev:76 rq:1096990 version:0.10.39

Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes  
2023-05-21 19:08:32.918380390 +0200
+++ 
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.23466/obs-service-tar_scm.changes
       2023-07-06 18:28:35.127113538 +0200
@@ -1,0 +2,18 @@
+Wed Jul 05 17:01:56 UTC 2023 - dmuel...@suse.com
+
+- Update to version 0.10.39:
+  * Add gpg as a dependency (needed for gpg validation)
+
+-------------------------------------------------------------------
+Wed Jul 05 12:33:14 UTC 2023 - dmuel...@suse.com
+
+- Update to version 0.10.38:
+  * Python 2 is no longer supported by GitHub actions, stop testing it
+  * FD leak / flake8 / py311 fixes
+  * updated debian files
+  * disabled pylint 'no-member' because of false positives in py311
+  * removed unittest2 from BuildRequires in spec
+  * fixed fixtures and new Exception class
+  * updated KankuFile to Tumbleweed and removed python2 tests
+
+-------------------------------------------------------------------

Old:
----
  obs-service-tar_scm-0.10.36.tar.gz

New:
----
  obs-service-tar_scm-0.10.39.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.WRRtW4/_old  2023-07-06 18:28:35.751117369 +0200
+++ /var/tmp/diff_new_pack.WRRtW4/_new  2023-07-06 18:28:35.759117418 +0200
@@ -119,8 +119,8 @@
 
 %define pkg_name obs-service-tar_scm
 Name:           %{pkg_name}%{nsuffix}
-%define version_unconverted 0.10.36
-Version:        0.10.36
+%define version_unconverted 0.10.39
+Version:        0.10.39
 Release:        0
 Summary:        An OBS source service: create tar ball from svn/git/hg
 License:        GPL-2.0-or-later
@@ -138,9 +138,9 @@
 BuildRequires:  %{use_python}-keyring
 BuildRequires:  %{use_python}-keyrings.alt
 BuildRequires:  %{use_python}-six
-BuildRequires:  %{use_python}-unittest2
 BuildRequires:  bzr
 BuildRequires:  git-core
+BuildRequires:  gpg
 BuildRequires:  mercurial
 BuildRequires:  subversion
 %if !%{with python3}

++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.WRRtW4/_old  2023-07-06 18:28:35.795117640 +0200
+++ /var/tmp/diff_new_pack.WRRtW4/_new  2023-07-06 18:28:35.799117664 +0200
@@ -1,5 +1,5 @@
 pkgname=obs-service-tar_scm
-pkgver=0.10.36
+pkgver=0.10.39
 pkgrel=0
 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)"
 arch=('any')


++++++ _service ++++++
--- /var/tmp/diff_new_pack.WRRtW4/_old  2023-07-06 18:28:35.831117860 +0200
+++ /var/tmp/diff_new_pack.WRRtW4/_new  2023-07-06 18:28:35.835117885 +0200
@@ -3,15 +3,13 @@
     <param 
name="url">https://github.com/openSUSE/obs-service-tar_scm.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="version">0.10.36</param>
     <param name="changesgenerate">enable</param>
+    <param name="revision">master</param>
+    <param name="versionformat">@PARENT_TAG@</param>
     <param name="extract">dist/obs-service-tar_scm.spec</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">0.10.36</param>
-<!--
+    <param name="extract">dist/debian.dsc</param>
     <param name="latest-signed-tag">true</param>
     <param name="maintainers-asc">_maintainers</param>
--->
   </service>
   <service name="set_version" mode="disabled">
     <param name="basename">obs-service-tar_scm</param>

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.WRRtW4/_old  2023-07-06 18:28:35.855118007 +0200
+++ /var/tmp/diff_new_pack.WRRtW4/_new  2023-07-06 18:28:35.859118033 +0200
@@ -2,17 +2,18 @@
 <service name="tar_scm">
             <param 
name="url">git://github.com/adrianschroeter/obs-service-tar_scm.git</param>
           <param 
name="changesrevision">d44d677cf006d48b261f5e2054ba2126bed64ae1</param></service>
-<service name="tar_scm">
-            <param 
name="url">git://github.com/M0ses/obs-service-tar_scm.git</param>
-          <param 
name="changesrevision">9e8b88b088778c44db56781e6a908a0e82e27cf2</param></service>
-<service name="tar_scm">
-                <param 
name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
-              <param 
name="changesrevision">85bfc3fabb06212b49a389afb3310bfbf2996913</param></service><service
 name="tar_scm">
-                <param 
name="url">https://github.com/openSUSE/obs-service-tar_scm.git</param>
-              <param name="changesrevision">gpg: Signature made Fri 19 May 
2023 02:54:32 PM CEST
-gpg:                using RSA key D50175CE6FE935BBF28602C5918D8C954C08DB67
-gpg: Good signature from "Adrian Schroeter (OBS Project Manager) 
&lt;adr...@suse.de&gt;" [ultimate]
-Primary key fingerprint: D501 75CE 6FE9 35BB F286  02C5 918D 8C95 4C08 DB67
-cf704bc3d3eaa7867c2ca6c029112c26b58294ef</param></service></servicedata>
+  <service name="tar_scm">
+    <param name="url">git://github.com/M0ses/obs-service-tar_scm.git</param>
+    <param 
name="changesrevision">9e8b88b088778c44db56781e6a908a0e82e27cf2</param>
+  </service>
+  <service name="tar_scm">
+    <param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
+    <param 
name="changesrevision">85bfc3fabb06212b49a389afb3310bfbf2996913</param>
+  </service>
+  <service name="tar_scm">
+    <param 
name="url">https://github.com/openSUSE/obs-service-tar_scm.git</param>
+    <param 
name="changesrevision">ce886908f2586834a3e8d123ea758ff332bd07c4</param>
+  </service>
+</servicedata>
 (No newline at EOF)
 

++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.WRRtW4/_old  2023-07-06 18:28:35.879118155 +0200
+++ /var/tmp/diff_new_pack.WRRtW4/_new  2023-07-06 18:28:35.879118155 +0200
@@ -1,12 +1,12 @@
 Format: 1.0
 Source: obs-service-tar-scm
-Version: 0.10.36
+Version: 0.10.39
 Provides: obs-service-obs_scm, obs-service-tar
 Binary: obs-service-tar_scm
 Maintainer: Adrian Schroeter <adr...@suse.de>
 Architecture: all
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 8.0.0), python3, python-argparse, 
python3-dateutil, dh-python
+Build-Depends: debhelper (>= 8.0.0), python3, python3-dateutil, dh-python, 
python3-yaml
 
 Package: obs-service-tar-scm
 Architecture: all

++++++ obs-service-tar_scm-0.10.36.tar.gz -> obs-service-tar_scm-0.10.39.tar.gz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/obs-service-tar_scm-0.10.36/.github/workflows/main.yml 
new/obs-service-tar_scm-0.10.39/.github/workflows/main.yml
--- old/obs-service-tar_scm-0.10.36/.github/workflows/main.yml  2023-05-19 
14:54:18.000000000 +0200
+++ new/obs-service-tar_scm-0.10.39/.github/workflows/main.yml  2023-07-05 
18:59:51.000000000 +0200
@@ -20,7 +20,7 @@
     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:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.36/.pylintrc 
new/obs-service-tar_scm-0.10.39/.pylintrc
--- old/obs-service-tar_scm-0.10.36/.pylintrc   2023-05-19 14:54:18.000000000 
+0200
+++ new/obs-service-tar_scm-0.10.39/.pylintrc   2023-07-05 18:59:51.000000000 
+0200
@@ -93,7 +93,7 @@
 # * 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.36/.pylinttestsrc 
new/obs-service-tar_scm-0.10.39/.pylinttestsrc
--- old/obs-service-tar_scm-0.10.36/.pylinttestsrc      2023-05-19 
14:54:18.000000000 +0200
+++ new/obs-service-tar_scm-0.10.39/.pylinttestsrc      2023-07-05 
18:59:51.000000000 +0200
@@ -92,7 +92,7 @@
 # * 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,c
 onsider-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,c
 onsider-using-f-string,super-with-arguments,E0012,R0022,W0012,E0015,no-member
 
 
 [REPORTS]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.36/.travis.yml 
new/obs-service-tar_scm-0.10.39/.travis.yml
--- old/obs-service-tar_scm-0.10.36/.travis.yml 2023-05-19 14:54:18.000000000 
+0200
+++ new/obs-service-tar_scm-0.10.39/.travis.yml 1970-01-01 01:00:00.000000000 
+0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.36/KankuFile 
new/obs-service-tar_scm-0.10.39/KankuFile
--- old/obs-service-tar_scm-0.10.36/KankuFile   2023-05-19 14:54:18.000000000 
+0200
+++ new/obs-service-tar_scm-0.10.39/KankuFile   2023-07-05 18:59:51.000000000 
+0200
@@ -4,7 +4,7 @@
 
 
 domain_name: obs-service-tar_scm
-default_job: kanku-job
+default_job: tw
 login_user: root
 login_pass: kankudai
 
@@ -12,7 +12,7 @@
   user: 
 
 jobs:
- kanku-job:
+ tw:
   -
     use_module: Kanku::Handler::SetJobContext
     options:
@@ -25,9 +25,9 @@
       # 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 @@
     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 @@
       commands:
         # test python3
         - make -C /tmp/kanku clean check3
-        # test python2
-        - make -C /tmp/kanku clean test2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.36/TarSCM/exceptions.py 
new/obs-service-tar_scm-0.10.39/TarSCM/exceptions.py
--- old/obs-service-tar_scm-0.10.36/TarSCM/exceptions.py        2023-05-19 
14:54:18.000000000 +0200
+++ new/obs-service-tar_scm-0.10.39/TarSCM/exceptions.py        2023-07-05 
18:59:51.000000000 +0200
@@ -1,2 +1,6 @@
 class OptionsError(BaseException):
     pass
+
+
+class GitError(BaseException):
+    pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.36/TarSCM/scm/git.py 
new/obs-service-tar_scm-0.10.39/TarSCM/scm/git.py
--- old/obs-service-tar_scm-0.10.36/TarSCM/scm/git.py   2023-05-19 
14:54:18.000000000 +0200
+++ new/obs-service-tar_scm-0.10.39/TarSCM/scm/git.py   2023-07-05 
18:59:51.000000000 +0200
@@ -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 @@
         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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.36/debian/changelog 
new/obs-service-tar_scm-0.10.39/debian/changelog
--- old/obs-service-tar_scm-0.10.36/debian/changelog    2023-05-19 
14:54:18.000000000 +0200
+++ new/obs-service-tar_scm-0.10.39/debian/changelog    2023-07-05 
18:59:51.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.36/dist/debian.dsc 
new/obs-service-tar_scm-0.10.39/dist/debian.dsc
--- old/obs-service-tar_scm-0.10.36/dist/debian.dsc     1970-01-01 
01:00:00.000000000 +0100
+++ new/obs-service-tar_scm-0.10.39/dist/debian.dsc     2023-07-05 
18:59:51.000000000 +0200
@@ -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 <adr...@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.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/obs-service-tar_scm-0.10.36/dist/obs-service-tar_scm.spec 
new/obs-service-tar_scm-0.10.39/dist/obs-service-tar_scm.spec
--- old/obs-service-tar_scm-0.10.36/dist/obs-service-tar_scm.spec       
2023-05-19 14:54:18.000000000 +0200
+++ new/obs-service-tar_scm-0.10.39/dist/obs-service-tar_scm.spec       
2023-07-05 18:59:51.000000000 +0200
@@ -138,8 +138,8 @@
 BuildRequires:  %{use_python}-keyring
 BuildRequires:  %{use_python}-keyrings.alt
 BuildRequires:  %{use_python}-six
-BuildRequires:  %{use_python}-unittest2
 BuildRequires:  bzr
+BuildRequires:  gpg
 BuildRequires:  git-core
 BuildRequires:  mercurial
 BuildRequires:  subversion
Binary files 
old/obs-service-tar_scm-0.10.36/tests/fixtures/GitTests/test_find_valid_commit/fixtures.tar
 and 
new/obs-service-tar_scm-0.10.39/tests/fixtures/GitTests/test_find_valid_commit/fixtures.tar
 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.36/tests/gittests.py 
new/obs-service-tar_scm-0.10.39/tests/gittests.py
--- old/obs-service-tar_scm-0.10.36/tests/gittests.py   2023-05-19 
14:54:18.000000000 +0200
+++ new/obs-service-tar_scm-0.10.39/tests/gittests.py   2023-07-05 
18:59:51.000000000 +0200
@@ -155,10 +155,10 @@
                          '--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 @@
                          '--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 @@
                          '--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 @@
                          '--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 @@
                          '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 @@
         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 @@
             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:

Reply via email to