[med-svn] [Git][med-team/python-etelemetry][master] 9 commits: d/control: Bump Standards-Version to 4.7.4, drop Priority: tag
Andreas Tille (@tille)
gitlab at salsa.debian.org
Mon Apr 13 15:00:15 BST 2026
Andreas Tille pushed to branch master at Debian Med / python-etelemetry
Commits:
30b618ed by Karsten Schöke at 2026-04-13T11:40:37+02:00
d/control: Bump Standards-Version to 4.7.4, drop Priority: tag
- - - - -
5a640871 by Karsten Schöke at 2026-04-13T11:46:03+02:00
d/watch: Rewrite in v5 format.
- - - - -
0b0e6c56 by Karsten Schöke at 2026-04-13T11:47:58+02:00
d/control: drop "Rules-Requires-Root: no": it is the default now
- - - - -
d3db5f9d by Karsten Schöke at 2026-04-13T12:02:57+02:00
remove obsolete d/tests dir
- - - - -
0f839c94 by Karsten Schöke at 2026-04-13T12:25:22+02:00
d/rules: Deleting unnecessary files from the library.
- - - - -
ee665492 by Karsten Schöke at 2026-04-13T14:01:11+02:00
add patch to change from deprecated distutils to setuptools.
- - - - -
b369b36d by Karsten Schöke at 2026-04-13T14:40:58+02:00
d/rules: Explicitly disabled the online-only tests.
- - - - -
70a87a13 by Karsten Schöke at 2026-04-13T14:43:39+02:00
Prepare changelog for 0.3.1-2 release.
- - - - -
a4085845 by Andreas Tille at 2026-04-13T16:00:12+02:00
Merge branch 'karso' into 'master'
Fix #1108781
See merge request med-team/python-etelemetry!2
- - - - -
8 changed files:
- debian/changelog
- debian/control
- + debian/patches/Remove-deprecated-distutils-usage-from-versioneer_py.patch
- + debian/patches/series
- debian/rules
- − debian/tests/control
- − debian/tests/run-unit-test
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+python-etelemetry (0.3.1-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * d/control: Bump Standards-Version to 4.7.4, drop Priority: tag
+ * d/watch: Rewrite in v5 format.
+ * d/control: drop "Rules-Requires-Root: no": it is the default now
+ * remove obsolete d/tests dir
+ * d/rules: Deleting unnecessary files from the library.
+ * add patch to change from deprecated distutils to setuptools.
+ * d/rules: Explicitly disabled the online-only tests.
+ (Closes: #1108781)
+
+ -- Karsten Schöke <karsten.schoeke at geobasis-bb.de> Mon, 13 Apr 2026 14:42:08 +0200
+
python-etelemetry (0.3.1-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -1,21 +1,19 @@
Source: python-etelemetry
Section: python
-Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Andreas Tille <tille at debian.org>,
Yaroslav Halchenko <debian at onerussian.com>,
Build-Depends: debhelper-compat (= 13),
dh-sequence-python3,
python3-all,
- python3-setuptools,
python3-ci-info,
python3-requests <!nocheck>,
- python3-pytest <!nocheck>
-Standards-Version: 4.6.2
+ python3-pytest <!nocheck>,
+ python3-setuptools,
+Standards-Version: 4.7.4
Vcs-Browser: https://salsa.debian.org/med-team/python-etelemetry
Vcs-Git: https://salsa.debian.org/med-team/python-etelemetry.git
Homepage: https://github.com/sensein/etelemetry-client/
-Rules-Requires-Root: no
Testsuite: autopkgtest-pkg-pybuild
Package: python3-etelemetry
=====================================
debian/patches/Remove-deprecated-distutils-usage-from-versioneer_py.patch
=====================================
@@ -0,0 +1,94 @@
+From: =?utf-8?q?Karsten_Sch=C3=B6ke?= <karsten.schoeke at geobasis-bb.de>
+Date: Mon, 13 Apr 2026 13:52:10 +0200
+Subject: Remove deprecated distutils usage from versioneer.py
+ The bundled versioneer.py uses the deprecated Python standard library
+ module 'distutils', which has been deprecated since Python 3.10 and
+ removed in Python 3.12.
+
+ This patch replaces all remaining imports of distutils with their
+ setuptools equivalents and removes legacy fallback code paths that
+ attempted to support both distutils and setuptools.
+
+ In the Debian build environment, setuptools is always available, so
+ these fallbacks are no longer necessary. This ensures compatibility
+ with Python 3.12+ and avoids Lintian warnings about deprecated
+ distutils usage.
+
+Forwarded: not-needed
+---
+ versioneer.py | 35 ++++-------------------------------
+ 1 file changed, 4 insertions(+), 31 deletions(-)
+
+diff --git a/versioneer.py b/versioneer.py
+index b4cd1d6..3d6db15 100644
+--- a/versioneer.py
++++ b/versioneer.py
+@@ -1747,8 +1747,7 @@ def get_cmdclass(cmdclass=None):
+
+ cmds = {} if cmdclass is None else cmdclass.copy()
+
+- # we add "version" to both distutils and setuptools
+- from distutils.core import Command
++ from setuptools import Command
+
+ class cmd_version(Command):
+ description = "report generated version string"
+@@ -1771,28 +1770,9 @@ def get_cmdclass(cmdclass=None):
+ print(" error: %s" % vers["error"])
+ cmds["version"] = cmd_version
+
+- # we override "build_py" in both distutils and setuptools
+- #
+- # most invocation pathways end up running build_py:
+- # distutils/build -> build_py
+- # distutils/install -> distutils/build ->..
+- # setuptools/bdist_wheel -> distutils/install ->..
+- # setuptools/bdist_egg -> distutils/install_lib -> build_py
+- # setuptools/install -> bdist_egg ->..
+- # setuptools/develop -> ?
+- # pip install:
+- # copies source tree to a tempdir before running egg_info/etc
+- # if .git isn't copied too, 'git describe' will fail
+- # then does setup.py bdist_wheel, or sometimes setup.py install
+- # setup.py egg_info -> ?
+-
+- # we override different "build_py" commands for both environments
++ from setuptools.command.build_py import build_py as _build_py
+ if 'build_py' in cmds:
+ _build_py = cmds['build_py']
+- elif "setuptools" in sys.modules:
+- from setuptools.command.build_py import build_py as _build_py
+- else:
+- from distutils.command.build_py import build_py as _build_py
+
+ class cmd_build_py(_build_py):
+ def run(self):
+@@ -1809,12 +1789,9 @@ def get_cmdclass(cmdclass=None):
+ write_to_version_file(target_versionfile, versions)
+ cmds["build_py"] = cmd_build_py
+
++ from setuptools.command.build_ext import build_ext as _build_ext
+ if 'build_ext' in cmds:
+ _build_ext = cmds['build_ext']
+- elif "setuptools" in sys.modules:
+- from setuptools.command.build_ext import build_ext as _build_ext
+- else:
+- from distutils.command.build_ext import build_ext as _build_ext
+
+ class cmd_build_ext(_build_ext):
+ def run(self):
+@@ -1893,13 +1870,9 @@ def get_cmdclass(cmdclass=None):
+ })
+ cmds["py2exe"] = cmd_py2exe
+
+- # we override different "sdist" commands for both environments
++ from setuptools.command.sdist import sdist as _sdist
+ if 'sdist' in cmds:
+ _sdist = cmds['sdist']
+- elif "setuptools" in sys.modules:
+- from setuptools.command.sdist import sdist as _sdist
+- else:
+- from distutils.command.sdist import sdist as _sdist
+
+ class cmd_sdist(_sdist):
+ def run(self):
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+Remove-deprecated-distutils-usage-from-versioneer_py.patch
=====================================
debian/rules
=====================================
@@ -1,11 +1,14 @@
#!/usr/bin/make -f
export PYBUILD_NAME=etelemetry
-export PYBUILD_TEST_PYTEST = 1
+export PYBUILD_TEST_ARGS=-v {dir}/etelemetry/tests/ \
+ -k 'not test_etrequest \
+ and not test_get_project \
+ and not test_check_available \
+ '
-ifeq ($(PYBUILD_AUTOPKGTEST),1)
-export PYBUILD_TEST_ARGS_python3=-v {dir}/etelemetry/tests/
-endif
+export PYBUILD_AFTER_INSTALL= rm -fr {destdir}/usr/lib/python3*/dist-packages/etelemetry-*/*.txt \
+ rm -fr {destdir}/usr/lib/python3*/dist-packages/etelemetry/tests
# Should redirect remote access but does not help either
# export https_proxy=http://127.0.0.1:9/
=====================================
debian/tests/control deleted
=====================================
@@ -1,2 +0,0 @@
-Tests: run-unit-test
-Depends: @, python3-all, python3-pytest
=====================================
debian/tests/run-unit-test deleted
=====================================
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-for py in $(py3versions -s)
-do
- pushd etelemetry/tests
- echo "Testing with $py in $(pwd):"
- http_proxy="" $py -m pytest -v
- popd
-done
=====================================
debian/watch
=====================================
@@ -1,4 +1,5 @@
-version=4
+Version: 5
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
- https://github.com/sensein/etelemetry-client/tags .*/v?@ANY_VERSION@@ARCHIVE_EXT@
+Template: Github
+Owner: sensein
+Project: etelemetry-client
View it on GitLab: https://salsa.debian.org/med-team/python-etelemetry/-/compare/374b5f814d2c7f05109a2ee1832dad3c3a725a02...a408584575fdef3997b1e4c681efa72e39c696b8
--
View it on GitLab: https://salsa.debian.org/med-team/python-etelemetry/-/compare/374b5f814d2c7f05109a2ee1832dad3c3a725a02...a408584575fdef3997b1e4c681efa72e39c696b8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260413/d7bd35a3/attachment-0001.htm>
More information about the debian-med-commit
mailing list