--- Begin Message ---
Package: cdist
Version: 6.9.4-1
Severity: normal
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu jammy
Dear Maintainer,
This bug report was also filed in Ubuntu and can be found at
https://launchpad.net/bugs/1959330
autopkgtest will fail when python3.10 is used. Upstream has fixed relevant
things already, so here's a patch with those commits.
-Dan
diff -Nru cdist-6.9.4/debian/changelog cdist-6.9.4/debian/changelog
--- cdist-6.9.4/debian/changelog 2021-02-07 00:45:26.000000000 -0700
+++ cdist-6.9.4/debian/changelog 2022-01-27 11:45:53.000000000 -0700
@@ -1,3 +1,11 @@
+cdist (6.9.4-1.1) jammy; urgency=medium
+
+ * Cherry-pick 2 commits for python 3.10 compatibility
+ * Fix version compare
+ * Fix transition of some classes from collections to collections.abc
+
+ -- Dan Bungert <daniel.bungert@canonical.com> Thu, 27 Jan 2022 11:45:53 -0700
+
cdist (6.9.4-1) unstable; urgency=medium
* QA upload.
diff -Nru cdist-6.9.4/debian/patches/collections-abc.patch cdist-6.9.4/debian/patches/collections-abc.patch
--- cdist-6.9.4/debian/patches/collections-abc.patch 1969-12-31 17:00:00.000000000 -0700
+++ cdist-6.9.4/debian/patches/collections-abc.patch 2022-01-27 11:45:53.000000000 -0700
@@ -0,0 +1,36 @@
+Description: Python 3.10: collections.X -> collections.abc.X
+Origin: https://code.ungleich.ch/ungleich-public/cdist/commit/3a321469a8ba5aea55220bd70bd4900de732e917
+Author: Timothée Floure <timothee.floure@posteo.net>
+Forwarded: 'not-needed'
+Last-Update: 2022-01-27
+--- a/cdist/integration.py
++++ b/cdist/integration.py
+@@ -84,7 +84,7 @@
+ """
+ if isinstance(host, str):
+ hosts = [host, ]
+- elif isinstance(host, collections.Iterable):
++ elif isinstance(host, collections.abc.Iterable):
+ hosts = host
+ else:
+ raise cdist.Error('Invalid host argument: {}'.format(host))
+--- a/cdist/util/fsproperty.py
++++ b/cdist/util/fsproperty.py
+@@ -33,7 +33,7 @@
+ return 'Absolute path required, got: %s' % self.path
+
+
+-class FileList(collections.MutableSequence):
++class FileList(collections.abc.MutableSequence):
+ """A list that stores it's state in a file.
+
+ """
+@@ -102,7 +102,7 @@
+ self.__write(lines)
+
+
+-class DirectoryDict(collections.MutableMapping):
++class DirectoryDict(collections.abc.MutableMapping):
+ """A dict that stores it's items as files in a directory.
+
+ """
diff -Nru cdist-6.9.4/debian/patches/series cdist-6.9.4/debian/patches/series
--- cdist-6.9.4/debian/patches/series 2021-02-07 00:45:26.000000000 -0700
+++ cdist-6.9.4/debian/patches/series 2022-01-27 11:45:53.000000000 -0700
@@ -1 +1,3 @@
explicitly-specify-path-one-remote-side.patch
+collections-abc.patch
+version-compare.patch
diff -Nru cdist-6.9.4/debian/patches/version-compare.patch cdist-6.9.4/debian/patches/version-compare.patch
--- cdist-6.9.4/debian/patches/version-compare.patch 1969-12-31 17:00:00.000000000 -0700
+++ cdist-6.9.4/debian/patches/version-compare.patch 2022-01-27 11:45:53.000000000 -0700
@@ -0,0 +1,33 @@
+Description: [bin/cdist] Fix Python version check
+Origin: https://code.ungleich.ch/ungleich-public/cdist/commit/1c047353a95e7ac079ccf89af8fc232451b8f891
+Author: Dennis Camera <dennis.camera@ssrq-sds-fds.ch>
+Forwarded: 'not-needed'
+Last-Update: 2021-04-17
+--- a/bin/cdist
++++ b/bin/cdist
+@@ -72,9 +72,11 @@
+
+
+ if __name__ == "__main__":
+- if sys.version < cdist.MIN_SUPPORTED_PYTHON_VERSION:
+- print('Python >= {} is required on the source host.'.format(
+- cdist.MIN_SUPPORTED_PYTHON_VERSIO), file=sys.stderr)
++ if sys.version_info[:3] < cdist.MIN_SUPPORTED_PYTHON_VERSION:
++ print(
++ 'Python >= {} is required on the source host.'.format(
++ ".".join(map(str, cdist.MIN_SUPPORTED_PYTHON_VERSION))),
++ file=sys.stderr)
+ sys.exit(1)
+
+ exit_code = 0
+--- a/cdist/__init__.py
++++ b/cdist/__init__.py
+@@ -64,7 +64,7 @@
+ REMOTE_CMDS_CLEANUP_PATTERN = "ssh -o User=root -O exit -S {}"
+
+
+-MIN_SUPPORTED_PYTHON_VERSION = '3.5'
++MIN_SUPPORTED_PYTHON_VERSION = (3, 5)
+
+
+ class Error(Exception):
--- End Message ---
--- Begin Message ---
Source: cdist
Source-Version: 6.9.8-1
Done: Stefano Rivera <stefanor@debian.org>
We believe that the bug you reported is fixed in the latest version of
cdist, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1004446@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Stefano Rivera <stefanor@debian.org> (supplier of updated cdist package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 16 Apr 2022 17:28:51 -0400
Source: cdist
Architecture: source
Version: 6.9.8-1
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Stefano Rivera <stefanor@debian.org>
Closes: 1004446
Changes:
cdist (6.9.8-1) unstable; urgency=medium
.
* QA upload.
* New upstream release.
* Update watch file for gitea migration, upstream.
- Remove upstream signing key, no longer useful.
* Update copyright.
* Refresh patches.
* Write a version.py, upstream isn't including it or the tools to generate
it.
* Patch: Python 3.10 support (Closes: #1004446)
* Bump Standards-Version to 4.6.0, no changes needed.
* Bump debhelper compat level to 13.
Checksums-Sha1:
bf5d0035b1437fd457f1425aa63719d9acd0441e 1417 cdist_6.9.8-1.dsc
efaf0d69ccf10bcfcf83b94b66c97442c70b2410 1385902 cdist_6.9.8.orig.tar.gz
8b8d7245431d93d07961fbdbe73c86255fbcb4ac 7508 cdist_6.9.8-1.debian.tar.xz
8e4a72f3f5fb09de7dadec895f227c41dc05f5aa 7005 cdist_6.9.8-1_source.buildinfo
Checksums-Sha256:
258aba6ea2693440c192a56e61aeadd1fc0162c9bd26cf66ebce543f84a12918 1417 cdist_6.9.8-1.dsc
b6913ecf5953b2592bc0e6b357aaa8592f5ab8c28ba5921a3d0b9de88a8445b9 1385902 cdist_6.9.8.orig.tar.gz
942389c780049b4e96c30fcbacbb4c22cdd153d9d17d7a7305c65cb6ea3266d9 7508 cdist_6.9.8-1.debian.tar.xz
7f5d6827ba7c67a82f795c8d5589cd61f55b7227eb3fca6f594ab8091dbb2f62 7005 cdist_6.9.8-1_source.buildinfo
Files:
1e545bec5c39e28ea64fd0a57b375b52 1417 admin optional cdist_6.9.8-1.dsc
cf119b4b79f3b7ab21f4146c66d86fa9 1385902 admin optional cdist_6.9.8.orig.tar.gz
186ae65aba40d6e497173a45884e86b0 7508 admin optional cdist_6.9.8-1.debian.tar.xz
832bee7e3fb48915fd6113e33acc130e 7005 admin optional cdist_6.9.8-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iIoEARYKADIWIQTumtb5BSD6EfafSCRHew2wJjpU2AUCYls1MhQcc3RlZmFub3JA
ZGViaWFuLm9yZwAKCRBHew2wJjpU2FWiAQD72N3ylhY0lcHfGeCGzLvYmFnK/DT8
8e9s7AwncfEYlAEA6O4NXY/fQVlAbsvk2lh264lsm3A8orRwUS8Ca3BiaQ0=
=Q7dq
-----END PGP SIGNATURE-----
--- End Message ---