Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-distutils-extra for
openSUSE:Factory checked in at 2023-04-16 19:39:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-distutils-extra (Old)
and /work/SRC/openSUSE:Factory/.python-distutils-extra.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-distutils-extra"
Sun Apr 16 19:39:04 2023 rev:33 rq:1079775 version:2.50
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-distutils-extra/python-distutils-extra.changes
2023-02-10 14:35:55.106134963 +0100
+++
/work/SRC/openSUSE:Factory/.python-distutils-extra.new.19717/python-distutils-extra.changes
2023-04-16 19:39:06.350376148 +0200
@@ -1,0 +2,9 @@
+Sun Apr 16 16:52:43 UTC 2023 - Dirk Müller <dmuel...@suse.com>
+
+- update to 2.50:
+ * Fix KeyError on .egg-info files in debian directory
+ (regression in 2.48)
+ * setup.py: Check that Debian version starts with
+ DistUtilsExtra version
+
+-------------------------------------------------------------------
Old:
----
python-distutils-extra-2.49.tar.bz2
New:
----
python-distutils-extra-2.50.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-distutils-extra.spec ++++++
--- /var/tmp/diff_new_pack.51Z8JV/_old 2023-04-16 19:39:06.734378434 +0200
+++ /var/tmp/diff_new_pack.51Z8JV/_new 2023-04-16 19:39:06.742378481 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-distutils-extra
-Version: 2.49
+Version: 2.50
Release: 0
Summary: Distutils/Setuptools Adapter
License: GPL-2.0-only
++++++ python-distutils-extra-2.49.tar.bz2 ->
python-distutils-extra-2.50.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-distutils-extra-2.49/DistUtilsExtra/__init__.py
new/python-distutils-extra-2.50/DistUtilsExtra/__init__.py
--- old/python-distutils-extra-2.49/DistUtilsExtra/__init__.py 2023-01-30
06:55:51.000000000 +0100
+++ new/python-distutils-extra-2.50/DistUtilsExtra/__init__.py 2023-02-14
12:39:58.000000000 +0100
@@ -1 +1 @@
-__version__ = '2.39'
+__version__ = '2.50'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-distutils-extra-2.49/DistUtilsExtra/auto.py
new/python-distutils-extra-2.50/DistUtilsExtra/auto.py
--- old/python-distutils-extra-2.49/DistUtilsExtra/auto.py 2023-01-30
06:55:51.000000000 +0100
+++ new/python-distutils-extra-2.50/DistUtilsExtra/auto.py 2023-02-14
12:39:58.000000000 +0100
@@ -81,13 +81,14 @@
# ignore packaging
ignore_dirs = ['etc', 'DistUtilsExtra', 'debian']
- for f in src.copy():
- for d in ignore_dirs:
- if f.startswith(d + os.path.sep):
- src.remove(f)
+ def should_be_ignored(path: str) -> bool:
+ for ignore_dir in ignore_dirs:
+ if path.startswith(ignore_dir + os.path.sep):
+ return True
# Also remove files from the .egg-info directory
- if '.egg-info/' in f:
- src.remove(f)
+ return '.egg-info/' in path
+
+ src = {f for f in src if not should_be_ignored(f)}
__cmdclass(attrs)
__modules(attrs, src)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-distutils-extra-2.49/debian/changelog
new/python-distutils-extra-2.50/debian/changelog
--- old/python-distutils-extra-2.49/debian/changelog 2023-01-30
06:55:51.000000000 +0100
+++ new/python-distutils-extra-2.50/debian/changelog 2023-02-14
12:39:58.000000000 +0100
@@ -1,3 +1,12 @@
+python-distutils-extra (2.50) unstable; urgency=medium
+
+ * Team upload.
+ * Fix KeyError on .egg-info files in debian directory (regression in 2.48)
+ * setup.py: Check that Debian version starts with DistUtilsExtra version
+ (LP: #1919004)
+
+ -- Benjamin Drung <bdr...@ubuntu.com> Tue, 14 Feb 2023 12:37:27 +0100
+
python-distutils-extra (2.49) unstable; urgency=medium
* Add missing python3-setuptools Depends, fixes autopkgtest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-distutils-extra-2.49/setup.py
new/python-distutils-extra-2.50/setup.py
--- old/python-distutils-extra-2.49/setup.py 2023-01-30 06:55:51.000000000
+0100
+++ new/python-distutils-extra-2.50/setup.py 2023-02-14 12:39:58.000000000
+0100
@@ -1,26 +1,56 @@
#!/usr/bin/env python
-from setuptools import setup
+import pathlib
+import re
import sys
-sys.path.insert(0, '.')
+from setuptools import setup
+
+sys.path.insert(0, ".")
from DistUtilsExtra import __version__ as pkgversion
+
+def get_debian_version() -> str:
+ """Look what Debian version we have."""
+ changelog = pathlib.Path(__file__).parent / "debian" / "changelog"
+ with changelog.open("r", encoding="utf-8") as changelog_f:
+ head = changelog_f.readline()
+ match = re.compile(r".*\((.*)\).*").match(head)
+ if not match:
+ raise ValueError(f"Failed to extract Debian version from '{head}'.")
+ return match.group(1)
+
+
+def _check_debian_version() -> None:
+ debian_version = get_debian_version()
+ if not debian_version.startswith(pkgversion):
+ print(
+ f"Error: Debian version '{debian_version}' does not"
+ f" start with DistUtilsExtra.__version__ '{pkgversion}'.",
+ file=sys.stderr,
+ )
+ sys.exit(1)
+
+
+_check_debian_version()
+
setup(
- name = 'python-distutils-extra',
- version = pkgversion,
- author = 'Sebastian Heinlein, Martin Pitt',
- author_email = 's...@glatzor.de, martin.p...@ubuntu.com',
- description = 'Add support for i18n, documentation and icons to distutils',
- packages = ['DistUtilsExtra', 'DistUtilsExtra.command'],
- license = 'GNU GPL',
- platforms = 'posix',
- entry_points = {"distutils.commands": [
- "build = DistUtilsExtra.command.build_extra:build",
- "build_i18n = DistUtilsExtra.command.build_i18n:build_i18n",
- "build_icons = DistUtilsExtra.command.build_icons:build_icons",
- "build_help = DistUtilsExtra.command.build_help:build_help",
- "clean_i18n = DistUtilsExtra.command.clean_i18n:clean_i18n",
- "pylint = DistUtilsExtra.command.pylint:pylint",
- ],},
+ name="python-distutils-extra",
+ version=pkgversion,
+ author="Sebastian Heinlein, Martin Pitt",
+ author_email="s...@glatzor.de, martin.p...@ubuntu.com",
+ description="Add support for i18n, documentation and icons to distutils",
+ packages=["DistUtilsExtra", "DistUtilsExtra.command"],
+ license="GNU GPL",
+ platforms="posix",
+ entry_points={
+ "distutils.commands": [
+ "build = DistUtilsExtra.command.build_extra:build",
+ "build_i18n = DistUtilsExtra.command.build_i18n:build_i18n",
+ "build_icons = DistUtilsExtra.command.build_icons:build_icons",
+ "build_help = DistUtilsExtra.command.build_help:build_help",
+ "clean_i18n = DistUtilsExtra.command.clean_i18n:clean_i18n",
+ "pylint = DistUtilsExtra.command.pylint:pylint",
+ ]
+ },
)
