File tree 2 files changed +38
-1
lines changed
2 files changed +38
-1
lines changed Original file line number Diff line number Diff line change @@ -16,6 +16,9 @@ source:
16
16
# the submodules (not in tarball due to dear-github/dear-github#214)
17
17
- url : https://github.com/scipy/scipy/archive/refs/tags/v{{ version }}.tar.gz
18
18
sha256 : ea1c8e3ebe88713063b70ff1b5902400b16131ad1f5b731b6585fb9f5721ed2d
19
+ patches :
20
+ # backport https://github.com/scipy/scipy/pull/21069
21
+ - patches/0001-MAINT-fix-typo-in-small_dynamic_array.h-21069.patch
19
22
# https://github.com/scipy/scipy/tree/v{{ version }}/scipy/_lib
20
23
- git_url : https://github.com/data-apis/array-api-compat.git
21
24
folder : scipy/_lib/array_api_compat
@@ -41,7 +44,7 @@ source:
41
44
git_rev : a9ed9736ad52ff76ae1777922b700b13ca2bf0ae
42
45
43
46
build :
44
- number : 0
47
+ number : 1
45
48
skip : true # [py<310]
46
49
# pypy is currently broken and on its way out anyway
47
50
skip : true # [python_impl == "pypy"]
@@ -210,6 +213,9 @@ outputs:
210
213
- name : scipy-tests
211
214
script : build-output.sh # [not win]
212
215
script : build-output.bat # [win]
216
+ build :
217
+ ignore_run_exports : # [win]
218
+ - libflang # [win]
213
219
requirements :
214
220
build :
215
221
- python # [build_platform != target_platform]
Original file line number Diff line number Diff line change
1
+ From 91c4074b0eb9e4f56e3c182e873f16bdbd83c11e Mon Sep 17 00:00:00 2001
2
+ From: h-vetinari <
[email protected] >
3
+ Date: Sun, 30 Jun 2024 07:33:27 +1100
4
+ Subject: [PATCH] MAINT: fix typo in small_dynamic_array.h (#21069)
5
+
6
+ on clang-19, this causes:
7
+ ```
8
+ ../scipy/_lib/_uarray/small_dynamic_array.h(145,18): error: reference to non-static member function must be called
9
+ 145 | size_ = copy.size;
10
+ | ~~~~~^~~~
11
+ 1 error generated.
12
+ ```
13
+ I'm not sure how previous versions (much less other compilers) dealt with this,
14
+ as it seems that the `SmallDynamicArray` class has no `size` member or field at all.
15
+ ---
16
+ scipy/_lib/_uarray/small_dynamic_array.h | 2 +-
17
+ 1 file changed, 1 insertion(+), 1 deletion(-)
18
+
19
+ diff --git a/scipy/_lib/_uarray/small_dynamic_array.h b/scipy/_lib/_uarray/small_dynamic_array.h
20
+ index b6c46d7c44..351b5d8fc6 100644
21
+ --- a/scipy/_lib/_uarray/small_dynamic_array.h
22
+ +++ b/scipy/_lib/_uarray/small_dynamic_array.h
23
+ @@ -142,7 +142,7 @@ public:
24
+
25
+ clear();
26
+
27
+ - size_ = copy.size;
28
+ + size_ = copy.size_;
29
+ try {
30
+ allocate();
31
+ } catch (...) {
You can’t perform that action at this time.
0 commit comments