From be49d9a99ad98021b0cada52c02a14a2a8db7c0d Mon Sep 17 00:00:00 2001 From: Alexander Condello Date: Fri, 21 Jul 2023 12:13:05 -0700 Subject: [PATCH 1/2] Use delvewheel>=1.4.0 to take advantage of the --namespace-pkg flag Closes https://github.com/dwavesystems/dwave-preprocessing/issues/130 --- pyproject.toml | 4 ++-- releasenotes/notes/develwheel-1.4.0-55ede67315399961.yaml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/develwheel-1.4.0-55ede67315399961.yaml diff --git a/pyproject.toml b/pyproject.toml index 34e7ccc..961a906 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,5 +25,5 @@ archs = "x86_64 arm64" [tool.cibuildwheel.windows] archs = "AMD64" -before-build = "pip install delvewheel" -repair-wheel-command = "delvewheel repair -w {dest_dir} {wheel}" +before-build = "pip install delvewheel>=1.4.0" +repair-wheel-command = "delvewheel repair -w {dest_dir} {wheel} --namespace-pkg dwave" diff --git a/releasenotes/notes/develwheel-1.4.0-55ede67315399961.yaml b/releasenotes/notes/develwheel-1.4.0-55ede67315399961.yaml new file mode 100644 index 0000000..8e9f2ef --- /dev/null +++ b/releasenotes/notes/develwheel-1.4.0-55ede67315399961.yaml @@ -0,0 +1,3 @@ +--- +fixes: + - Fix ``ImportError`` on Windows. See `#130 `_. From fc0d889f8271968903bc44d51c189361d1ed47b5 Mon Sep 17 00:00:00 2001 From: Alexander Condello Date: Fri, 21 Jul 2023 12:54:20 -0700 Subject: [PATCH 2/2] Expand release note for delvewheel upgrade --- releasenotes/notes/develwheel-1.4.0-55ede67315399961.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/releasenotes/notes/develwheel-1.4.0-55ede67315399961.yaml b/releasenotes/notes/develwheel-1.4.0-55ede67315399961.yaml index 8e9f2ef..47d462b 100644 --- a/releasenotes/notes/develwheel-1.4.0-55ede67315399961.yaml +++ b/releasenotes/notes/develwheel-1.4.0-55ede67315399961.yaml @@ -1,3 +1,6 @@ --- fixes: - - Fix ``ImportError`` on Windows. See `#130 `_. + - | + Fix ``ImportError`` being raised on Windows when other ``dwave`` namespace packages + are installed after ``dwave-preprocessing``. + See `#130 `_.