Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-python/xgboost/files/, dev-python/xgboost/
Date: Mon, 31 Oct 2022 10:20:57
Message-Id: 1667211646.6a6ac87d70e2657e034a1636741c82439081bfbd.andrewammerlaan@gentoo
1 commit: 6a6ac87d70e2657e034a1636741c82439081bfbd
2 Author: FoscoV <FoscoV <AT> users <DOT> noreply <DOT> github <DOT> com>
3 AuthorDate: Fri Oct 28 17:04:42 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 31 10:20:46 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=6a6ac87d
7
8 dev-python/xgboost: add 1.6.2, drop 1.3.1, enable py3_{10,11}, pep517
9
10 Co-authored-by: FoscoV <FoscoV <AT> users.noreply.github.com>
11 Closes: https://github.com/gentoo/sci/pull/1179
12 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
13
14 .../xgboost/files/xgboost-1.3.1-fix-install.patch | 31 ----------------------
15 .../{xgboost-1.3.1.ebuild => xgboost-1.6.2.ebuild} | 10 +++----
16 2 files changed, 3 insertions(+), 38 deletions(-)
17
18 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
19 deleted file mode 100644
20 index 8c2d3d180..000000000
21 --- a/dev-python/xgboost/files/xgboost-1.3.1-fix-install.patch
22 +++ /dev/null
23 @@ -1,31 +0,0 @@
24 -The BUILD_TEMP_DIR variable is set in the build phase but is no
25 -longer available in the install phase. We write the variable to
26 -a tmp file and read it later in the install phase as a workaround
27 -diff --git a/setup.py b/setup.py
28 -index 6244066..934e7cf 100644
29 ---- a/setup.py
30 -+++ b/setup.py
31 -@@ -137,6 +137,11 @@ class BuildExt(build_ext.build_ext): # pylint: disable=too-many-ancestors
32 - build_dir = self.build_temp
33 - global BUILD_TEMP_DIR # pylint: disable=global-statement
34 - BUILD_TEMP_DIR = build_dir
35 -+ tmp_workdir = os.environ["WORKDIR"]
36 -+ py_vers = os.environ["EPYTHON"]
37 -+ f = open(tmp_workdir + f"/build-path-{py_vers}.txt", "w")
38 -+ f.write(BUILD_TEMP_DIR)
39 -+ f.close()
40 - libxgboost = os.path.abspath(
41 - os.path.join(CURRENT_DIR, os.path.pardir, 'lib', lib_name()))
42 -
43 -@@ -229,6 +234,11 @@ class InstallLib(install_lib.install_lib):
44 - dst = os.path.join(self.install_dir, 'xgboost', 'lib', lib_name())
45 -
46 - global BUILD_TEMP_DIR # pylint: disable=global-statement
47 -+ tmp_workdir = os.environ["WORKDIR"]
48 -+ py_vers = os.environ["EPYTHON"]
49 -+ f = open(tmp_workdir + f"/build-path-{py_vers}.txt", "r")
50 -+ BUILD_TEMP_DIR = f.read()
51 -+ f.close()
52 - libxgboost_path = lib_name()
53 -
54 - dft_lib_dir = os.path.join(CURRENT_DIR, os.path.pardir, 'lib')
55
56 diff --git a/dev-python/xgboost/xgboost-1.3.1.ebuild b/dev-python/xgboost/xgboost-1.6.2.ebuild
57 similarity index 73%
58 rename from dev-python/xgboost/xgboost-1.3.1.ebuild
59 rename to dev-python/xgboost/xgboost-1.6.2.ebuild
60 index 25145f93d..e429f5741 100644
61 --- a/dev-python/xgboost/xgboost-1.3.1.ebuild
62 +++ b/dev-python/xgboost/xgboost-1.6.2.ebuild
63 @@ -1,10 +1,10 @@
64 # Copyright 1999-2021 Gentoo Authors
65 # Distributed under the terms of the GNU General Public License v2
66
67 -EAPI=7
68 -
69 -PYTHON_COMPAT=( python3_{7,8,9} )
70 +EAPI=8
71
72 +PYTHON_COMPAT=( python3_{8..11} )
73 +DISTUTILS_USE_PEP517=setuptools
74 inherit distutils-r1
75
76 DESCRIPTION="XGBoost Python Package"
77 @@ -15,11 +15,7 @@ LICENSE="Apache-2.0"
78 SLOT="0"
79 KEYWORDS="~amd64 ~x86"
80
81 -PATCHES=( "${FILESDIR}/${P}-fix-install.patch" )
82 -
83 RDEPEND="
84 dev-python/numpy[${PYTHON_USEDEP}]
85 dev-python/scipy[${PYTHON_USEDEP}]
86 "
87 -
88 -PATCHES=( "${FILESDIR}/${P}-fix-install.patch" )