diff -Nru gdebi-0.9.5.7+nmu9/debian/changelog gdebi-0.9.5.7+nmu10/debian/changelog --- gdebi-0.9.5.7+nmu9/debian/changelog 2024-07-23 16:10:36.000000000 +0200 +++ gdebi-0.9.5.7+nmu10/debian/changelog 2024-09-04 14:44:10.000000000 +0200 @@ -1,3 +1,13 @@ +gdebi (0.9.5.7+nmu10) unstable; urgency=medium + + * Non-maintainer upload. + * Fix tests - setuptools v72 drops support for the "test" command, + so use autopkgtest-pkg-pybuild instead. Also drop pyflakes (py2) + tests. Remove unused variables to make the test actually pass. + Closes: #1080220 + + -- Andreas Rönnquist Wed, 04 Sep 2024 14:44:10 +0200 + gdebi (0.9.5.7+nmu9) unstable; urgency=medium * Non-maintainer upload. diff -Nru gdebi-0.9.5.7+nmu9/debian/control gdebi-0.9.5.7+nmu10/debian/control --- gdebi-0.9.5.7+nmu9/debian/control 2024-07-12 12:10:45.000000000 +0200 +++ gdebi-0.9.5.7+nmu10/debian/control 2024-09-04 14:44:10.000000000 +0200 @@ -7,6 +7,7 @@ dh-python, gir1.2-gtk-3.0, gir1.2-vte-2.91, + pyflakes3, python3-all, python3-apt, python3-gi, @@ -17,6 +18,7 @@ lintian, Standards-Version: 3.9.6 Vcs-Bzr: https://code.launchpad.net/~gdebi-developers/gdebi/trunk +Testsuite: autopkgtest-pkg-pybuild Package: gdebi-core Architecture: all diff -Nru gdebi-0.9.5.7+nmu9/debian/rules gdebi-0.9.5.7+nmu10/debian/rules --- gdebi-0.9.5.7+nmu9/debian/rules 2021-01-13 19:45:14.000000000 +0100 +++ gdebi-0.9.5.7+nmu10/debian/rules 2024-09-04 14:44:10.000000000 +0200 @@ -3,6 +3,8 @@ PY3VER=$(shell py3versions -dvr) DH_VERBOSE=1 +export PYBUILD_TEST_ARGS={dir}/release_tests + %: dh $@ --with python3 --buildsystem pybuild @@ -10,9 +12,6 @@ dh_auto_clean rm -rf build GDebi/Version.py po/mo -override_dh_auto_test: - xvfb-run -a python$(PY3VER) setup.py test - override_dh_auto_install: PYBUILD_SYSTEM=custom \ PYBUILD_INSTALL_ARGS="python{version} setup.py install \ diff -Nru gdebi-0.9.5.7+nmu9/GDebi/GDebiKDE.py gdebi-0.9.5.7+nmu10/GDebi/GDebiKDE.py --- gdebi-0.9.5.7+nmu9/GDebi/GDebiKDE.py 2021-01-13 19:45:14.000000000 +0100 +++ gdebi-0.9.5.7+nmu10/GDebi/GDebiKDE.py 2024-09-04 14:44:10.000000000 +0200 @@ -360,7 +360,7 @@ #errMsg = None try: res = self._cache.commit(fprogress,iprogress) - except IOError as msg: + except IOError: res = False #errMsg = "%s" % msg header = _("Could not download all required files") diff -Nru gdebi-0.9.5.7+nmu9/GDebi/KDEAptDialogs.py gdebi-0.9.5.7+nmu10/GDebi/KDEAptDialogs.py --- gdebi-0.9.5.7+nmu9/GDebi/KDEAptDialogs.py 2021-01-13 19:45:14.000000000 +0100 +++ gdebi-0.9.5.7+nmu10/GDebi/KDEAptDialogs.py 2024-09-04 14:44:10.000000000 +0200 @@ -144,7 +144,7 @@ # run the base class try: InstallProgress.update_interface(self) - except ValueError as e: + except ValueError: pass # log the output of dpkg (on the master_fd) to the DumbTerminal while True: diff -Nru gdebi-0.9.5.7+nmu9/gdebi-gtk gdebi-0.9.5.7+nmu10/gdebi-gtk --- gdebi-0.9.5.7+nmu9/gdebi-gtk 2021-01-13 19:45:14.000000000 +0100 +++ gdebi-0.9.5.7+nmu10/gdebi-gtk 2024-09-04 14:44:10.000000000 +0200 @@ -77,7 +77,7 @@ try: app = GDebiGtk(datadir=data,options=options,file=afile) - except SystemError as e: + except SystemError: err_header = _("Software index is broken") err_body = _("This is a major failure of your software " "management system. Please check for broken packages " diff -Nru gdebi-0.9.5.7+nmu9/gdebi-kde gdebi-0.9.5.7+nmu10/gdebi-kde --- gdebi-0.9.5.7+nmu9/gdebi-kde 2021-01-13 19:45:14.000000000 +0100 +++ gdebi-0.9.5.7+nmu10/gdebi-kde 2024-09-04 14:44:10.000000000 +0200 @@ -89,7 +89,7 @@ if options.non_interactive == True: gdebi.installButtonClicked() app.exec_() - except SystemError as e: + except SystemError: err_header = _("Software index is broken") err_body = _("This is a major failure of your software " "management system. Please check for broken packages " diff -Nru gdebi-0.9.5.7+nmu9/release_tests/test_pyflakes.py gdebi-0.9.5.7+nmu10/release_tests/test_pyflakes.py --- gdebi-0.9.5.7+nmu9/release_tests/test_pyflakes.py 2021-01-13 19:45:14.000000000 +0100 +++ gdebi-0.9.5.7+nmu10/release_tests/test_pyflakes.py 2024-09-04 14:44:10.000000000 +0200 @@ -13,9 +13,6 @@ os.path.join(os.path.dirname(__file__), "..", "gdebi-kde"), ] - def test_pyflakes_clean(self): - self.assertEqual(subprocess.check_call(['pyflakes'] + self.paths), 0) - def test_pyflakes3_clean(self): self.assertEqual(subprocess.check_call(['pyflakes3'] + self.paths), 0)