Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-jupyter-packaging for
openSUSE:Factory checked in at 2024-09-17 18:18:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jupyter-packaging (Old)
and /work/SRC/openSUSE:Factory/.python-jupyter-packaging.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jupyter-packaging"
Tue Sep 17 18:18:10 2024 rev:10 rq:1201473 version:0.12.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-jupyter-packaging/python-jupyter-packaging.changes
2023-04-02 19:18:21.572819812 +0200
+++
/work/SRC/openSUSE:Factory/.python-jupyter-packaging.new.29891/python-jupyter-packaging.changes
2024-09-17 18:19:07.793322579 +0200
@@ -1,0 +2,7 @@
+Mon Sep 16 19:17:34 UTC 2024 - Ben Greiner <[email protected]>
+
+- Add jupyter-packaging-pr186-bdist_wheel.patch
+ * gh#jupyter/jupyter-packaging#186
+ * gh#jupyter/jupyter-packaging#185
+
+-------------------------------------------------------------------
New:
----
jupyter-packaging-pr186-bdist_wheel.patch
BETA DEBUG BEGIN:
New:
- Add jupyter-packaging-pr186-bdist_wheel.patch
* gh#jupyter/jupyter-packaging#186
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jupyter-packaging.spec ++++++
--- /var/tmp/diff_new_pack.KaCc0R/_old 2024-09-17 18:19:08.225340607 +0200
+++ /var/tmp/diff_new_pack.KaCc0R/_new 2024-09-17 18:19:08.225340607 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-jupyter-packaging
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,8 @@
Source:
https://files.pythonhosted.org/packages/source/j/jupyter_packaging/jupyter_packaging-%{version}.tar.gz
# PATCH-FIX-UPSTREAM jupyter-packaging-pr178-ignoredeprecations.patch
gh#jupyter/jupyter-packaging#178
Patch0:
https://github.com/jupyter/jupyter-packaging/pull/178.patch#/jupyter-packaging-pr178-ignoredeprecations.patch
+# PATCH-FIX-UPSTREAM jupyter-packaging-pr186-bdist_wheel.patch
gh#jupyter/jupyter-packaging#186
+Patch1: jupyter-packaging-pr186-bdist_wheel.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module deprecation}
BuildRequires: %{python_module hatchling}
@@ -59,6 +61,7 @@
%autosetup -p1 -n jupyter_packaging-%{version}
sed -i 's/\r$//' README.md
sed -i -e '/^#!\//, 1d' jupyter_packaging/*.py
+sed -i 's/--color=yes//' pyproject.toml
%build
%pyproject_wheel
@@ -81,5 +84,5 @@
%doc README.md
%license LICENSE
%{python_sitelib}/jupyter_packaging
-%{python_sitelib}/jupyter_packaging-%{version}*-info
+%{python_sitelib}/jupyter_packaging-%{version}.dist-info
++++++ jupyter-packaging-pr186-bdist_wheel.patch ++++++
>From 47614d55dbe2e800c4393ce17f2f284a3c42893d Mon Sep 17 00:00:00 2001
From: Ben Greiner <[email protected]>
Date: Mon, 16 Sep 2024 21:27:04 +0200
Subject: [PATCH 1/3] Try to import bdist_wheel from setuptools first
---
jupyter_packaging/setupbase.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/jupyter_packaging/setupbase.py b/jupyter_packaging/setupbase.py
index f0ebbf4..cb5cd6e 100644
--- a/jupyter_packaging/setupbase.py
+++ b/jupyter_packaging/setupbase.py
@@ -44,10 +44,14 @@
from setuptools.command.develop import develop
from setuptools.command.sdist import sdist
+
try:
- from wheel.bdist_wheel import bdist_wheel
+ from setuptools.command.bdist_wheel import bdist_wheel
except ImportError: # pragma: no cover
- bdist_wheel = None
+ try:
+ from wheel.bdist_wheel import bdist_wheel
+ except ImportError:
+ bdist_wheel = None
if sys.platform == "win32": # pragma: no cover
from subprocess import list2cmdline
>From 49920607b6682df3c6cf480eebf5dc3ee4497c0d Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
<66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 19:30:46 +0000
Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---
jupyter_packaging/setupbase.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/jupyter_packaging/setupbase.py b/jupyter_packaging/setupbase.py
index cb5cd6e..ddc4b13 100644
--- a/jupyter_packaging/setupbase.py
+++ b/jupyter_packaging/setupbase.py
@@ -44,7 +44,6 @@
from setuptools.command.develop import develop
from setuptools.command.sdist import sdist
-
try:
from setuptools.command.bdist_wheel import bdist_wheel
except ImportError: # pragma: no cover
>From b565482ebbad9b132526a463a70841976a030330 Mon Sep 17 00:00:00 2001
From: Ben Greiner <[email protected]>
Date: Mon, 16 Sep 2024 21:47:28 +0200
Subject: [PATCH 3/3] Ignore wheel warning
---
pyproject.toml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index b6739fe..0741903 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -80,5 +80,8 @@ filterwarnings= [
# Ignore our own deprecation warnings.
"ignore:.*:deprecation.DeprecatedWarning",
# Ignore warning raised when importing setuptools.command.develop.
- "ignore:pkg_resources is deprecated as an API:DeprecationWarning"
+ "ignore:pkg_resources is deprecated as an API:DeprecationWarning",
+ # bdist_wheel moved from wheel 0.44+ to setuptools 0.70.1+.
+ # We already handle it but wheel 0.44 could still emit the warning with an
older setuptools.
+ "ignore:The 'wheel' package is no longer the canonical location of the
'bdist_wheel' command:DeprecationWarning",
]
