diff -Nru ginga-2.7.2/debian/changelog ginga-2.7.2/debian/changelog --- ginga-2.7.2/debian/changelog 2019-07-13 09:44:26.000000000 +0000 +++ ginga-2.7.2/debian/changelog 2019-07-17 06:45:43.000000000 +0000 @@ -1,9 +1,10 @@ -ginga (2.7.2-2ubuntu1) eoan; urgency=medium +ginga (2.7.2-3) unstable; urgency=medium - * Backport upstream patch to stop using astropy.tests.pytest_plugins, - that was removed in astropy 3.2. + * Fix import failure from astropy.tests on astropy 3.2. Closes: #931998 + * Push Standards-Version to 4.4.0. No changes required. + * Push compat to 12 - -- Dmitry Shachnev Sat, 13 Jul 2019 12:44:26 +0300 + -- Ole Streicher Wed, 17 Jul 2019 08:45:43 +0200 ginga (2.7.2-2) unstable; urgency=low diff -Nru ginga-2.7.2/debian/compat ginga-2.7.2/debian/compat --- ginga-2.7.2/debian/compat 2018-08-14 06:59:56.000000000 +0000 +++ ginga-2.7.2/debian/compat 2019-07-17 06:45:24.000000000 +0000 @@ -1 +1 @@ -11 +12 diff -Nru ginga-2.7.2/debian/control ginga-2.7.2/debian/control --- ginga-2.7.2/debian/control 2019-07-13 09:44:26.000000000 +0000 +++ ginga-2.7.2/debian/control 2019-07-17 06:45:30.000000000 +0000 @@ -1,10 +1,9 @@ Source: ginga Section: python Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Astronomy Team +Maintainer: Debian Astronomy Team Uploaders: Ole Streicher -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper (>= 12), dh-python, help2man, python3-all, @@ -13,7 +12,7 @@ python3-numpy (>= 1.7), python3-qtpy (>= 1.1), python3-setuptools -Standards-Version: 4.2.1 +Standards-Version: 4.4.0 Homepage: https://ejeschke.github.io/ginga Vcs-Git: https://salsa.debian.org/debian-astro-team/ginga.git Vcs-Browser: https://salsa.debian.org/debian-astro-team/ginga diff -Nru ginga-2.7.2/debian/patches/Fix-import-failure-from-astropy.tests-on-astropy-3.2.patch ginga-2.7.2/debian/patches/Fix-import-failure-from-astropy.tests-on-astropy-3.2.patch --- ginga-2.7.2/debian/patches/Fix-import-failure-from-astropy.tests-on-astropy-3.2.patch 1970-01-01 00:00:00.000000000 +0000 +++ ginga-2.7.2/debian/patches/Fix-import-failure-from-astropy.tests-on-astropy-3.2.patch 2019-07-17 06:45:08.000000000 +0000 @@ -0,0 +1,22 @@ +From: Ole Streicher +Date: Tue, 16 Jul 2019 20:43:41 +0200 +Subject: Fix import failure from astropy.tests on astropy 3.2 + +--- + ginga/conftest.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ginga/conftest.py b/ginga/conftest.py +index b04d30f..6cdef5a 100644 +--- a/ginga/conftest.py ++++ b/ginga/conftest.py +@@ -2,7 +2,8 @@ + # by importing them here in conftest.py they are discoverable by py.test + # no matter how it is invoked within the source tree. + +-from astropy.tests.pytest_plugins import * ++from astropy.tests.helper import enable_deprecations_as_exceptions ++from astropy.tests.plugins.display import PYTEST_HEADER_MODULES, TESTED_VERSIONS + + ## Uncomment the following line to treat all DeprecationWarnings as + ## exceptions diff -Nru ginga-2.7.2/debian/patches/Fix-import-failure-from-astropy.tests.patch ginga-2.7.2/debian/patches/Fix-import-failure-from-astropy.tests.patch --- ginga-2.7.2/debian/patches/Fix-import-failure-from-astropy.tests.patch 2019-07-13 09:44:20.000000000 +0000 +++ ginga-2.7.2/debian/patches/Fix-import-failure-from-astropy.tests.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -Description: Fix import failure from astropy.tests -Origin: upstream, https://github.com/ejeschke/ginga/commit/0305b79e85bbb0c0 -Last-Update: 2019-07-13 - ---- a/ginga/conftest.py -+++ b/ginga/conftest.py -@@ -1,8 +1,9 @@ --# this contains imports plugins that configure py.test for astropy tests. --# by importing them here in conftest.py they are discoverable by py.test -+# This contains imports plugins that configure pytest for Ginga tests. -+# By importing them here in conftest.py they are discoverable by pytest - # no matter how it is invoked within the source tree. - --from astropy.tests.pytest_plugins import * -+from astropy.tests.helper import enable_deprecations_as_exceptions -+from astropy.tests.plugins.display import PYTEST_HEADER_MODULES, TESTED_VERSIONS - - ## Uncomment the following line to treat all DeprecationWarnings as - ## exceptions -@@ -11,12 +12,12 @@ enable_deprecations_as_exceptions() - ## Uncomment and customize the following lines to add/remove entries from - ## the list of packages for which version numbers are displayed when running - ## the tests. Making it pass for KeyError is essential in some cases when --## the package uses other astropy affiliated packages. -+## the package uses other Astropy affiliated packages. - try: - PYTEST_HEADER_MODULES['Astropy'] = 'astropy' - PYTEST_HEADER_MODULES['scikit-image'] = 'skimage' - del PYTEST_HEADER_MODULES['h5py'] --except (NameError, KeyError): # NameError is needed to support Astropy < 1.0 -+except KeyError: - pass - - ## Uncomment the following lines to display the version number of the -@@ -31,5 +32,5 @@ from . import version - try: - packagename = os.path.basename(os.path.dirname(__file__)) - TESTED_VERSIONS[packagename] = version.version --except NameError: # Needed to support Astropy <= 1.0.0 -+except KeyError: - pass diff -Nru ginga-2.7.2/debian/patches/series ginga-2.7.2/debian/patches/series --- ginga-2.7.2/debian/patches/series 2019-07-13 09:43:03.000000000 +0000 +++ ginga-2.7.2/debian/patches/series 2019-07-17 06:45:08.000000000 +0000 @@ -1,4 +1,4 @@ Install-the-scripts-only-for-the-Python-3-version.patch Don-t-install-the-fonts-included-in-the-package.patch Use-astropy_helpers-provided-by-the-system.patch -Fix-import-failure-from-astropy.tests.patch +Fix-import-failure-from-astropy.tests-on-astropy-3.2.patch