Control: tags 1022318 + patch Control: tags 1022318 + pending Dear maintainer,
I've prepared an NMU for python-pyhcl (versioned as 0.4.4-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards, SR
diff -Nru python-pyhcl-0.4.4/debian/changelog python-pyhcl-0.4.4/debian/changelog --- python-pyhcl-0.4.4/debian/changelog 2021-08-20 20:46:40.000000000 +0200 +++ python-pyhcl-0.4.4/debian/changelog 2022-11-05 20:00:30.000000000 +0200 @@ -1,3 +1,10 @@ +python-pyhcl (0.4.4-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Support setuptools 60. (Closes: #1022318) + + -- Stefano Rivera <stefa...@debian.org> Sat, 05 Nov 2022 20:00:30 +0200 + python-pyhcl (0.4.4-2) unstable; urgency=medium * Reupload source-only. diff -Nru python-pyhcl-0.4.4/debian/patches/series python-pyhcl-0.4.4/debian/patches/series --- python-pyhcl-0.4.4/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ python-pyhcl-0.4.4/debian/patches/series 2022-11-05 19:58:22.000000000 +0200 @@ -0,0 +1 @@ +setuptools-60 diff -Nru python-pyhcl-0.4.4/debian/patches/setuptools-60 python-pyhcl-0.4.4/debian/patches/setuptools-60 --- python-pyhcl-0.4.4/debian/patches/setuptools-60 1970-01-01 02:00:00.000000000 +0200 +++ python-pyhcl-0.4.4/debian/patches/setuptools-60 2022-11-05 20:00:30.000000000 +0200 @@ -0,0 +1,28 @@ +Description: Import setuptools before distutils + setuptools 60 uses its own bunlded version of distutils, by default. It + injects this into sys.modules, at import time. So we need to make sure that it + is imported, before anything else imports distutils, to ensure everything is + using the same distutils version. + . + This is to prepare for Python 3.12, which will drop distutils. +Author: Stefano Rivera <stefa...@debian.org> +Forwarded: https://github.com/virtuald/pyhcl/pull/84 +Bug-Debian: https://bugs.debian.org/1022318 +--- a/setup.py ++++ b/setup.py +@@ -3,13 +3,14 @@ + from __future__ import print_function + + from os.path import abspath, dirname, join, exists +-from distutils.core import setup + + try: + from setuptools.command.build_py import build_py as _build_py + except ImportError: + from distutils.command.build_py import build_py as _build_py + ++from distutils.core import setup ++ + import os + import sys + import subprocess
