diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 20:19:53 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 20:19:53 +0000 |
commit | f42a25756b9133ae9c62fa7a86112bfc603391c8 (patch) | |
tree | 51bf1ba3aad37d5913d230724bd1969d4d466286 | |
parent | Adding upstream version 0.91.0. (diff) | |
download | python-ruyaml-debian.tar.xz python-ruyaml-debian.zip |
Adding debian version 0.91.0-3.debian/0.91.0-3debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r-- | debian/README.source | 29 | ||||
-rw-r--r-- | debian/changelog | 20 | ||||
-rw-r--r-- | debian/control | 50 | ||||
-rw-r--r-- | debian/copyright | 34 | ||||
-rw-r--r-- | debian/gbp.conf | 22 | ||||
-rw-r--r-- | debian/patches/docs-Drop-external-graphic-in-index.rst.patch | 22 | ||||
-rw-r--r-- | debian/patches/series | 2 | ||||
-rw-r--r-- | debian/patches/tests-Make-some-tests-compatible-with-Python-3.12.patch | 75 | ||||
-rw-r--r-- | debian/python-ruyaml-doc.doc-base | 8 | ||||
-rwxr-xr-x | debian/rules | 26 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/source/options | 1 | ||||
-rw-r--r-- | debian/tests/control | 7 | ||||
-rw-r--r-- | debian/tests/smoke | 16 | ||||
-rw-r--r-- | debian/upstream/metadata | 5 | ||||
-rw-r--r-- | debian/watch | 8 |
16 files changed, 326 insertions, 0 deletions
diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..0573285 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,29 @@ +This package is maintained with git-buildpackage(1). It follows DEP-14 for +branch naming (e.g. using debian/master for the current version in Debian +unstable due Debian Python team policy). + +It uses pristine-tar(1) to store enough information in git to generate bit +identical tarballs when building the package without having downloaded an +upstream tarball first. + +When working with patches it is recommended to use "gbp pq import" to import +the patches, modify the source and then use "gbp pq export --commit" to commit +the modifications. + +The changelog is generated using "gbp dch" so if you submit any changes don't +bother to add changelog entries but rather provide a nice git commit message +that can then end up in the changelog. + +It is recommended to build the package with pbuilder using: + + gbp buildpackage --git-pbuilder + +For information on how to set up a pbuilder environment see the git-pbuilder(1) +manpage. In short: + + DIST=sid git-pbuilder create + gbp clone https://salsa.debian.org/python-team/packages/python-ruyaml.git + cd python-ruyaml + gbp buildpackage --git-pbuilder + + -- Carsten Schoenert <c.schoenert> Sat, 02 Sep 2023 21:17:00 +0530 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..bc09d5d --- /dev/null +++ b/debian/changelog @@ -0,0 +1,20 @@ +python-ruyaml (0.91.0-3) unstable; urgency=medium + + * [a93b8d1] Rebuild patch queue from patch-queue branch + (Closes: #1058369) + + -- Carsten Schoenert <c.schoenert@t-online.de> Mon, 01 Jan 2024 12:18:38 +0100 + +python-ruyaml (0.91.0-2) unstable; urgency=medium + + * Source only upload + + -- Carsten Schoenert <c.schoenert@t-online.de> Sat, 23 Sep 2023 13:33:13 +0200 + +python-ruyaml (0.91.0-1) unstable; urgency=medium + + * [e7632d5] New upstream version 0.91.0 + * [69ac859] First and initial Debianization + (Closes: #1051758) + + -- Carsten Schoenert <c.schoenert@t-online.de> Tue, 12 Sep 2023 13:41:31 +0530 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..34dd2d8 --- /dev/null +++ b/debian/control @@ -0,0 +1,50 @@ +Source: python-ruyaml +Maintainer: Debian Python Team <team+python@tracker.debian.org> +Uploaders: + Carsten Schoenert <c.schoenert@t-online.de>, +Section: python +Priority: optional +Build-Depends: + debhelper-compat (= 13), + pybuild-plugin-pyproject, + dh-sequence-sphinxdoc, + python3-all, + python3-setuptools, + python3-setuptools-scm, +Build-Depends-Indep: + python3-pytest <!nocheck>, + python3-sphinx <!nodoc>, + python3-sphinx-rtd-theme <!nodoc>, +Rules-Requires-Root: no +Standards-Version: 4.6.2 +Vcs-Browser: https://salsa.debian.org/python-team/packages/python-ruyaml +Vcs-Git: https://salsa.debian.org/python-team/packages/python-ruyaml.git +Homepage: https://github.com/pycontribs/ruyaml + +Package: python-ruyaml-doc +Architecture: all +Section: doc +Depends: + ${misc:Depends}, + ${sphinxdoc:Depends} +Multi-Arch: foreign +Description: YAML 1.2 loader/dumper package for Python (Documentation) + The ruyaml package is a fork of ruamel.yaml aimed to made in order to secure + the future of the library, mainly by having a pool of maintainers and can be + used as a drop-in replacement for python3-ruamel.yaml. + . + This package installs the documentation for the library. + +Package: python3-ruyaml +Architecture: all +Depends: + ${misc:Depends}, + ${python3:Depends}, +Suggests: + python-ruamel-doc, +Description: YAML 1.2 loader/dumper package for Python + The ruyaml package is a fork of ruamel.yaml aimed to made in order to secure + the future of the library, mainly by having a pool of maintainers and can be + used as a drop-in replacement for python3-ruamel.yaml. + . + This package contains the Python 3 version of the library. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..7247b8d --- /dev/null +++ b/debian/copyright @@ -0,0 +1,34 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ruyaml +Upstream-Contact: Anthon van der Neut, Ruamel bvba <pycontribs@googlegroups.com> + Sorin Sbarnea <sorin.sbarnea@gmail.com> +Source: https://github.com/pycontribs/ruyaml + +Files: * +Copyright: Anthon van der Neut, Ruamel bvba <pycontribs@googlegroups.com> + Sorin Sbarnea <sorin.sbarnea@gmail.com> + Matthias Urlichs <matthias@urlichs.de> +License: MIT + +Files: debian/* +Copyright: 2023, Carsten Schoenert <c.schoenert@t-online.de> +License: MIT + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..8d7a462 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,22 @@ +[DEFAULT] +pristine-tar = True +compression = gz +debian-branch = debian/master +upstream-branch = upstream + +[pq] +patch-numbers = False + +[dch] +id-length = 7 + +[import-orig] +# filter out unwanted files/dirs from upstream +#filter = [ +# '.github', +# '*.orig', +# '*.pdf', +# '*.rej', +# ] +# filter the files out of the tarball passed to pristine-tar +#filter-pristine-tar = True diff --git a/debian/patches/docs-Drop-external-graphic-in-index.rst.patch b/debian/patches/docs-Drop-external-graphic-in-index.rst.patch new file mode 100644 index 0000000..0cd5285 --- /dev/null +++ b/debian/patches/docs-Drop-external-graphic-in-index.rst.patch @@ -0,0 +1,22 @@ +From: Carsten Schoenert <c.schoenert@t-online.de> +Date: Tue, 12 Sep 2023 12:57:44 +0530 +Subject: docs: Drop external graphic in index.rst + +The badge about the build status for the documentation isn't needed. + +Forwarded: Not-Needed +--- + _doc/index.rst | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/_doc/index.rst b/_doc/index.rst +index 0324eff..83dd9ef 100644 +--- a/_doc/index.rst ++++ b/_doc/index.rst +@@ -22,6 +22,3 @@ Contents: + pyyaml + contributing + upmerge +- +-.. image:: https://readthedocs.org/projects/ruyaml/badge/?version=stable +- :target: https://ruyaml.readthedocs.org/en/stable diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..975a00d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +docs-Drop-external-graphic-in-index.rst.patch +tests-Make-some-tests-compatible-with-Python-3.12.patch diff --git a/debian/patches/tests-Make-some-tests-compatible-with-Python-3.12.patch b/debian/patches/tests-Make-some-tests-compatible-with-Python-3.12.patch new file mode 100644 index 0000000..311ba7b --- /dev/null +++ b/debian/patches/tests-Make-some-tests-compatible-with-Python-3.12.patch @@ -0,0 +1,75 @@ +From: Carsten Schoenert <c.schoenert@t-online.de> +Date: Mon, 1 Jan 2024 12:16:27 +0100 +Subject: tests: Make some tests compatible with Python 3.12 + +--- + _test/test_comments.py | 11 +++++++++-- + _test/test_issues.py | 12 +++++++++--- + 2 files changed, 18 insertions(+), 5 deletions(-) + +diff --git a/_test/test_comments.py b/_test/test_comments.py +index 7973349..d67bd11 100644 +--- a/_test/test_comments.py ++++ b/_test/test_comments.py +@@ -11,6 +11,7 @@ roundtrip changes + """ + + import pytest ++import sys + + from .roundtrip import dedent, round_trip, round_trip_dump, round_trip_load + +@@ -576,7 +577,10 @@ class TestCommentedMapMerge: + ) + assert data['x']['a'] == 1 + assert data['y']['a'] == 1 +- assert str(data['y']) == """ordereddict([('a', 1)])""" ++ if sys.version_info < (3, 12): ++ assert str(data['y']) == """ordereddict([('a', 1)])""" ++ else: ++ assert str(data['y']) == """ordereddict({'a': 1})""" + + def test_issue_60_1(self): + data = round_trip_load( +@@ -590,7 +594,10 @@ class TestCommentedMapMerge: + ) + assert data['x']['a'] == 1 + assert data['y']['a'] == 1 +- assert str(data['y']) == """ordereddict([('b', 2), ('a', 1)])""" ++ if sys.version_info < (3, 12): ++ assert str(data['y']) == """ordereddict([('b', 2), ('a', 1)])""" ++ else: ++ assert str(data['y']) == """ordereddict({'b': 2, 'a': 1})""" + + + class TestEmptyLines: +diff --git a/_test/test_issues.py b/_test/test_issues.py +index 65efa95..7ee3a95 100644 +--- a/_test/test_issues.py ++++ b/_test/test_issues.py +@@ -1,6 +1,7 @@ + # coding: utf-8 + + import pytest # NOQA ++import sys + + from .roundtrip import ( # NOQA + YAML, +@@ -28,9 +29,14 @@ class TestIssues: + ) + data = round_trip_load(s) + assert str(data['comb']) == str(data['def']) +- assert ( +- str(data['comb']) == "ordereddict([('key', 'value'), ('key1', 'value1')])" +- ) ++ if sys.version_info < (3, 12): ++ assert ( ++ str(data['comb']) == "ordereddict([('key', 'value'), ('key1', 'value1')])" ++ ) ++ else: ++ assert ( ++ str(data['comb']) == "ordereddict({'key': 'value', 'key1': 'value1'})" ++ ) + + def test_issue_82(self, tmpdir): + program_src = r''' diff --git a/debian/python-ruyaml-doc.doc-base b/debian/python-ruyaml-doc.doc-base new file mode 100644 index 0000000..ad161d6 --- /dev/null +++ b/debian/python-ruyaml-doc.doc-base @@ -0,0 +1,8 @@ +Document: python-ruyaml-doc +Title: Python YAML package documentation +Abstract: YAML 1.2 loader/dumper package for Python +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/python-ruyaml-doc/html/index.html +Files: /usr/share/doc/python-ruyaml-doc/html/*.html diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..6c8b9ee --- /dev/null +++ b/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +#export DH_VERBOSE = 1 + +export PYBUILD_NAME=ruyaml +export PYBUILD_BEFORE_TEST=cp -a {dir}/_test {build_dir} +export PYBUILD_AFTER_TEST=rm -rf {build_dir}/_test + +include /usr/share/dpkg/pkg-info.mk + +BUILD_DATE = $(shell LC_ALL=C date -u "+%d %B %Y" -d "@$(SOURCE_DATE_EPOCH)") +SPHINXOPTS := -N -D html_last_updated_fmt="$(BUILD_DATE)" + +%: + dh $@ --with python3 --buildsystem=pybuild + +override_dh_clean: + dh_clean + rm -rf .mypy_cache + +override_dh_sphinxdoc: +ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS))) + PYTHONPATH=. python3 -m sphinx -b html $(SPHINXOPTS) _doc $(CURDIR)/debian/python-ruyaml-doc/usr/share/doc/python-ruyaml-doc/html + dh_sphinxdoc +endif diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..cb61fa5 --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +extend-diff-ignore = "^[^/]*[.]egg-info/" diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..bbc131c --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,7 @@ +Tests: smoke +Depends: +# @builddeps@, + python3-all, + python3-pytest, + @, +Restrictions: allow-stderr diff --git a/debian/tests/smoke b/debian/tests/smoke new file mode 100644 index 0000000..c635fe9 --- /dev/null +++ b/debian/tests/smoke @@ -0,0 +1,16 @@ +#! /bin/bash + +cp -r _test ${AUTOPKGTEST_TMP} + +for py3vers in $(py3versions -s); do + echo + echo "***************************" + echo "*** Testing with ${py3vers}" + echo "***************************" + echo + cd ${AUTOPKGTEST_TMP} && \ + echo -e "Content of current working folder:\n" && \ + ls -la && \ + echo -e "Running tests...\n" && \ + PYTHONPATH=. ${py3vers} -m pytest +done diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..aa13625 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,5 @@ +Bug-Database: https://github.com/pycontribs/ruyaml/issues +Bug-Submit: https://github.com/pycontribs/ruyaml/issues/new +FAQ: https://github.com/pycontribs/ruyaml/blob/main/README.rst +Repository: https://github.com/pycontribs/ruyaml.git +Repository-Browse: https://github.com/pycontribs/ruyaml diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..46761e5 --- /dev/null +++ b/debian/watch @@ -0,0 +1,8 @@ +version=4 + +opts="mode=git, \ + compression=gz, \ + uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\.?\d*)$/$1~$2/, \ + dversionmangle=s/\+ds(\.?\d+)?$//" \ +https://github.com/pycontribs/ruyaml.git \ + refs/tags/@ANY_VERSION@ |