Accepting request 1248987 from devel:languages:python:jupyter

OBS-URL: https://build.opensuse.org/request/show/1248987
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-jupyter-packaging?expand=0&rev=11

jupyter-packaging-pr186-bdist_wheel.patch

@@ -0,0 +1,78 @@
+From 47614d55dbe2e800c4393ce17f2f284a3c42893d Mon Sep 17 00:00:00 2001
+From: Ben Greiner <code@bnavigator.de>
+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 <code@bnavigator.de>
+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",
+ ]

python-jupyter-packaging.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Feb 27 12:43:25 UTC 2025 - ecsos <ecsos@opensuse.org>
+
+- Add %{?sle15_python_module_pythons}
+
+-------------------------------------------------------------------
+Mon Sep 16 19:17:34 UTC 2024 - Ben Greiner <code@bnavigator.de>
+
+- Add jupyter-packaging-pr186-bdist_wheel.patch
+  * gh#jupyter/jupyter-packaging#186
+  * gh#jupyter/jupyter-packaging#185
+
 -------------------------------------------------------------------
 Sat Apr  1 20:23:48 UTC 2023 - Ben Greiner <code@bnavigator.de>
 

python-jupyter-packaging.spec

@@ -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
@@ -16,6 +16,7 @@
 #
 
 
+%{?sle15_python_module_pythons}
 Name:           python-jupyter-packaging
 Version:        0.12.3
 Release:        0
@@ -26,6 +27,8 @@ URL:            https://github.com/jupyter/jupyter-packaging
 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 +62,7 @@ with and without accompanying JavaScript packages
 %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,6 +85,6 @@ donttest+=" or test_run"
 %doc README.md
 %license LICENSE
 %{python_sitelib}/jupyter_packaging
-%{python_sitelib}/jupyter_packaging-%{version}*-info
+%{python_sitelib}/jupyter_packaging-%{version}.dist-info
 
 %changelog