public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: dev-python/xgboost/files/, dev-python/xgboost/
@ 2021-01-05 16:16 Andrew Ammerlaan
  0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2021-01-05 16:16 UTC (permalink / raw
  To: gentoo-commits

commit:     2dd13d3a9df4b23f22b0b8bc1023daefb47de7ea
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan  5 13:42:12 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan  5 16:03:39 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=2dd13d3a

dev-python/xgboost: version bump, bump py targets

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 .../xgboost/files/xgboost-1.3.1-fix-install.patch  | 31 ++++++++++++++++++++++
 dev-python/xgboost/xgboost-1.0.1.ebuild            | 26 ------------------
 dev-python/xgboost/xgboost-1.3.1.ebuild            | 25 +++++++++++++++++
 3 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/dev-python/xgboost/files/xgboost-1.3.1-fix-install.patch b/dev-python/xgboost/files/xgboost-1.3.1-fix-install.patch
new file mode 100644
index 000000000..8c2d3d180
--- /dev/null
+++ b/dev-python/xgboost/files/xgboost-1.3.1-fix-install.patch
@@ -0,0 +1,31 @@
+The BUILD_TEMP_DIR variable is set in the build phase but is no
+longer available in the install phase. We write the variable to
+a tmp file and read it later in the install phase as a workaround
+diff --git a/setup.py b/setup.py
+index 6244066..934e7cf 100644
+--- a/setup.py
++++ b/setup.py
+@@ -137,6 +137,11 @@ class BuildExt(build_ext.build_ext):  # pylint: disable=too-many-ancestors
+         build_dir = self.build_temp
+         global BUILD_TEMP_DIR  # pylint: disable=global-statement
+         BUILD_TEMP_DIR = build_dir
++        tmp_workdir = os.environ["WORKDIR"]
++        py_vers = os.environ["EPYTHON"]
++        f = open(tmp_workdir + f"/build-path-{py_vers}.txt", "w")
++        f.write(BUILD_TEMP_DIR)
++        f.close()
+         libxgboost = os.path.abspath(
+             os.path.join(CURRENT_DIR, os.path.pardir, 'lib', lib_name()))
+ 
+@@ -229,6 +234,11 @@ class InstallLib(install_lib.install_lib):
+         dst = os.path.join(self.install_dir, 'xgboost', 'lib', lib_name())
+ 
+         global BUILD_TEMP_DIR   # pylint: disable=global-statement
++        tmp_workdir = os.environ["WORKDIR"]
++        py_vers = os.environ["EPYTHON"]
++        f = open(tmp_workdir + f"/build-path-{py_vers}.txt", "r")
++        BUILD_TEMP_DIR = f.read()
++        f.close()
+         libxgboost_path = lib_name()
+ 
+         dft_lib_dir = os.path.join(CURRENT_DIR, os.path.pardir, 'lib')

diff --git a/dev-python/xgboost/xgboost-1.0.1.ebuild b/dev-python/xgboost/xgboost-1.0.1.ebuild
deleted file mode 100644
index 8a0dec405..000000000
--- a/dev-python/xgboost/xgboost-1.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${PV}.tar.gz"
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="XGBoost Python Package"
-
-HOMEPAGE="https://xgboost.readthedocs.io"
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="~amd64"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -e "/ADD_CFLAGS/s:=:=${CFLAGS/-O?/}:" \
-		-e "/ADD_LDFLAGS/s:=:=${LDFLAGS}:" \
-		-i ${PN}/make/config.mk || die
-
-	distutils-r1_python_prepare_all
-}

diff --git a/dev-python/xgboost/xgboost-1.3.1.ebuild b/dev-python/xgboost/xgboost-1.3.1.ebuild
new file mode 100644
index 000000000..25145f93d
--- /dev/null
+++ b/dev-python/xgboost/xgboost-1.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="XGBoost Python Package"
+HOMEPAGE="https://xgboost.readthedocs.io"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}/${P}-fix-install.patch" )
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-install.patch" )


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

* [gentoo-commits] proj/sci:master commit in: dev-python/xgboost/files/, dev-python/xgboost/
@ 2022-10-31 10:20 Andrew Ammerlaan
  0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2022-10-31 10:20 UTC (permalink / raw
  To: gentoo-commits

commit:     6a6ac87d70e2657e034a1636741c82439081bfbd
Author:     FoscoV <FoscoV <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Oct 28 17:04:42 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 10:20:46 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6a6ac87d

dev-python/xgboost: add 1.6.2, drop 1.3.1, enable py3_{10,11}, pep517

Co-authored-by: FoscoV <FoscoV <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/sci/pull/1179
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../xgboost/files/xgboost-1.3.1-fix-install.patch  | 31 ----------------------
 .../{xgboost-1.3.1.ebuild => xgboost-1.6.2.ebuild} | 10 +++----
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/dev-python/xgboost/files/xgboost-1.3.1-fix-install.patch b/dev-python/xgboost/files/xgboost-1.3.1-fix-install.patch
deleted file mode 100644
index 8c2d3d180..000000000
--- a/dev-python/xgboost/files/xgboost-1.3.1-fix-install.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-The BUILD_TEMP_DIR variable is set in the build phase but is no
-longer available in the install phase. We write the variable to
-a tmp file and read it later in the install phase as a workaround
-diff --git a/setup.py b/setup.py
-index 6244066..934e7cf 100644
---- a/setup.py
-+++ b/setup.py
-@@ -137,6 +137,11 @@ class BuildExt(build_ext.build_ext):  # pylint: disable=too-many-ancestors
-         build_dir = self.build_temp
-         global BUILD_TEMP_DIR  # pylint: disable=global-statement
-         BUILD_TEMP_DIR = build_dir
-+        tmp_workdir = os.environ["WORKDIR"]
-+        py_vers = os.environ["EPYTHON"]
-+        f = open(tmp_workdir + f"/build-path-{py_vers}.txt", "w")
-+        f.write(BUILD_TEMP_DIR)
-+        f.close()
-         libxgboost = os.path.abspath(
-             os.path.join(CURRENT_DIR, os.path.pardir, 'lib', lib_name()))
- 
-@@ -229,6 +234,11 @@ class InstallLib(install_lib.install_lib):
-         dst = os.path.join(self.install_dir, 'xgboost', 'lib', lib_name())
- 
-         global BUILD_TEMP_DIR   # pylint: disable=global-statement
-+        tmp_workdir = os.environ["WORKDIR"]
-+        py_vers = os.environ["EPYTHON"]
-+        f = open(tmp_workdir + f"/build-path-{py_vers}.txt", "r")
-+        BUILD_TEMP_DIR = f.read()
-+        f.close()
-         libxgboost_path = lib_name()
- 
-         dft_lib_dir = os.path.join(CURRENT_DIR, os.path.pardir, 'lib')

diff --git a/dev-python/xgboost/xgboost-1.3.1.ebuild b/dev-python/xgboost/xgboost-1.6.2.ebuild
similarity index 73%
rename from dev-python/xgboost/xgboost-1.3.1.ebuild
rename to dev-python/xgboost/xgboost-1.6.2.ebuild
index 25145f93d..e429f5741 100644
--- a/dev-python/xgboost/xgboost-1.3.1.ebuild
+++ b/dev-python/xgboost/xgboost-1.6.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="XGBoost Python Package"
@@ -15,11 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-PATCHES=( "${FILESDIR}/${P}-fix-install.patch" )
-
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
 "
-
-PATCHES=( "${FILESDIR}/${P}-fix-install.patch" )


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

end of thread, other threads:[~2022-10-31 10:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-05 16:16 [gentoo-commits] proj/sci:master commit in: dev-python/xgboost/files/, dev-python/xgboost/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2022-10-31 10:20 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox