* [gentoo-commits] repo/gentoo:master commit in: dev-python/bottleneck/files/, dev-python/bottleneck/
@ 2022-02-22 18:55 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2022-02-22 18:55 UTC (permalink / raw
To: gentoo-commits
commit: 733464458008fb9f3cd72d13626451f71fcecae0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 18:49:33 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 18:55:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73346445
dev-python/bottleneck: Bump to 1.3.4
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/bottleneck/Manifest | 1 +
dev-python/bottleneck/bottleneck-1.3.4.ebuild | 40 ++++++++++++++++++++++
.../files/bottleneck-1.3.4-install-test-data.patch | 16 +++++++++
dev-python/bottleneck/metadata.xml | 1 +
4 files changed, 58 insertions(+)
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index e8ed96f5cca5..cba33a33754b 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1 +1,2 @@
DIST bottleneck-1.3.2.tar.gz 102565 BLAKE2B 4d903bd8ff918a54cdee5b6c6815e8d404c6d3cd1a73e02f81888aab077970a113fcd24acef9da8a35138aa808c211883bf9bd952f83f17df4f94a6172fbe140 SHA512 9b6f812a625c9bb39501e8834ce41ae34ce57038d3ec9528aa8aa80910663c4e3b420d535f0ec8fa9e506faecabaf0151950afcebdc919479ed04787f26dc3ee
+DIST bottleneck-1.3.4.gh.tar.gz 118739 BLAKE2B af4b32bf296f11538b12f364592553d407668762e1e2d94c814bf262bc9ef88f1338cd388ff1c02065f8266988fe6cad5f8461aed2a144a9bfaf98f8ae46eeae SHA512 0cb3837139f947a7da026bddc8ff6e8025ee0aac6aedf4046383eb8385789d1816158ae20438b15a28c7f0b6552c3570c18abdbb6ef265fa9f497edebae1d808
diff --git a/dev-python/bottleneck/bottleneck-1.3.4.ebuild b/dev-python/bottleneck/bottleneck-1.3.4.ebuild
new file mode 100644
index 000000000000..3bafb223587f
--- /dev/null
+++ b/dev-python/bottleneck/bottleneck-1.3.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast NumPy array functions written in C"
+HOMEPAGE="https://pypi.org/project/Bottleneck/"
+SRC_URI="
+ https://github.com/pydata/bottleneck/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-python/versioneer[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ # https://github.com/pydata/bottleneck/pull/403
+ "${FILESDIR}"/${P}-install-test-data.patch
+)
+
+python_test() {
+ cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+ epytest
+}
diff --git a/dev-python/bottleneck/files/bottleneck-1.3.4-install-test-data.patch b/dev-python/bottleneck/files/bottleneck-1.3.4-install-test-data.patch
new file mode 100644
index 000000000000..b1ac3edbcdf5
--- /dev/null
+++ b/dev-python/bottleneck/files/bottleneck-1.3.4-install-test-data.patch
@@ -0,0 +1,16 @@
+diff --git a/setup.py b/setup.py
+index db629bd..b0c10cd 100644
+--- a/setup.py
++++ b/setup.py
+@@ -185,7 +185,10 @@ metadata = dict(
+ platforms="OS Independent",
+ version=versioneer.get_version(),
+ packages=find_packages(),
+- package_data={"bottleneck": ["LICENSE"]},
++ package_data={
++ "bottleneck": ["LICENSE"],
++ "bottleneck.tests": ["data/*/*"],
++ },
+ requires=["numpy"],
+ install_requires=["numpy"],
+ extras_require={"doc": ["numpydoc", "sphinx", "gitpython"]},
diff --git a/dev-python/bottleneck/metadata.xml b/dev-python/bottleneck/metadata.xml
index 94e1198a1c8c..c236122ac707 100644
--- a/dev-python/bottleneck/metadata.xml
+++ b/dev-python/bottleneck/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Mathematics Project</name>
</maintainer>
<upstream>
+ <remote-id type="github">pydata/bottleneck</remote-id>
<remote-id type="pypi">Bottleneck</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/bottleneck/files/, dev-python/bottleneck/
@ 2022-08-03 9:10 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2022-08-03 9:10 UTC (permalink / raw
To: gentoo-commits
commit: c727caed6ccc012f28c7a3a06ef4c4f34fee0da3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 3 09:08:08 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 09:08:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c727caed
dev-python/bottleneck: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/bottleneck/Manifest | 1 -
dev-python/bottleneck/bottleneck-1.3.4.ebuild | 40 ----------------------
.../files/bottleneck-1.3.4-install-test-data.patch | 16 ---------
3 files changed, 57 deletions(-)
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index e28902708a51..354f8498053b 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,2 +1 @@
-DIST bottleneck-1.3.4.gh.tar.gz 118739 BLAKE2B af4b32bf296f11538b12f364592553d407668762e1e2d94c814bf262bc9ef88f1338cd388ff1c02065f8266988fe6cad5f8461aed2a144a9bfaf98f8ae46eeae SHA512 0cb3837139f947a7da026bddc8ff6e8025ee0aac6aedf4046383eb8385789d1816158ae20438b15a28c7f0b6552c3570c18abdbb6ef265fa9f497edebae1d808
DIST bottleneck-1.3.5.gh.tar.gz 118989 BLAKE2B 5b9338a77cb3f0253348f45e641dca9fce11b50fb632e697272203870dd604730c08f1adc94ebf9c6c21f551e3f06b5492bcb036d6f40eaec8853d08ca298873 SHA512 9a0f224337fd9d5c741a1e469197be26923eaffb143eddfe0969128ddc233c799da6a5f2ba4ef22f6267cf93e7f748c140fbb16f57149ad327c47fe87ffc3346
diff --git a/dev-python/bottleneck/bottleneck-1.3.4.ebuild b/dev-python/bottleneck/bottleneck-1.3.4.ebuild
deleted file mode 100644
index c53291d5bbf6..000000000000
--- a/dev-python/bottleneck/bottleneck-1.3.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast NumPy array functions written in C"
-HOMEPAGE="
- https://github.com/pydata/bottleneck/
- https://pypi.org/project/Bottleneck/
-"
-SRC_URI="
- https://github.com/pydata/bottleneck/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- # https://github.com/pydata/bottleneck/pull/403
- "${FILESDIR}"/${P}-install-test-data.patch
-)
-
-python_test() {
- cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
- epytest
-}
diff --git a/dev-python/bottleneck/files/bottleneck-1.3.4-install-test-data.patch b/dev-python/bottleneck/files/bottleneck-1.3.4-install-test-data.patch
deleted file mode 100644
index b1ac3edbcdf5..000000000000
--- a/dev-python/bottleneck/files/bottleneck-1.3.4-install-test-data.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index db629bd..b0c10cd 100644
---- a/setup.py
-+++ b/setup.py
-@@ -185,7 +185,10 @@ metadata = dict(
- platforms="OS Independent",
- version=versioneer.get_version(),
- packages=find_packages(),
-- package_data={"bottleneck": ["LICENSE"]},
-+ package_data={
-+ "bottleneck": ["LICENSE"],
-+ "bottleneck.tests": ["data/*/*"],
-+ },
- requires=["numpy"],
- install_requires=["numpy"],
- extras_require={"doc": ["numpydoc", "sphinx", "gitpython"]},
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/bottleneck/files/, dev-python/bottleneck/
@ 2024-05-19 11:47 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-05-19 11:47 UTC (permalink / raw
To: gentoo-commits
commit: 927d3eba08db355eb46d922f3b4d34532fc7b166
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 07:54:22 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 19 11:47:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927d3eba
dev-python/bottleneck: Backport upstream numpy-2 fixes
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild | 58 ++++++++++++++++++++
.../files/bottleneck-1.3.8-numpy-2.patch | 64 ++++++++++++++++++++++
2 files changed, 122 insertions(+)
diff --git a/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild b/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
new file mode 100644
index 000000000000..5be4257cec27
--- /dev/null
+++ b/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fast NumPy array functions written in C"
+HOMEPAGE="
+ https://github.com/pydata/bottleneck/
+ https://pypi.org/project/Bottleneck/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+
+DEPEND="
+ >=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+ ${DEPEND}
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ # https://github.com/pydata/bottleneck/pull/450
+ "${FILESDIR}/${P}-numpy-2.patch"
+)
+
+src_prepare() {
+ # don't overwrites user's optimization level
+ sed -e '/extra_compile_args=\["-O2"\]/d' -i setup.py || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=()
+ case ${EPYTHON} in
+ pypy3)
+ EPYTEST_DESELECT+=(
+ # GC assumptions?
+ tests/memory_test.py::test_memory_leak
+ )
+ ;;
+ esac
+
+ rm -rf bottleneck || die
+ epytest --pyargs bottleneck
+}
diff --git a/dev-python/bottleneck/files/bottleneck-1.3.8-numpy-2.patch b/dev-python/bottleneck/files/bottleneck-1.3.8-numpy-2.patch
new file mode 100644
index 000000000000..153b984f1fe7
--- /dev/null
+++ b/dev-python/bottleneck/files/bottleneck-1.3.8-numpy-2.patch
@@ -0,0 +1,64 @@
+From 787d6daa292ef013efb2ce93f100079457330363 Mon Sep 17 00:00:00 2001
+From: Ben Greiner <code@bnavigator.de>
+Date: Thu, 9 May 2024 20:27:16 +0200
+Subject: [PATCH 3/3] Replace np.array(a, copy=False) with np.asarray(a)
+
+See https://numpy.org/devdocs/numpy_2_0_migration_guide.html#adapting-to-changes-in-the-copy-keyword
+---
+ bottleneck/slow/move.py | 8 ++++----
+ bottleneck/slow/nonreduce_axis.py | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/bottleneck/slow/move.py b/bottleneck/slow/move.py
+index 0aa06f141..76a54a24e 100644
+--- a/bottleneck/slow/move.py
++++ b/bottleneck/slow/move.py
+@@ -52,7 +52,7 @@ def move_argmin(a, window, min_count=None, axis=-1):
+ "Slow move_argmin for unaccelerated dtype"
+
+ def argmin(a, axis):
+- a = np.array(a, copy=False)
++ a = np.asarray(a)
+ flip = [slice(None)] * a.ndim
+ flip[axis] = slice(None, None, -1)
+ a = a[tuple(flip)] # if tie, pick index of rightmost tie
+@@ -78,7 +78,7 @@ def move_argmax(a, window, min_count=None, axis=-1):
+ "Slow move_argmax for unaccelerated dtype"
+
+ def argmax(a, axis):
+- a = np.array(a, copy=False)
++ a = np.asarray(a)
+ flip = [slice(None)] * a.ndim
+ flip[axis] = slice(None, None, -1)
+ a = a[tuple(flip)] # if tie, pick index of rightmost tie
+@@ -115,7 +115,7 @@ def move_rank(a, window, min_count=None, axis=-1):
+
+ def move_func(func, a, window, min_count=None, axis=-1, **kwargs):
+ "Generic moving window function implemented with a python loop."
+- a = np.array(a, copy=False)
++ a = np.asarray(a)
+ if min_count is None:
+ mc = window
+ else:
+@@ -226,7 +226,7 @@ def lastrank(a, axis=-1):
+ -0.5
+
+ """
+- a = np.array(a, copy=False)
++ a = np.asarray(a)
+ ndim = a.ndim
+ if a.size == 0:
+ # At least one dimension has length 0
+diff --git a/bottleneck/slow/nonreduce_axis.py b/bottleneck/slow/nonreduce_axis.py
+index f09dfa739..1dd67529a 100644
+--- a/bottleneck/slow/nonreduce_axis.py
++++ b/bottleneck/slow/nonreduce_axis.py
+@@ -15,7 +15,7 @@ def nanrankdata(a, axis=None):
+
+
+ def _rank(func1d, a, axis):
+- a = np.array(a, copy=False)
++ a = np.asarray(a)
+ if axis is None:
+ a = a.ravel()
+ axis = 0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-19 11:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-03 9:10 [gentoo-commits] repo/gentoo:master commit in: dev-python/bottleneck/files/, dev-python/bottleneck/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-05-19 11:47 Michał Górny
2022-02-22 18:55 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox