Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] python3-scipy: update to 1.4.1
@ 2020-05-21 21:59 NeelChotai
  2020-05-21 22:32 ` ericonr
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: NeelChotai @ 2020-05-21 21:59 UTC (permalink / raw)
  To: ml


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

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

https://github.com/NeelChotai/void-packages python3-scipy-update
https://github.com/void-linux/void-packages/pull/22181

python3-scipy: update to 1.4.1


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

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

From f5ad8ebc64a66b14ab1349e7858e27253d697b8a Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Thu, 21 May 2020 22:58:03 +0100
Subject: [PATCH] python3-scipy: update to 1.4.1

---
 srcpkgs/python3-scipy/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 139e9b1dfe0..5d905ccfdf2 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.3.2
-revision=2
+version=1.4.1
+revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
 pycompile_module="scipy"
 make_check_args="--force"
-hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
-makedepends="python3-devel python3-numpy lapack-devel"
+hostmakedepends="python3-setuptools python3-Cython gcc-fortran python3-pybind11"
+makedepends="python3-devel python3-numpy lapack-devel openblas-devel"
 depends="python3-numpy"
 checkdepends="python3-nose"
 short_desc="Scientific library for Python3"
@@ -15,7 +15,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=1d2f09bcb6c4b66a65d9f49d21fa065f5396c940edac8285b87947b8d21b55f8
+checksum=037e649b39b614c37f74ad4b8711bedb89b4f31385ce90716903c31140467173
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/24733/steps/shell_3/logs/stdio"
 

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: python3-scipy: update to 1.4.1
  2020-05-21 21:59 [PR PATCH] python3-scipy: update to 1.4.1 NeelChotai
@ 2020-05-21 22:32 ` ericonr
  2020-05-21 22:33 ` ericonr
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-05-21 22:32 UTC (permalink / raw)
  To: ml


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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22181#issuecomment-632379853

Comment:
`int64_t` should be defined in `/usr/include/stdint.h` (it's pulled from `/usr/include/bits/alltypes.h`, but you should use the stdint header). If you can't figure out where the error came from, fixing it with a patch that adds that include would work. It shouldn't be needed, though.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: python3-scipy: update to 1.4.1
  2020-05-21 21:59 [PR PATCH] python3-scipy: update to 1.4.1 NeelChotai
  2020-05-21 22:32 ` ericonr
@ 2020-05-21 22:33 ` ericonr
  2020-05-21 22:33 ` ericonr
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-05-21 22:33 UTC (permalink / raw)
  To: ml


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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22181#issuecomment-632379853

Comment:
`int64_t` should be defined in `/usr/include/stdint.h` (it's pulled from `/usr/include/bits/alltypes.h`, but you should use the stdint header). If you can't figure out where the error came from, fixing it with a patch that adds an include for `stdint.h` would work. It shouldn't be needed, though.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: python3-scipy: update to 1.4.1
  2020-05-21 21:59 [PR PATCH] python3-scipy: update to 1.4.1 NeelChotai
  2020-05-21 22:32 ` ericonr
  2020-05-21 22:33 ` ericonr
@ 2020-05-21 22:33 ` ericonr
  2020-05-28 22:03 ` st3r4g
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-05-21 22:33 UTC (permalink / raw)
  To: ml


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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22181#issuecomment-632379853

Comment:
`int64_t` should be defined in `/usr/include/stdint.h` (it's pulled from `/usr/include/bits/alltypes.h`, but you should use the stdint header). If you can't figure out where the error came from, fixing it with a patch that adds an include for `stdint.h` would work. I hope it isn't needed, though.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: python3-scipy: update to 1.4.1
  2020-05-21 21:59 [PR PATCH] python3-scipy: update to 1.4.1 NeelChotai
                   ` (2 preceding siblings ...)
  2020-05-21 22:33 ` ericonr
@ 2020-05-28 22:03 ` st3r4g
  2020-06-01 21:53 ` [PR PATCH] [Updated] " NeelChotai
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: st3r4g @ 2020-05-28 22:03 UTC (permalink / raw)
  To: ml


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

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/22181#issuecomment-635632405

Comment:
this builds on musl if you apply ericonr's suggestion

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] python3-scipy: update to 1.4.1
  2020-05-21 21:59 [PR PATCH] python3-scipy: update to 1.4.1 NeelChotai
                   ` (3 preceding siblings ...)
  2020-05-28 22:03 ` st3r4g
@ 2020-06-01 21:53 ` NeelChotai
  2020-06-01 22:09 ` NeelChotai
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: NeelChotai @ 2020-06-01 21:53 UTC (permalink / raw)
  To: ml


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

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

https://github.com/NeelChotai/void-packages python3-scipy-update
https://github.com/void-linux/void-packages/pull/22181

python3-scipy: update to 1.4.1


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

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

From 09343cf73e41e731f9fdaa5e10c4482946d355bb Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Thu, 21 May 2020 22:58:03 +0100
Subject: [PATCH] python3-scipy: update to 1.4.1

---
 .../files/0001-fix-musl-compilation.patch     | 24 +++++++++++++++++++
 srcpkgs/python3-scipy/template                | 11 ++++-----
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-scipy/files/0001-fix-musl-compilation.patch

diff --git a/srcpkgs/python3-scipy/files/0001-fix-musl-compilation.patch b/srcpkgs/python3-scipy/files/0001-fix-musl-compilation.patch
new file mode 100644
index 00000000000..baab64f00aa
--- /dev/null
+++ b/srcpkgs/python3-scipy/files/0001-fix-musl-compilation.patch
@@ -0,0 +1,24 @@
+From ca790a5237dbbf7dc48396a6851576274383eda5 Mon Sep 17 00:00:00 2001
+From: Neel Chotai <neel@chot.ai>
+Date: Mon, 1 Jun 2020 22:47:38 +0100
+Subject: [PATCH] fix musl compilation
+
+---
+ scipy/optimize/rectangular_lsap/rectangular_lsap.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scipy/optimize/rectangular_lsap/rectangular_lsap.cpp b/scipy/optimize/rectangular_lsap/rectangular_lsap.cpp
+index 9bb930d23..81930f34e 100644
+--- a/scipy/optimize/rectangular_lsap/rectangular_lsap.cpp
++++ b/scipy/optimize/rectangular_lsap/rectangular_lsap.cpp
+@@ -44,6 +44,7 @@ Author: PM Larsen
+ #include <cmath>
+ #include "rectangular_lsap.h"
+ #include <vector>
++#include <stdint.h>
+ 
+ static int
+ augmenting_path(int nc, std::vector<double>& cost, std::vector<double>& u,
+-- 
+2.26.2
+
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 139e9b1dfe0..7961107ed52 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,13 +1,12 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.3.2
-revision=2
+version=1.4.1
+revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
-pycompile_module="scipy"
 make_check_args="--force"
-hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
-makedepends="python3-devel python3-numpy lapack-devel"
+hostmakedepends="python3-setuptools python3-Cython gcc-fortran python3-pybind11"
+makedepends="python3-devel python3-numpy lapack-devel openblas-devel"
 depends="python3-numpy"
 checkdepends="python3-nose"
 short_desc="Scientific library for Python3"
@@ -15,7 +14,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=1d2f09bcb6c4b66a65d9f49d21fa065f5396c940edac8285b87947b8d21b55f8
+checksum=037e649b39b614c37f74ad4b8711bedb89b4f31385ce90716903c31140467173
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/24733/steps/shell_3/logs/stdio"
 

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] python3-scipy: update to 1.4.1
  2020-05-21 21:59 [PR PATCH] python3-scipy: update to 1.4.1 NeelChotai
                   ` (4 preceding siblings ...)
  2020-06-01 21:53 ` [PR PATCH] [Updated] " NeelChotai
@ 2020-06-01 22:09 ` NeelChotai
  2020-06-01 22:43 ` NeelChotai
  2020-06-01 23:56 ` NeelChotai
  7 siblings, 0 replies; 9+ messages in thread
From: NeelChotai @ 2020-06-01 22:09 UTC (permalink / raw)
  To: ml


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

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

https://github.com/NeelChotai/void-packages python3-scipy-update
https://github.com/void-linux/void-packages/pull/22181

python3-scipy: update to 1.4.1


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

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

From b16efb3c72d8be0c77eb7c2ef7aa6964cf9701c1 Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Thu, 21 May 2020 22:58:03 +0100
Subject: [PATCH] python3-scipy: update to 1.4.1

---
 srcpkgs/python3-scipy/patches/musl.patch | 24 ++++++++++++++++++++++++
 srcpkgs/python3-scipy/template           | 11 +++++------
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-scipy/patches/musl.patch

diff --git a/srcpkgs/python3-scipy/patches/musl.patch b/srcpkgs/python3-scipy/patches/musl.patch
new file mode 100644
index 00000000000..86633576797
--- /dev/null
+++ b/srcpkgs/python3-scipy/patches/musl.patch
@@ -0,0 +1,24 @@
+From ca790a5237dbbf7dc48396a6851576274383eda5 Mon Sep 17 00:00:00 2001
+From: Neel Chotai <neel@chot.ai>
+Date: Mon, 1 Jun 2020 22:47:38 +0100
+Subject: [PATCH] fix musl compilation
+
+---
+ scipy/optimize/rectangular_lsap/rectangular_lsap.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scipy/optimize/rectangular_lsap/rectangular_lsap.cpp b/scipy/optimize/rectangular_lsap/rectangular_lsap.cpp
+index 9bb930d23..81930f34e 100644
+--- scipy/optimize/rectangular_lsap/rectangular_lsap.cpp
++++ scipy/optimize/rectangular_lsap/rectangular_lsap.cpp
+@@ -44,6 +44,7 @@ Author: PM Larsen
+ #include <cmath>
+ #include "rectangular_lsap.h"
+ #include <vector>
++#include <stdint.h>
+ 
+ static int
+ augmenting_path(int nc, std::vector<double>& cost, std::vector<double>& u,
+-- 
+2.26.2
+
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 139e9b1dfe0..7961107ed52 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,13 +1,12 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.3.2
-revision=2
+version=1.4.1
+revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
-pycompile_module="scipy"
 make_check_args="--force"
-hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
-makedepends="python3-devel python3-numpy lapack-devel"
+hostmakedepends="python3-setuptools python3-Cython gcc-fortran python3-pybind11"
+makedepends="python3-devel python3-numpy lapack-devel openblas-devel"
 depends="python3-numpy"
 checkdepends="python3-nose"
 short_desc="Scientific library for Python3"
@@ -15,7 +14,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=1d2f09bcb6c4b66a65d9f49d21fa065f5396c940edac8285b87947b8d21b55f8
+checksum=037e649b39b614c37f74ad4b8711bedb89b4f31385ce90716903c31140467173
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/24733/steps/shell_3/logs/stdio"
 

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: python3-scipy: update to 1.4.1
  2020-05-21 21:59 [PR PATCH] python3-scipy: update to 1.4.1 NeelChotai
                   ` (5 preceding siblings ...)
  2020-06-01 22:09 ` NeelChotai
@ 2020-06-01 22:43 ` NeelChotai
  2020-06-01 23:56 ` NeelChotai
  7 siblings, 0 replies; 9+ messages in thread
From: NeelChotai @ 2020-06-01 22:43 UTC (permalink / raw)
  To: ml


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

New comment by NeelChotai on void-packages repository

https://github.com/void-linux/void-packages/pull/22181#issuecomment-637164079

Comment:
@ericonr thank you for your suggestion, worked perfectly! Patch submitted to upstream.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: python3-scipy: update to 1.4.1
  2020-05-21 21:59 [PR PATCH] python3-scipy: update to 1.4.1 NeelChotai
                   ` (6 preceding siblings ...)
  2020-06-01 22:43 ` NeelChotai
@ 2020-06-01 23:56 ` NeelChotai
  7 siblings, 0 replies; 9+ messages in thread
From: NeelChotai @ 2020-06-01 23:56 UTC (permalink / raw)
  To: ml


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

New comment by NeelChotai on void-packages repository

https://github.com/void-linux/void-packages/pull/22181#issuecomment-637164079

Comment:
@ericonr thank you for your suggestion, worked perfectly! Should be fixed in 1.5.0.

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, back to index

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-21 21:59 [PR PATCH] python3-scipy: update to 1.4.1 NeelChotai
2020-05-21 22:32 ` ericonr
2020-05-21 22:33 ` ericonr
2020-05-21 22:33 ` ericonr
2020-05-28 22:03 ` st3r4g
2020-06-01 21:53 ` [PR PATCH] [Updated] " NeelChotai
2020-06-01 22:09 ` NeelChotai
2020-06-01 22:43 ` NeelChotai
2020-06-01 23:56 ` NeelChotai

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git