Date: Sun, 28 Aug 2022 23:50:40 GMT
From: Yuri Victorovich <yuri@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: faee1d001d61 - main - misc/{,py-}xgboost: Update 1.6.1 -> 1.6.2
Message-ID: <202208282350.27SNoetF029771@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=faee1d001d618bea5fd190fc62dc84786eb63821 commit faee1d001d618bea5fd190fc62dc84786eb63821 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2022-08-28 23:15:49 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2022-08-28 23:50:36 +0000 misc/{,py-}xgboost: Update 1.6.1 -> 1.6.2 Reported by: portscout --- misc/py-xgboost/Makefile | 13 +++---------- misc/py-xgboost/distinfo | 6 +++--- misc/py-xgboost/files/patch-setup.py | 17 +++++++++-------- misc/py-xgboost/pkg-plist | 16 ++++++++++++++++ misc/xgboost/Makefile | 2 +- misc/xgboost/distinfo | 6 +++--- 6 files changed, 35 insertions(+), 25 deletions(-) diff --git a/misc/py-xgboost/Makefile b/misc/py-xgboost/Makefile index 59bbcaa5424b..839c5a7121c4 100644 --- a/misc/py-xgboost/Makefile +++ b/misc/py-xgboost/Makefile @@ -1,7 +1,6 @@ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 1.6.1 -PORTREVISION= 1 +DISTVERSION= 1.6.2 CATEGORIES= misc # machine-learning PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,7 +18,7 @@ RUN_DEPENDS= ${PYNUMPY} \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ USES= compiler:c11 python:3.5+ localbase:ldflags -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils pytest # no Python tests are run, see https://github.com/dmlc/xgboost/issues/8208 USE_LDCONFIG= yes USE_GITHUB= yes @@ -31,15 +30,9 @@ PYDISTUTILS_INSTALLARGS= --use-system-libxgboost # this is ignored so that setup NO_ARCH= yes -POST_PLIST= fix-plist - -fix-plist: # https://github.com/dmlc/xgboost/issues/5705 - @${REINPLACE_CMD} 's|.*libxgboost${PYTHON_EXT_SUFFIX}.so$$||' ${TMPPLIST} +TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-install: ${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} -do-test: # tests fail w/out CUDA: https://github.com/dmlc/xgboost/issues/6881 - @cd ${WRKSRC}/.. && ${PYTHON_CMD} -m pytest - .include <bsd.port.mk> diff --git a/misc/py-xgboost/distinfo b/misc/py-xgboost/distinfo index 3334805f9271..8e66cf46f1e4 100644 --- a/misc/py-xgboost/distinfo +++ b/misc/py-xgboost/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652131151 -SHA256 (dmlc-xgboost-v1.6.1_GH0.tar.gz) = 76d932558606ea6047b4b9a547794d5eec47028713ddcef68baec5317a9761d0 -SIZE (dmlc-xgboost-v1.6.1_GH0.tar.gz) = 1752874 +TIMESTAMP = 1661727094 +SHA256 (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 0fbe4815d1e9407952ba485794c02b1bc9ead63bf7c541441aec47a671d7303f +SIZE (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 1754609 diff --git a/misc/py-xgboost/files/patch-setup.py b/misc/py-xgboost/files/patch-setup.py index 99247ee24d23..ffda5eae0975 100644 --- a/misc/py-xgboost/files/patch-setup.py +++ b/misc/py-xgboost/files/patch-setup.py @@ -1,33 +1,34 @@ ---- setup.py.orig 2021-04-20 00:31:38 UTC +--- setup.py.orig 2022-08-22 08:36:38 UTC +++ setup.py -@@ -60,14 +60,14 @@ def copy_tree(src_dir, target_dir): +@@ -60,7 +60,7 @@ def copy_tree(src_dir: str, target_dir: str) -> None: src = os.path.join(src_dir, 'src') inc = os.path.join(src_dir, 'include') - dmlc_core = os.path.join(src_dir, 'dmlc-core') + #dmlc_core = os.path.join(src_dir, 'dmlc-core') + gputreeshap = os.path.join(src_dir, "gputreeshap") rabit = os.path.join(src_dir, 'rabit') cmake = os.path.join(src_dir, 'cmake') - plugin = os.path.join(src_dir, 'plugin') +@@ -68,7 +68,7 @@ def copy_tree(src_dir: str, target_dir: str) -> None: clean_copy_tree(src, os.path.join(target_dir, 'src')) clean_copy_tree(inc, os.path.join(target_dir, 'include')) - clean_copy_tree(dmlc_core, os.path.join(target_dir, 'dmlc-core')) + #clean_copy_tree(dmlc_core, os.path.join(target_dir, 'dmlc-core')) + clean_copy_tree(gputreeshap, os.path.join(target_dir, "gputreeshap")) clean_copy_tree(rabit, os.path.join(target_dir, 'rabit')) clean_copy_tree(cmake, os.path.join(target_dir, 'cmake')) - clean_copy_tree(plugin, os.path.join(target_dir, 'plugin')) -@@ -125,7 +125,7 @@ class BuildExt(build_ext.build_ext): # pylint: disabl +@@ -142,7 +142,7 @@ class BuildExt(build_ext.build_ext): # pylint: disabl - def build_cmake_extension(self): + def build_cmake_extension(self) -> None: '''Configure and build using CMake''' - if USER_OPTIONS['use-system-libxgboost'][2]: + if True or USER_OPTIONS['use-system-libxgboost'][2]: # see https://github.com/dmlc/xgboost/issues/6879 self.logger.info('Using system libxgboost.') return -@@ -217,7 +217,7 @@ class InstallLib(install_lib.install_lib): - def install(self): +@@ -239,7 +239,7 @@ class InstallLib(install_lib.install_lib): + def install(self) -> List[str]: outfiles = super().install() - if USER_OPTIONS['use-system-libxgboost'][2] != 0: diff --git a/misc/py-xgboost/pkg-plist b/misc/py-xgboost/pkg-plist index 1ddb5b1777da..fd68b193fb10 100644 --- a/misc/py-xgboost/pkg-plist +++ b/misc/py-xgboost/pkg-plist @@ -1,3 +1,5 @@ +%%PYTHON_SITELIBDIR%%/xgboost/VERSION +%%PYTHON_SITELIBDIR%%/xgboost/__init__.py %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/_typing%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/callback%%PYTHON_EXT_SUFFIX%%.pyc @@ -12,3 +14,17 @@ %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/sklearn%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/tracker%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/training%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/xgboost/_typing.py +%%PYTHON_SITELIBDIR%%/xgboost/callback.py +%%PYTHON_SITELIBDIR%%/xgboost/compat.py +%%PYTHON_SITELIBDIR%%/xgboost/config.py +%%PYTHON_SITELIBDIR%%/xgboost/core.py +%%PYTHON_SITELIBDIR%%/xgboost/dask.py +%%PYTHON_SITELIBDIR%%/xgboost/data.py +%%PYTHON_SITELIBDIR%%/xgboost/libpath.py +%%PYTHON_SITELIBDIR%%/xgboost/plotting.py +%%PYTHON_SITELIBDIR%%/xgboost/py.typed +%%PYTHON_SITELIBDIR%%/xgboost/rabit.py +%%PYTHON_SITELIBDIR%%/xgboost/sklearn.py +%%PYTHON_SITELIBDIR%%/xgboost/tracker.py +%%PYTHON_SITELIBDIR%%/xgboost/training.py diff --git a/misc/xgboost/Makefile b/misc/xgboost/Makefile index 563d12e576d5..ee46495bd00b 100644 --- a/misc/xgboost/Makefile +++ b/misc/xgboost/Makefile @@ -1,6 +1,6 @@ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 1.6.1 +DISTVERSION= 1.6.2 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org diff --git a/misc/xgboost/distinfo b/misc/xgboost/distinfo index 73c19e60643f..324a478747a7 100644 --- a/misc/xgboost/distinfo +++ b/misc/xgboost/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1652130939 -SHA256 (dmlc-xgboost-v1.6.1_GH0.tar.gz) = 76d932558606ea6047b4b9a547794d5eec47028713ddcef68baec5317a9761d0 -SIZE (dmlc-xgboost-v1.6.1_GH0.tar.gz) = 1752874 +TIMESTAMP = 1661726534 +SHA256 (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 0fbe4815d1e9407952ba485794c02b1bc9ead63bf7c541441aec47a671d7303f +SIZE (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 1754609 SHA256 (NVlabs-cub-af39ee2_GH0.tar.gz) = 3444f1d0af16d3680bf5089c1a91e707769d946580b80f12463860366fb6884b SIZE (NVlabs-cub-af39ee2_GH0.tar.gz) = 413215 SHA256 (rapidsai-gputreeshap-5bba198_GH0.tar.gz) = bad0d98eddff46e298f4c6be71b140ac8573b2d1740f109f3151097c56f18463
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208282350.27SNoetF029771>