misc/{,py-}xgboost: Update 1.6.2 -> 1.7.1

Reported by:	portscout

6 files changed, 35 insertions, 13 deletions

diff --git a/misc/py-xgboost/Makefile b/misc/py-xgboost/Makefile
index 8cb6f3531da8..aec056963f17 100644
--- a/misc/py-xgboost/Makefile
+++ b/misc/py-xgboost/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xgboost
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.2
+DISTVERSION=	1.7.1
 CATEGORIES=	misc # machine-learning
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -19,7 +19,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 pytest # no Python tests are run, see https://github.com/dmlc/xgboost/issues/8208
+USE_PYTHON=	distutils pytest # Python tests are broken because py-scikit-learn is missing the py-threadpoolctl dependency which is also currently broken
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
@@ -32,6 +32,7 @@ PYDISTUTILS_INSTALLARGS=	--use-system-libxgboost # this is ignored so that setup
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+TEST_WRKSRC=	${WRKSRC}/../tests/python
 
 post-install:
 	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
diff --git a/misc/py-xgboost/distinfo b/misc/py-xgboost/distinfo
index 8e66cf46f1e4..6e14f4ff6056 100644
--- a/misc/py-xgboost/distinfo
+++ b/misc/py-xgboost/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661727094
-SHA256 (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 0fbe4815d1e9407952ba485794c02b1bc9ead63bf7c541441aec47a671d7303f
-SIZE (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 1754609
+TIMESTAMP = 1667620826
+SHA256 (dmlc-xgboost-v1.7.1_GH0.tar.gz) = f2ae7ed3890950ebf28f63eeb59f4d1c10e997fb765fee40e7a2982befd21ed9
+SIZE (dmlc-xgboost-v1.7.1_GH0.tar.gz) = 1864706
diff --git a/misc/py-xgboost/pkg-plist b/misc/py-xgboost/pkg-plist
index fd68b193fb10..c82e9f35fad2 100644
--- a/misc/py-xgboost/pkg-plist
+++ b/misc/py-xgboost/pkg-plist
@@ -3,28 +3,48 @@
 %%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
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/collective%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/compat%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/core%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/dask%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/data%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/federated%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/libpath%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/plotting%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/rabit%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/sklearn%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/testing%%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/collective.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/federated.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/spark/__init__.py
+%%PYTHON_SITELIBDIR%%/xgboost/spark/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/spark/__pycache__/core%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/spark/__pycache__/data%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/spark/__pycache__/estimator%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/spark/__pycache__/model%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/spark/__pycache__/params%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/spark/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/spark/core.py
+%%PYTHON_SITELIBDIR%%/xgboost/spark/data.py
+%%PYTHON_SITELIBDIR%%/xgboost/spark/estimator.py
+%%PYTHON_SITELIBDIR%%/xgboost/spark/model.py
+%%PYTHON_SITELIBDIR%%/xgboost/spark/params.py
+%%PYTHON_SITELIBDIR%%/xgboost/spark/utils.py
+%%PYTHON_SITELIBDIR%%/xgboost/testing.py
 %%PYTHON_SITELIBDIR%%/xgboost/tracker.py
 %%PYTHON_SITELIBDIR%%/xgboost/training.py
diff --git a/misc/xgboost/Makefile b/misc/xgboost/Makefile
index f291cf135285..78b64b86d70b 100644
--- a/misc/xgboost/Makefile
+++ b/misc/xgboost/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xgboost
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.2
+DISTVERSION=	1.7.1
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -19,11 +19,11 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	dmlc
 GH_TUPLE=	\
 		NVlabs:cub:af39ee2:NVlabs_cub/cub \
-		rapidsai:gputreeshap:5bba198:rapidsai_gputreeshap/gputreeshap
+		rapidsai:gputreeshap:acb5be3:rapidsai_gputreeshap/gputreeshap
 
 LDFLAGS+=	${LOCALBASE}/lib/libdmlc.so -lexecinfo
 
-CMAKE_TESTING_ON=	GOOGLE_TEST
+CMAKE_TESTING_ON=	GOOGLE_TEST # 1 test fails, see https://github.com/dmlc/xgboost/issues/8425
 
 OPTIONS_DEFINE=		OPENMP
 
diff --git a/misc/xgboost/distinfo b/misc/xgboost/distinfo
index 324a478747a7..3339c2e20989 100644
--- a/misc/xgboost/distinfo
+++ b/misc/xgboost/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1661726534
-SHA256 (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 0fbe4815d1e9407952ba485794c02b1bc9ead63bf7c541441aec47a671d7303f
-SIZE (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 1754609
+TIMESTAMP = 1667614680
+SHA256 (dmlc-xgboost-v1.7.1_GH0.tar.gz) = f2ae7ed3890950ebf28f63eeb59f4d1c10e997fb765fee40e7a2982befd21ed9
+SIZE (dmlc-xgboost-v1.7.1_GH0.tar.gz) = 1864706
 SHA256 (NVlabs-cub-af39ee2_GH0.tar.gz) = 3444f1d0af16d3680bf5089c1a91e707769d946580b80f12463860366fb6884b
 SIZE (NVlabs-cub-af39ee2_GH0.tar.gz) = 413215
-SHA256 (rapidsai-gputreeshap-5bba198_GH0.tar.gz) = bad0d98eddff46e298f4c6be71b140ac8573b2d1740f109f3151097c56f18463
-SIZE (rapidsai-gputreeshap-5bba198_GH0.tar.gz) = 32468
+SHA256 (rapidsai-gputreeshap-acb5be3_GH0.tar.gz) = c2b67f8f398000570cac6b9d82a0bdab251105391602a3e07fd497c5e61534c4
+SIZE (rapidsai-gputreeshap-acb5be3_GH0.tar.gz) = 61972
diff --git a/misc/xgboost/pkg-plist b/misc/xgboost/pkg-plist
index b04d4dc1b24b..d8185719749b 100644
--- a/misc/xgboost/pkg-plist
+++ b/misc/xgboost/pkg-plist
@@ -1,6 +1,7 @@
 bin/xgboost
 include/xgboost/base.h
 include/xgboost/c_api.h
+include/xgboost/collective/socket.h
 include/xgboost/data.h
 include/xgboost/feature_map.h
 include/xgboost/gbm.h