Package: python-pyeclib
Version: 1.6.0-7
Severity: normal
Tags: patch  pending

Dear maintainer,

I've prepared an NMU for python-pyeclib (versioned as 1.6.0-7.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

SR
diff -Nru python-pyeclib-1.6.0/debian/changelog python-pyeclib-1.6.0/debian/changelog
--- python-pyeclib-1.6.0/debian/changelog	2021-11-12 20:11:24.000000000 +0200
+++ python-pyeclib-1.6.0/debian/changelog	2022-11-12 17:56:43.000000000 +0200
@@ -1,3 +1,11 @@
+python-pyeclib (1.6.0-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: Support setuptools >= 60. (Closes: #1022470)
+  * Switch from nose to pytest. (Closes: #1018561)
+
+ -- Stefano Rivera <stefa...@debian.org>  Sat, 12 Nov 2022 17:56:43 +0200
+
 python-pyeclib (1.6.0-7) unstable; urgency=medium
 
   * Add Use_Py_ssize_t_when_calling_PyArg_Parse.patch (Closes: #999391).
diff -Nru python-pyeclib-1.6.0/debian/control python-pyeclib-1.6.0/debian/control
--- python-pyeclib-1.6.0/debian/control	2021-11-12 20:11:24.000000000 +0200
+++ python-pyeclib-1.6.0/debian/control	2022-11-12 17:55:18.000000000 +0200
@@ -12,7 +12,7 @@
  libisal-dev [amd64 kfreebsd-amd64 arm64],
  libjerasure-dev (>= 2.0.0+2017.04.10.git.de1739cc84),
  python3-all-dev,
- python3-nose,
+ python3-pytest,
  python3-setuptools,
  python3-six (>= 1.9.0),
 Standards-Version: 4.4.1
diff -Nru python-pyeclib-1.6.0/debian/patches/series python-pyeclib-1.6.0/debian/patches/series
--- python-pyeclib-1.6.0/debian/patches/series	2021-11-12 20:11:24.000000000 +0200
+++ python-pyeclib-1.6.0/debian/patches/series	2022-11-12 17:52:08.000000000 +0200
@@ -1 +1,2 @@
 Use_Py_ssize_t_when_calling_PyArg_Parse.patch
+setuptools-60.patch
diff -Nru python-pyeclib-1.6.0/debian/patches/setuptools-60.patch python-pyeclib-1.6.0/debian/patches/setuptools-60.patch
--- python-pyeclib-1.6.0/debian/patches/setuptools-60.patch	1970-01-01 02:00:00.000000000 +0200
+++ python-pyeclib-1.6.0/debian/patches/setuptools-60.patch	2022-11-12 17:54:12.000000000 +0200
@@ -0,0 +1,33 @@
+Description: Import setuptools before distutils
+ setuptools 60 uses its own bundled 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 change in setuptools is to prepare for Python 3.12, which will drop
+ distutils.
+Author: Stefano Rivera <stefa...@debian.org>
+Bug-Debian: https://bugs.debian.org/1022470
+Forwarded: https://review.opendev.org/c/openstack/pyeclib/+/864336
+--- a/setup.py
++++ b/setup.py
+@@ -32,9 +32,6 @@
+ 
+ import ctypes
+ from ctypes.util import find_library
+-from distutils.command.build import build as _build
+-from distutils.command.clean import clean as _clean
+-from distutils.sysconfig import get_python_inc
+ 
+ try:
+     from setuptools import setup
+@@ -43,6 +40,9 @@
+     use_setuptools()
+     from setuptools import setup
+ 
++from distutils.command.build import build as _build
++from distutils.command.clean import clean as _clean
++from distutils.sysconfig import get_python_inc
+ from setuptools import Extension
+ from setuptools.command.install import install as _install
+ 
diff -Nru python-pyeclib-1.6.0/debian/rules python-pyeclib-1.6.0/debian/rules
--- python-pyeclib-1.6.0/debian/rules	2021-11-12 20:11:24.000000000 +0200
+++ python-pyeclib-1.6.0/debian/rules	2022-11-12 17:56:43.000000000 +0200
@@ -2,7 +2,7 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export PYBUILD_NAME=py
-export PYBUILD_TEST_ARGS=-e test_get_metadata_memory_usage
+export PYBUILD_TEST_ARGS=-k 'not test_get_metadata_memory_usage'
 
 UPSTREAM_GIT = https://github.com/openstack/pyeclib.git
 -include /usr/share/openstack-pkg-tools/pkgos.make

Reply via email to