[PR PATCH] python3-scipy: fix build.

[PR PATCH] python3-scipy: fix build.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages python3-scipy-fix-build
https://github.com/void-linux/void-packages/pull/45472

python3-scipy: fix build.
<!-- Uncomment relevant sections and delete options which are not applicable -->

@ahesford

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/45472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-scipy-fix-build-45472.patch --]
[-- Type: text/x-diff, Size: 624 bytes --]

From a7a68acf32022de8a5ab3ae94b79bc280e9cec22 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 7 Aug 2023 13:19:33 +0100
Subject: [PATCH] python3-scipy: fix build.

---
 srcpkgs/python3-scipy/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index eb7c7a3e01663..344904487a6a2 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -64,6 +64,8 @@ post_patch() {
 		pythran-include-dir = '${_xpy}/pythran'
 		EOF
 	fi
+
+	vsed -e 's/wheel<0\.41\.0/wheel/' -i pyproject.toml
 }
 
 do_build() {

Re: python3-scipy: fix build.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/45472#issuecomment-1668053119

Comment:
I'm fine with making it a patch, but vsed calls that change nothing cause errors in the CI, so assuming the CI isn't skipped that shouldn't be an issue.

Re: python3-scipy: fix build.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45472#issuecomment-1668072015

Comment:
True, but I frequently update SciPy without running through CI.

Re: python3-scipy: fix build.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/45472#issuecomment-1668096326

Comment:
Honestly, I think `vsed` patterns not applying should always cause errors without having to pass `-s` to `xbps-src`, but I digress. :)

Re: [PR PATCH] [Updated] python3-scipy: fix build.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages python3-scipy-fix-build
https://github.com/void-linux/void-packages/pull/45472

python3-scipy: fix build.
<!-- Uncomment relevant sections and delete options which are not applicable -->

@ahesford

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/45472.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-scipy-fix-build-45472.patch --]
[-- Type: text/x-diff, Size: 1447 bytes --]

From 1f981282e00286b13a0b001ba4027a93d96ea39f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 7 Aug 2023 13:19:33 +0100
Subject: [PATCH] python3-scipy: fix build.

---
 srcpkgs/python3-scipy/patches/dep-versions.patch | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/srcpkgs/python3-scipy/patches/dep-versions.patch b/srcpkgs/python3-scipy/patches/dep-versions.patch
index 863c5e19d6d09..0ba8c2dbf4cc8 100644
--- a/srcpkgs/python3-scipy/patches/dep-versions.patch
+++ b/srcpkgs/python3-scipy/patches/dep-versions.patch
@@ -14,6 +14,15 @@ causes build failures against more up-to-date Void packages.
      "pythran>=0.12.0,<0.14.0", # already working with 0.13.x series at branch time
      # `wheel` is needed for non-isolated builds, given that `meson-python`
      # doesn't list it as a runtime requirement (at least in 0.5.0)
+@@ -16,7 +16,7 @@
+     "pythran>=0.12.0,<0.14.0", # already working with 0.13.x series at branch time
+     # `wheel` is needed for non-isolated builds, given that `meson-python`
+     # doesn't list it as a runtime requirement (at least in 0.5.0)
+-    "wheel<0.41.0",
++    "wheel",
+ 
+     # NumPy dependencies - to update these, sync from
+     # https://github.com/scipy/oldest-supported-numpy/, and then
 @@ -40,7 +40,7 @@
      # however macOS was broken and it's safe C API/ABI-wise to build against 1.21.6
      # (see oldest-supported-numpy issues gh-28 and gh-45)

Re: [PR PATCH] [Merged]: python3-scipy: fix build.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]

There's a merged pull request on the void-packages repository

python3-scipy: fix build.
https://github.com/void-linux/void-packages/pull/45472

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

@ahesford

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->