Package: pykafka Version: 2.7.0-2 Severity: normal Tags: patch pending Block: -1 with 1023910
Dear maintainer, I've prepared an NMU for pykafka (versioned as 2.7.0-2.1) and uploaded it to DELAYED/6. Please feel free to tell me if I should delay it longer. It's delayed, because we need Python 3.11 support in snappy before it'll build. Regards. SR
diff -Nru pykafka-2.7.0/debian/changelog pykafka-2.7.0/debian/changelog --- pykafka-2.7.0/debian/changelog 2022-05-31 09:38:30.000000000 +0200 +++ pykafka-2.7.0/debian/changelog 2022-11-12 14:50:12.000000000 +0200 @@ -1,3 +1,11 @@ +pykafka (2.7.0-2.1) unstable; urgency=medium + + * Patch: Support setuptools 60 (Closes: #1022464) + * Port from nose to pytest. (Closes: #1018446) + * Patch: Update pytest config format. + + -- Stefano Rivera <stefa...@debian.org> Sat, 12 Nov 2022 14:50:12 +0200 + pykafka (2.7.0-2) unstable; urgency=medium [ Ondřej Nový ] diff -Nru pykafka-2.7.0/debian/control pykafka-2.7.0/debian/control --- pykafka-2.7.0/debian/control 2022-05-31 09:38:30.000000000 +0200 +++ pykafka-2.7.0/debian/control 2022-11-12 14:13:42.000000000 +0200 @@ -11,7 +11,6 @@ librdkafka-dev, python3-all-dev, python3-kazoo, - python3-nose, python3-pbr (>= 2.0.0), python3-pytest, python3-pytest-cov, diff -Nru pykafka-2.7.0/debian/patches/pytest-config.patch pykafka-2.7.0/debian/patches/pytest-config.patch --- pykafka-2.7.0/debian/patches/pytest-config.patch 1970-01-01 02:00:00.000000000 +0200 +++ pykafka-2.7.0/debian/patches/pytest-config.patch 2022-11-12 14:17:56.000000000 +0200 @@ -0,0 +1,22 @@ +From: Emmett Butler <emmett.butler...@gmail.com> +Date: Mon, 7 Jan 2019 18:11:31 +0000 +Subject: update setup.cfg config block for pytest compatibility + +Origin: upstream, https://github.com/Parsely/pykafka/commit/a40664c61081ce30b46020ad0e2598fd7cff8afa +--- + setup.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.cfg b/setup.cfg +index 3996b8b..d4345e4 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -3,7 +3,7 @@ logging-clear-handlers = 1 + verbosity = 2 + detailed-errors = 1 + +-[pytest] ++[tool:pytest] + norecursedirs = build docs/_build *.egg .tox *.venv requirements/ + addopts = + # Shows a line for every test diff -Nru pykafka-2.7.0/debian/patches/series pykafka-2.7.0/debian/patches/series --- pykafka-2.7.0/debian/patches/series 2022-05-31 09:38:30.000000000 +0200 +++ pykafka-2.7.0/debian/patches/series 2022-11-12 14:17:56.000000000 +0200 @@ -1,2 +1,4 @@ remove-extra-test-dependencies.patch remove-broken-test.patch +setuptools-60.patch +pytest-config.patch diff -Nru pykafka-2.7.0/debian/patches/setuptools-60.patch pykafka-2.7.0/debian/patches/setuptools-60.patch --- pykafka-2.7.0/debian/patches/setuptools-60.patch 1970-01-01 02:00:00.000000000 +0200 +++ pykafka-2.7.0/debian/patches/setuptools-60.patch 2022-11-12 14:13:42.000000000 +0200 @@ -0,0 +1,35 @@ +From: Stefano Rivera <stefa...@debian.org> +Date: Sat, 12 Nov 2022 14:09:01 +0200 +Subject: 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. + +Bug-Debian: https://bugs.debian.org/1022464 +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index cf95a9a..898dcb2 100755 +--- a/setup.py ++++ b/setup.py +@@ -19,11 +19,11 @@ import sys + import os + import platform + +-from distutils.command.build_ext import build_ext +-from distutils.errors import CCompilerError, DistutilsExecError, DistutilsPlatformError + from setuptools import setup, find_packages + from setuptools.command.test import test as TestCommand + from setuptools.extension import Extension ++from distutils.command.build_ext import build_ext ++from distutils.errors import CCompilerError, DistutilsExecError, DistutilsPlatformError + + if sys.version_info < (2, 7): + raise Exception('pykafka requires Python 2.7 or higher.') diff -Nru pykafka-2.7.0/debian/rules pykafka-2.7.0/debian/rules --- pykafka-2.7.0/debian/rules 2022-05-31 09:38:30.000000000 +0200 +++ pykafka-2.7.0/debian/rules 2022-11-12 14:29:27.000000000 +0200 @@ -6,9 +6,18 @@ export PYBUILD_NAME=pykafka export PYBUILD_BEFORE_TEST=cp -r {dir}/tests {build_dir}/ export PYBUILD_AFTER_TEST=rm -rf {build_dir}/tests -export PYBUILD_TEST_NOSE=1 export PYBUILD_DISABLE_python2=1 -export PYBUILD_TEST_ARGS_python3=tests --ignore-files='test_(?:simpleconsumer|ssl|producer|partition|cluster|balancedconsumer|rd_kafka_consumer|simple_consumer|compression).*.py' +export PYBUILD_TEST_ARGS_python3=tests \ + --ignore=tests/pykafka/rdkafka/test_rd_kafka_consumer.py \ + --ignore=tests/pykafka/rdkafka/test_simple_consumer.py \ + --ignore=tests/pykafka/rdkafka/test_ssl.py \ + --ignore=tests/pykafka/test_balancedconsumer.py \ + --ignore=tests/pykafka/test_cluster.py \ + --ignore=tests/pykafka/test_partition.py \ + --ignore=tests/pykafka/test_producer.py \ + --ignore=tests/pykafka/test_simpleconsumer.py \ + --ignore=tests/pykafka/test_ssl.py \ + --ignore=tests/pykafka/utils/test_compression.py export no_proxy=example.com
