py-scikit-learn: simplify Makefile, and try and run more tests

[Matthew Danielson <matthewd%fastmail.us@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Matthew Danielson <matthewd%fastmail.us@localhost>
Pushed By:	matthewd
Date:		Mon Jul 4 05:21:11 2022 -0700
Changeset:	4ba19c6d7caa39b0ce2e65dcbe92b6fd8dbf89cb

Modified Files:
	py-scikit-learn/Makefile
	py-scikit-learn/distinfo
Added Files:
	py-scikit-learn/patches/patch-Makefile

Log Message:
py-scikit-learn: simplify Makefile, and try and run more tests

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4ba19c6d7caa39b0ce2e65dcbe92b6fd8dbf89cb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-scikit-learn/Makefile               |  6 ++----
 py-scikit-learn/distinfo               |  1 +
 py-scikit-learn/patches/patch-Makefile | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diffs:
diff --git a/py-scikit-learn/Makefile b/py-scikit-learn/Makefile
index 2c7eecc549..e1e0d711ac 100644
--- a/py-scikit-learn/Makefile
+++ b/py-scikit-learn/Makefile
@@ -5,7 +5,7 @@ PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/scikit-learn/}
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	matthewd%fastmail.us@localhost
 HOMEPAGE=	https://scikit-learn.org/
 COMMENT=	Machine learning algorithms for Python
 LICENSE=	modified-bsd
@@ -21,13 +21,11 @@ USE_TOOLS+=	gmake
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27 37 # py-scipy
 
-# The setup.py has integration with pytest-runner, but throws odd errors
 TEST_ENV+=PYTHON=python${PYVERSSUFFIX}
 TEST_ENV+=PYTEST=py.test-${PYVERSSUFFIX}
 TEST_ENV+=PYTHONPATH=.
-TEST_ENV+=OPENBLAS_NUM_THREADS=1
 do-test:
-	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} gmake test-code
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} gmake test
 
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/py-scikit-learn/distinfo b/py-scikit-learn/distinfo
index 25146af3d7..8268a4d3a8 100644
--- a/py-scikit-learn/distinfo
+++ b/py-scikit-learn/distinfo
@@ -3,3 +3,4 @@ $NetBSD: distinfo,v 1.9 2021/10/26 10:56:04 nia Exp $
 BLAKE2s (scikit-learn-1.1.1.tar.gz) = e003236f58c91f6fdf9cf26a46a4f1188dc17a367c8e7ab9cf0d885ab139beaf
 SHA512 (scikit-learn-1.1.1.tar.gz) = 56846e6123eb5f46beaa1b71f6d3f0d5ca6b668b69dbc266f598fe5eb375ae80eb5542a277745611db65a12f22a70a9216b3b04ab2b94da5a2797c2fa4746b0d
 Size (scikit-learn-1.1.1.tar.gz) = 6832930 bytes
+SHA1 (patch-Makefile) = a116e7405260019bfeeaa9ee8a18d84710289c53
diff --git a/py-scikit-learn/patches/patch-Makefile b/py-scikit-learn/patches/patch-Makefile
new file mode 100644
index 0000000000..ab938197b9
--- /dev/null
+++ b/py-scikit-learn/patches/patch-Makefile
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Use ${PYTHON} as our executable to determine which platform we are on
+
+--- Makefile.orig	2022-05-19 12:16:26.428781300 +0000
++++ Makefile
+@@ -8,7 +8,7 @@ PYTEST ?= pytest
+ CTAGS ?= ctags
+
+ # skip doctests on 32bit python
+-BITS := $(shell python -c 'import struct; print(8 * struct.calcsize("P"))')
++BITS := $(shell ${PYTHON} -c 'import struct; print(8 * struct.calcsize("P"))')
+
+ all: clean inplace test