diff -Nru pyyaml-5.3.1/debian/changelog pyyaml-5.3.1/debian/changelog --- pyyaml-5.3.1/debian/changelog 2020-03-19 03:57:48.000000000 +0000 +++ pyyaml-5.3.1/debian/changelog 2020-04-15 15:13:39.000000000 +0000 @@ -1,3 +1,15 @@ +pyyaml (5.3.1-2) unstable; urgency=medium + + * Drop support for python2 (Closes: #938309) + * Delete obsolete README.source + * Replace autopkgtest-pkg-python with running the actual upstream test suite + * Set Multi-Arch allowed for python3-yaml (Closes: #918804) + * Patch upstream test system to make test failures fatal (Closes: #918893) + * Delete ancient version constraints in Build-Depends for python3-all-dev + and libyaml-dev + + -- Scott Kitterman Wed, 15 Apr 2020 11:13:39 -0400 + pyyaml (5.3.1-1) unstable; urgency=medium * New upstream security release diff -Nru pyyaml-5.3.1/debian/control pyyaml-5.3.1/debian/control --- pyyaml-5.3.1/debian/control 2020-03-07 02:56:55.000000000 +0000 +++ pyyaml-5.3.1/debian/control 2020-04-15 15:12:22.000000000 +0000 @@ -3,37 +3,16 @@ Priority: optional Maintainer: Debian Python Modules Team Uploaders: Scott Kitterman -Build-Depends: debhelper-compat (= 12), dh-python, python-all-dev (>= 2.6.5-13~), python-all-dbg, python3-all-dev (>= 3.1.2-10~), python3-all-dbg, libyaml-dev (>= 0.1.2~), cython, cython-dbg +Build-Depends: debhelper-compat (= 12), dh-python, python3-all-dev, python3-all-dbg, libyaml-dev, cython3, cython3-dbg Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/python-team/modules/pyyaml.git Vcs-Browser: https://salsa.debian.org/python-team/modules/pyyaml Standards-Version: 4.5.0 Homepage: https://github.com/yaml/pyyaml -Testsuite: autopkgtest-pkg-python - -Package: python-yaml -Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Description: YAML parser and emitter for Python - Python-yaml is a complete YAML 1.1 parser and emitter for Python. It can parse - all examples from the specification. The parsing algorithm is simple enough to - be a reference for YAML parser implementors. A simple extension API is also - provided. The package is built using libyaml for improved speed. - -Package: python-yaml-dbg -Section: debug -Architecture: any -Depends: python-yaml (= ${binary:Version}), python2-dbg, ${shlibs:Depends}, ${misc:Depends} -Description: YAML parser and emitter for Python (debug build) - Python-yaml is a complete YAML 1.1 parser and emitter for Python. It can parse - all examples from the specification. The parsing algorithm is simple enough to - be a reference for YAML parser implementors. A simple extension API is also - provided. The package is built using libyaml for improved speed. - . - This package contains the extension built for the Python debug interpreter. Package: python3-yaml Architecture: any +Multi-Arch: allowed Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} Description: YAML parser and emitter for Python3 Python3-yaml is a complete YAML 1.1 parser and emitter for Python3. It can diff -Nru pyyaml-5.3.1/debian/patches/fatal_test_failures.patch pyyaml-5.3.1/debian/patches/fatal_test_failures.patch --- pyyaml-5.3.1/debian/patches/fatal_test_failures.patch 1970-01-01 00:00:00.000000000 +0000 +++ pyyaml-5.3.1/debian/patches/fatal_test_failures.patch 2020-04-15 14:56:37.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Patch upstream test system to make test failures fatal +Author: Scott Kitterman +Bug-Debian: https://bugs.debian.org/918893 +Origin: vendor +Forwarded: not-needed +Last-Update: 2020-04-15 + +--- pyyaml-5.3.1.orig/tests/lib3/test_appliance.py ++++ pyyaml-5.3.1/tests/lib3/test_appliance.py +@@ -111,8 +111,10 @@ def display(results, verbose): + sys.stdout.write('TESTS: %s\n' % total) + if failures: + sys.stdout.write('FAILURES: %s\n' % failures) ++ sys.exit(1) + if errors: + sys.stdout.write('ERRORS: %s\n' % errors) ++ sys.exit(1) + return not (failures or errors) + + def run(collections, args=None): diff -Nru pyyaml-5.3.1/debian/patches/series pyyaml-5.3.1/debian/patches/series --- pyyaml-5.3.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ pyyaml-5.3.1/debian/patches/series 2020-04-15 14:55:08.000000000 +0000 @@ -0,0 +1 @@ +fatal_test_failures.patch diff -Nru pyyaml-5.3.1/debian/python3-yaml.examples pyyaml-5.3.1/debian/python3-yaml.examples --- pyyaml-5.3.1/debian/python3-yaml.examples 1970-01-01 00:00:00.000000000 +0000 +++ pyyaml-5.3.1/debian/python3-yaml.examples 2020-04-15 13:14:22.000000000 +0000 @@ -0,0 +1,2 @@ +examples/* + diff -Nru pyyaml-5.3.1/debian/python-yaml.docs pyyaml-5.3.1/debian/python-yaml.docs --- pyyaml-5.3.1/debian/python-yaml.docs 2019-08-04 22:35:00.000000000 +0000 +++ pyyaml-5.3.1/debian/python-yaml.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -README diff -Nru pyyaml-5.3.1/debian/python-yaml.examples pyyaml-5.3.1/debian/python-yaml.examples --- pyyaml-5.3.1/debian/python-yaml.examples 2019-08-04 22:35:00.000000000 +0000 +++ pyyaml-5.3.1/debian/python-yaml.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -examples/* - diff -Nru pyyaml-5.3.1/debian/README.source pyyaml-5.3.1/debian/README.source --- pyyaml-5.3.1/debian/README.source 2019-08-04 22:35:00.000000000 +0000 +++ pyyaml-5.3.1/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To configure quilt to use debian/patches instead of patches, you want -either to export QUILT_PATCHES=debian/patches in your environment -or use this snippet in your ~/.quiltrc: - - for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do - if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then - export QUILT_PATCHES=debian/patches - break - fi - done - -To get the fully patched source after unpacking the source package, cd to -the root level of the source package and run: - - quilt push -a - -The last patch listed in debian/patches/series will become the current -patch. - -To add a new set of changes, first run quilt push -a, and then run: - - quilt new - -where is a descriptive name for the patch, used as the filename in -debian/patches. Then, for every file that will be modified by this patch, -run: - - quilt add - -before editing those files. You must tell quilt with quilt add what files -will be part of the patch before making changes or quilt will not work -properly. After editing the files, run: - - quilt refresh - -to save the results as a patch. - -Alternately, if you already have an external patch and you just want to -add it to the build system, run quilt push -a and then: - - quilt import -P /path/to/patch - quilt push -a - -(add -p 0 to quilt import if needed). as above is the filename to -use in debian/patches. The last quilt push -a will apply the patch to -make sure it works properly. - -To remove an existing patch from the list of patches that will be applied, -run: - - quilt delete - -You may need to run quilt pop -a to unapply patches first before running -this command. diff -Nru pyyaml-5.3.1/debian/rules pyyaml-5.3.1/debian/rules --- pyyaml-5.3.1/debian/rules 2019-08-04 22:35:00.000000000 +0000 +++ pyyaml-5.3.1/debian/rules 2020-04-15 13:21:17.000000000 +0000 @@ -3,26 +3,13 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all export PYBUILD_NAME=yaml -buildvers := $(shell pyversions -sv) build3vers := $(shell py3versions -sv) %: - dh $@ --with python2,python3 --buildsystem pybuild + dh $@ --with python3 --buildsystem pybuild override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - set -e && for i in $(buildvers); do \ - echo "-- running tests for "$$i" plain --" ; \ - python$$i -c "import sys ; sys.path.insert(0, '.pybuild/cpython2_"$$i"_yaml/build'); \ - sys.path.insert(0, 'tests/lib'); import test_all; test_all.main([])";\ - done - - set -e && for i in $(buildvers); do \ - echo "-- running tests for "$$i" debug --" ; \ - python$$i-dbg -c "import sys ; sys.path.insert(0, '.pybuild/cpython2_"$$i"_dbg_yaml/build'); \ - sys.path.insert(0, 'tests/lib'); import test_all; test_all.main([])";\ - done - set -e && for i in $(build3vers); do \ echo "-- running tests for "$$i" plain --" ; \ python$$i -c "import sys ; sys.path.insert(0, '.pybuild/cpython3_"$$i"_yaml/build'); \ @@ -40,8 +27,6 @@ dh_installchangelogs CHANGES override_dh_installdeb: - rm -rf $(CURDIR)/debian/python-yaml-dbg/usr/share/doc/python-yaml-dbg - ln -s python-yaml debian/python-yaml-dbg/usr/share/doc/python-yaml-dbg rm -rf $(CURDIR)/debian/python3-yaml-dbg/usr/lib/python3/dist-packages/yaml rm -rf $(CURDIR)/debian/python3-yaml-dbg/usr/share/doc/python3-yaml-dbg ln -s python3-yaml debian/python3-yaml-dbg/usr/share/doc/python3-yaml-dbg @@ -49,5 +34,4 @@ dh_installdeb override_dh_strip: - dh_strip --dbg-package=python-yaml-dbg -ppython-yaml -ppython-yaml-dbg dh_strip --dbg-package=python3-yaml-dbg -ppython3-yaml -ppython3-yaml-dbg diff -Nru pyyaml-5.3.1/debian/tests/control pyyaml-5.3.1/debian/tests/control --- pyyaml-5.3.1/debian/tests/control 2019-08-04 22:35:00.000000000 +0000 +++ pyyaml-5.3.1/debian/tests/control 2020-04-15 14:01:19.000000000 +0000 @@ -2,7 +2,7 @@ # code point is higher than upstream pyyaml supports, but with the quilt # patch, it will work. Unfortunately, we have not been able to correctly add # a unittest for the problem, so DEP-8 will have to do. - -Tests: python2.sh +# 2020-04-15 scott@kitterman.com: Now we run the upstream test suite too. +# Upstream now supports these, we have no patches. Tests: python3.sh diff -Nru pyyaml-5.3.1/debian/tests/python2.sh pyyaml-5.3.1/debian/tests/python2.sh --- pyyaml-5.3.1/debian/tests/python2.sh 2020-01-10 17:42:37.000000000 +0000 +++ pyyaml-5.3.1/debian/tests/python2.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -#!/bin/sh -set -eu -export PYTHONIOENCODING='utf-8' -python2 -c "import yaml; print yaml.load('\N{PILE OF POO}', Loader=yaml.FullLoader)" -python2 -c "import yaml; print yaml.dump('\N{PILE OF POO}', allow_unicode=True)" diff -Nru pyyaml-5.3.1/debian/tests/python3.sh pyyaml-5.3.1/debian/tests/python3.sh --- pyyaml-5.3.1/debian/tests/python3.sh 2019-08-04 22:59:51.000000000 +0000 +++ pyyaml-5.3.1/debian/tests/python3.sh 2020-04-15 13:59:59.000000000 +0000 @@ -1,5 +1,16 @@ #!/bin/sh set -eu + +for i in $(py3versions -sv); do + echo "-- running tests for "$i" plain --" ; + python$i -c "import sys ; sys.path.insert(0, 'tests/lib3'); import test_all; test_all.main([])"; +done + +for i in $(py3versions -sv); do + echo "-- running tests for "$i" debug --" ; + python$i -c "import sys ; sys.path.insert(0, 'tests/lib3'); import test_all; test_all.main([])"; +done + export PYTHONIOENCODING='utf-8' python3 -c "import yaml; print(yaml.load('\N{PILE OF POO}', Loader=yaml.FullLoader))" python3 -c "import yaml; print(yaml.dump('\N{PILE OF POO}', allow_unicode=True))"