-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update python-jupyter-packaging to version 0.12.3 / rev 10 via SR 120…
…1473 https://build.opensuse.org/request/show/1201473 by user bnavigator + anag+factory - Add jupyter-packaging-pr186-bdist_wheel.patch * gh#jupyter/jupyter-packaging#186 * gh#jupyter/jupyter-packaging#185 (forwarded request 1201472 from bnavigator)
- Loading branch information
1 parent
40f65f8
commit c2b3ac3
Showing
5 changed files
with
100 additions
and
2 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
packages/p/python-jupyter-packaging/jupyter-packaging-pr186-bdist_wheel.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
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", | ||
] |
7 changes: 7 additions & 0 deletions
7
packages/p/python-jupyter-packaging/python-jupyter-packaging.changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,10 @@ | ||
------------------------------------------------------------------- | ||
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 | ||
|
||
------------------------------------------------------------------- | ||
Sat Apr 1 20:23:48 UTC 2023 - Ben Greiner <[email protected]> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters