diff -Nru dh-python-4.20191017ubuntu5/debian/changelog dh-python-4.20191017ubuntu7/debian/changelog --- dh-python-4.20191017ubuntu5/debian/changelog 2020-01-30 08:12:05.000000000 +0000 +++ dh-python-4.20191017ubuntu7/debian/changelog 2020-02-23 16:04:32.000000000 +0000 @@ -1,3 +1,15 @@ +dh-python (4.20191017ubuntu7) focal; urgency=medium + + * Also fix the nosetests. + + -- Matthias Klose Sun, 23 Feb 2020 17:04:32 +0100 + +dh-python (4.20191017ubuntu6) focal; urgency=medium + + * Fix autopkg tests with python3.8 only. + + -- Matthias Klose Sun, 23 Feb 2020 12:26:55 +0100 + dh-python (4.20191017ubuntu5) focal; urgency=medium * Add dh-python to the autopkg test dependencies. diff -Nru dh-python-4.20191017ubuntu5/dhpython/interpreter.py dh-python-4.20191017ubuntu7/dhpython/interpreter.py --- dh-python-4.20191017ubuntu5/dhpython/interpreter.py 2019-10-18 08:56:00.000000000 +0000 +++ dh-python-4.20191017ubuntu7/dhpython/interpreter.py 2020-02-23 16:04:11.000000000 +0000 @@ -307,8 +307,8 @@ >>> i = Interpreter('python') >>> i.cache_file('foo.py', Version('3.1')) 'foo.pyc' - >>> i.cache_file('bar/foo.py', '3.7') - 'bar/__pycache__/foo.cpython-37.pyc' + >>> i.cache_file('bar/foo.py', '3.8') + 'bar/__pycache__/foo.cpython-38.pyc' """ version = Version(version or self.version) last_char = 'o' if '-O' in self.options else 'c' @@ -333,8 +333,8 @@ """Return Python magic tag (used in __pycache__ dir to tag files). >>> i = Interpreter('python') - >>> i.magic_tag(version='3.7') - 'cpython-37' + >>> i.magic_tag(version='3.8') + 'cpython-38' """ version = Version(version or self.version) if self.impl.startswith('cpython') and version << Version('3.2'): @@ -376,8 +376,8 @@ >>> Interpreter('python2.7').include_dir '/usr/include/python2.7' - >>> Interpreter('python3.7-dbg').include_dir - '/usr/include/python3.7dm' + >>> Interpreter('python3.8-dbg').include_dir + '/usr/include/python3.8d' """ if self.impl == 'pypy': return '/usr/lib/pypy/include' @@ -393,10 +393,14 @@ if self.debug: if version << '3.3': result += '_d' + elif version >= '3.8': + result += 'd' else: result += 'dm' else: - if version >> '3.2': + if version >= '3.8': + pass + elif version >> '3.2': result += 'm' elif version == '3.2': result += 'mu' @@ -406,12 +410,12 @@ def symlinked_include_dir(self): """Return path to symlinked include directory. - >>> Interpreter('python3.7').symlinked_include_dir - '/usr/include/python3.7' + >>> Interpreter('python3.8').symlinked_include_dir + """ if self.impl in ('cpython2', 'pypy') or self.debug \ - or self.version << '3.3': - # these interpreters do not provide sumlink, + or self.version << '3.3' or self.version >> '3.7': + # these interpreters do not provide symlink, # others provide it in libpython3.X-dev return try: @@ -509,7 +513,7 @@ >>> Interpreter('python3.1').suggest_pkg_name('foo') 'python3-foo' - >>> Interpreter('python3.7').suggest_pkg_name('foo_bar') + >>> Interpreter('python3.8').suggest_pkg_name('foo_bar') 'python3-foo-bar' >>> Interpreter('python2.7-dbg').suggest_pkg_name('bar') 'python-bar-dbg' diff -Nru dh-python-4.20191017ubuntu5/tests/Makefile dh-python-4.20191017ubuntu7/tests/Makefile --- dh-python-4.20191017ubuntu5/tests/Makefile 2020-01-17 14:34:25.000000000 +0000 +++ dh-python-4.20191017ubuntu7/tests/Makefile 2020-02-23 11:24:51.000000000 +0000 @@ -4,8 +4,8 @@ # Note that all these packages have to be installed during tests export DEBPYTHON_DEFAULT=2.7 export DEBPYTHON_SUPPORTED=2.7 -export DEBPYTHON3_DEFAULT=3.7 -export DEBPYTHON3_SUPPORTED=3.7,3.8 +export DEBPYTHON3_DEFAULT=3.8 +export DEBPYTHON3_SUPPORTED=3.8 # enable or disable tests here: TESTS := test101 test301 test302 test303 test304 Binary files /tmp/tmpJ15xdP/AQvzGu0cD8/dh-python-4.20191017ubuntu5/tests/python3-foo-dbgsym_0.1.1_amd64.ddeb and /tmp/tmpJ15xdP/JsWlv0CBsp/dh-python-4.20191017ubuntu7/tests/python3-foo-dbgsym_0.1.1_amd64.ddeb differ diff -Nru dh-python-4.20191017ubuntu5/tests/t301/debian/control dh-python-4.20191017ubuntu7/tests/t301/debian/control --- dh-python-4.20191017ubuntu5/tests/t301/debian/control 2019-10-18 08:56:00.000000000 +0000 +++ dh-python-4.20191017ubuntu7/tests/t301/debian/control 2020-02-23 11:24:11.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Piotr Ożarowski Build-Depends: debhelper (>= 7.0.50~), python3-all Standards-Version: 3.9.0 -X-Python3-Version: >= 3.1, << 3.7 +X-Python3-Version: >= 3.1, << 3.9 Package: python3-foo Architecture: all diff -Nru dh-python-4.20191017ubuntu5/tests/t301/Makefile dh-python-4.20191017ubuntu7/tests/t301/Makefile --- dh-python-4.20191017ubuntu5/tests/t301/Makefile 2019-10-18 08:56:00.000000000 +0000 +++ dh-python-4.20191017ubuntu7/tests/t301/Makefile 2020-02-23 11:25:49.000000000 +0000 @@ -8,7 +8,7 @@ dpkg-buildpackage -b -us -uc check: - grep -qe "Depends: .*python3\(:any\)\? (<< 3.7)" debian/python3-foo/DEBIAN/control + grep -qe "Depends: .*python3\(:any\)\? (<< 3.9)" debian/python3-foo/DEBIAN/control grep -q "Recommends: .*python3-mako" debian/python3-foo/DEBIAN/control test -f debian/python3-foo/usr/lib/python3/dist-packages/foo/__init__.py test ! -f debian/python3-foo/usr/lib/python3/dist-packages/foo/spam.py diff -Nru dh-python-4.20191017ubuntu5/tests/t301/.pybuild/cpython3_3.8/.pydistutils.cfg dh-python-4.20191017ubuntu7/tests/t301/.pybuild/cpython3_3.8/.pydistutils.cfg --- dh-python-4.20191017ubuntu5/tests/t301/.pybuild/cpython3_3.8/.pydistutils.cfg 1970-01-01 00:00:00.000000000 +0000 +++ dh-python-4.20191017ubuntu7/tests/t301/.pybuild/cpython3_3.8/.pydistutils.cfg 2020-02-23 11:24:58.000000000 +0000 @@ -0,0 +1,12 @@ +[clean] +all=1 +[build] +build-lib=/packages/tmp/p/dh-python-4.20191017ubuntu5/tests/t301/.pybuild/cpython3_3.8/build +[install] +force=1 +install-layout=deb +install-scripts=$base/bin +install-lib=/usr/lib/python3.8/dist-packages +prefix=/usr +[easy_install] +allow_hosts=None diff -Nru dh-python-4.20191017ubuntu5/tests/t302/Makefile dh-python-4.20191017ubuntu7/tests/t302/Makefile --- dh-python-4.20191017ubuntu5/tests/t302/Makefile 2019-10-18 08:56:00.000000000 +0000 +++ dh-python-4.20191017ubuntu7/tests/t302/Makefile 2020-02-23 11:26:27.000000000 +0000 @@ -10,8 +10,8 @@ grep -q "py3compile -p python3-foo /usr/lib/python3-foo"\ debian/python3-foo/DEBIAN/postinst [ "`find debian/python3-foo/usr/lib/python3/dist-packages/foo -name 'bar.cpython-*.so'`" != "" ] - # test if moved from include/python3.X/ to include/python3.Xm/ - test -f debian/python3-foo/usr/include/python$(DEBPYTHON3_DEFAULT)m/foo.h + # test if moved from include/python3.X/ to include/python3.X/ + test -f debian/python3-foo/usr/include/python$(DEBPYTHON3_DEFAULT)/foo.h clean: ./debian/rules clean diff -Nru dh-python-4.20191017ubuntu5/tests/t302/.pybuild/cpython3_3.8/.pydistutils.cfg dh-python-4.20191017ubuntu7/tests/t302/.pybuild/cpython3_3.8/.pydistutils.cfg --- dh-python-4.20191017ubuntu5/tests/t302/.pybuild/cpython3_3.8/.pydistutils.cfg 1970-01-01 00:00:00.000000000 +0000 +++ dh-python-4.20191017ubuntu7/tests/t302/.pybuild/cpython3_3.8/.pydistutils.cfg 2020-02-23 11:25:55.000000000 +0000 @@ -0,0 +1,12 @@ +[clean] +all=1 +[build] +build-lib=/packages/tmp/p/dh-python-4.20191017ubuntu5/tests/t302/.pybuild/cpython3_3.8/build +[install] +force=1 +install-layout=deb +install-scripts=$base/bin +install-lib=/usr/lib/python3.8/dist-packages +prefix=/usr +[easy_install] +allow_hosts=None diff -Nru dh-python-4.20191017ubuntu5/tests/t304/.pybuild/cpython3_3.8/.pydistutils.cfg dh-python-4.20191017ubuntu7/tests/t304/.pybuild/cpython3_3.8/.pydistutils.cfg --- dh-python-4.20191017ubuntu5/tests/t304/.pybuild/cpython3_3.8/.pydistutils.cfg 1970-01-01 00:00:00.000000000 +0000 +++ dh-python-4.20191017ubuntu7/tests/t304/.pybuild/cpython3_3.8/.pydistutils.cfg 2020-02-23 11:26:38.000000000 +0000 @@ -0,0 +1,12 @@ +[clean] +all=1 +[build] +build-lib=/packages/tmp/p/dh-python-4.20191017ubuntu5/tests/t304/.pybuild/cpython3_3.8/build +[install] +force=1 +install-layout=deb +install-scripts=$base/bin +install-lib=/usr/lib/python3.8/dist-packages +prefix=/usr +[easy_install] +allow_hosts=None