|
| 1 | +From 47614d55dbe2e800c4393ce17f2f284a3c42893d Mon Sep 17 00:00:00 2001 |
| 2 | +From: Ben Greiner < [email protected]> |
| 3 | +Date: Mon, 16 Sep 2024 21:27:04 +0200 |
| 4 | +Subject: [PATCH 1/3] Try to import bdist_wheel from setuptools first |
| 5 | + |
| 6 | +--- |
| 7 | + jupyter_packaging/setupbase.py | 8 ++++++-- |
| 8 | + 1 file changed, 6 insertions(+), 2 deletions(-) |
| 9 | + |
| 10 | +diff --git a/jupyter_packaging/setupbase.py b/jupyter_packaging/setupbase.py |
| 11 | +index f0ebbf4..cb5cd6e 100644 |
| 12 | +--- a/jupyter_packaging/setupbase.py |
| 13 | ++++ b/jupyter_packaging/setupbase.py |
| 14 | +@@ -44,10 +44,14 @@ |
| 15 | + from setuptools.command.develop import develop |
| 16 | + from setuptools.command.sdist import sdist |
| 17 | + |
| 18 | ++ |
| 19 | + try: |
| 20 | +- from wheel.bdist_wheel import bdist_wheel |
| 21 | ++ from setuptools.command.bdist_wheel import bdist_wheel |
| 22 | + except ImportError: # pragma: no cover |
| 23 | +- bdist_wheel = None |
| 24 | ++ try: |
| 25 | ++ from wheel.bdist_wheel import bdist_wheel |
| 26 | ++ except ImportError: |
| 27 | ++ bdist_wheel = None |
| 28 | + |
| 29 | + if sys.platform == "win32": # pragma: no cover |
| 30 | + from subprocess import list2cmdline |
| 31 | + |
| 32 | +From 49920607b6682df3c6cf480eebf5dc3ee4497c0d Mon Sep 17 00:00:00 2001 |
| 33 | +From: "pre-commit-ci[bot]" |
| 34 | + <66853113+pre-commit-ci[bot]@users.noreply.github.com> |
| 35 | +Date: Mon, 16 Sep 2024 19:30:46 +0000 |
| 36 | +Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks |
| 37 | + |
| 38 | +for more information, see https://pre-commit.ci |
| 39 | +--- |
| 40 | + jupyter_packaging/setupbase.py | 1 - |
| 41 | + 1 file changed, 1 deletion(-) |
| 42 | + |
| 43 | +diff --git a/jupyter_packaging/setupbase.py b/jupyter_packaging/setupbase.py |
| 44 | +index cb5cd6e..ddc4b13 100644 |
| 45 | +--- a/jupyter_packaging/setupbase.py |
| 46 | ++++ b/jupyter_packaging/setupbase.py |
| 47 | +@@ -44,7 +44,6 @@ |
| 48 | + from setuptools.command.develop import develop |
| 49 | + from setuptools.command.sdist import sdist |
| 50 | + |
| 51 | +- |
| 52 | + try: |
| 53 | + from setuptools.command.bdist_wheel import bdist_wheel |
| 54 | + except ImportError: # pragma: no cover |
| 55 | + |
| 56 | +From b565482ebbad9b132526a463a70841976a030330 Mon Sep 17 00:00:00 2001 |
| 57 | +From: Ben Greiner < [email protected]> |
| 58 | +Date: Mon, 16 Sep 2024 21:47:28 +0200 |
| 59 | +Subject: [PATCH 3/3] Ignore wheel warning |
| 60 | + |
| 61 | +--- |
| 62 | + pyproject.toml | 5 ++++- |
| 63 | + 1 file changed, 4 insertions(+), 1 deletion(-) |
| 64 | + |
| 65 | +diff --git a/pyproject.toml b/pyproject.toml |
| 66 | +index b6739fe..0741903 100644 |
| 67 | +--- a/pyproject.toml |
| 68 | ++++ b/pyproject.toml |
| 69 | +@@ -80,5 +80,8 @@ filterwarnings= [ |
| 70 | + # Ignore our own deprecation warnings. |
| 71 | + "ignore:.*:deprecation.DeprecatedWarning", |
| 72 | + # Ignore warning raised when importing setuptools.command.develop. |
| 73 | +- "ignore:pkg_resources is deprecated as an API:DeprecationWarning" |
| 74 | ++ "ignore:pkg_resources is deprecated as an API:DeprecationWarning", |
| 75 | ++ # bdist_wheel moved from wheel 0.44+ to setuptools 0.70.1+. |
| 76 | ++ # We already handle it but wheel 0.44 could still emit the warning with an older setuptools. |
| 77 | ++ "ignore:The 'wheel' package is no longer the canonical location of the 'bdist_wheel' command:DeprecationWarning", |
| 78 | + ] |
0 commit comments