diff options
| author | Charlie Li <vishwin@FreeBSD.org> | 2026-04-03 20:48:09 +0000 |
|---|---|---|
| committer | Charlie Li <vishwin@FreeBSD.org> | 2026-04-03 20:52:43 +0000 |
| commit | d04d23ae37d04c8ddf74c04ee868900b9189295a (patch) | |
| tree | 7eb7ecdc33397bf2c5d0bd2e18172a59e18691a4 | |
| parent | a92d927574fca313453ae266f4e78517eb406a33 (diff) | |
python.mk: retire ${PYNUMPY}
With both math/py-numpy (2) and math/py-numpy1, the variable stopped
making sense. Also remove the upper version bound.
470 files changed, 596 insertions, 599 deletions
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 57ed8fa54264..1312ac53c96a 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -317,7 +317,6 @@ # # PY_SETUPTOOLS - setuptools port based on USE_PYTHON=distutils # PYGAME - pygame port -# PYNUMPY - NumPy port # PY_MERCURIAL - mercurial port, PKGNAME varies based on default # Python version # PY_BOOST - Boost Python libraries port @@ -849,7 +848,6 @@ CMAKE_ARGS+= -DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}" # Python 3rd-party modules PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} -PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16<1.27:math/py-numpy1@${PY_FLAVOR} . if defined(_PYTHON_FEATURE_DISTUTILS) . if ${PYTHON_MAJOR_VER} < 3 diff --git a/Tools/scripts/ai-master-prompt.md b/Tools/scripts/ai-master-prompt.md index e14f45c92651..57d0bbfc4e4f 100644 --- a/Tools/scripts/ai-master-prompt.md +++ b/Tools/scripts/ai-master-prompt.md @@ -42,7 +42,6 @@ MAINTAINER: yuri@FreeBSD.org - The latest released version of the software can be determined using the command '../../Tools/scripts/pypi-get-latest-version.sh {python project name}' - Dependencies need to be updated when the port is updated. They need to be compared with the dependency requirements set in the project. - setuptools build dependency should never be added to BUILD_DEPENDS, and instead the distutils element should be present in USE_PYTHON. -- numpy dependency should be added as ${PYNUMPY} instead of the usual syntax. No version information should be added in this case. - pillow dependency should be added as ${PY_PILLOW} instead of the usual syntax. No version information should be added in this case. - The cython build dependency should never be added to BUILD_DEPENDS. Instead, the cython element should be added to USE_PYTHON for cython dependencies of versions 1.x or 2.x, and the cython3 element should be added to USE_PYTHON for cython dependencies of versions 3.x - Do not add upper version limits for Python based ports. diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile index f318d47922b3..ab4cce9b446b 100644 --- a/astro/astrometry/Makefile +++ b/astro/astrometry/Makefile @@ -16,7 +16,7 @@ BROKEN_armv7= fails to link: os-features-test.c:10: undefined symbol 'canonicali BUILD_DEPENDS= bash:shells/bash \ ${PY_SETUPTOOLS} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libcairo.so:graphics/cairo \ libcfitsio.so:astro/cfitsio \ libgsl.so:math/gsl \ @@ -24,7 +24,7 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \ libpng16.so:graphics/png \ libwcs.so:astro/wcslib RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>0:astro/py-astropy@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} #TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.0:math/py-matplotlib@${PY_FLAVOR} USES= gmake jpeg localbase pkgconfig python shebangfix diff --git a/astro/py-astroML/Makefile b/astro/py-astroML/Makefile index 3ff82b7d19d0..b539c6b7745a 100644 --- a/astro/py-astroML/Makefile +++ b/astro/py-astroML/Makefile @@ -13,7 +13,7 @@ WWW= https://www.astroml.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.19:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.18:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/astro/py-astropy-healpix/Makefile b/astro/py-astropy-healpix/Makefile index aeb0c8dbc409..a09249f6d3fd 100644 --- a/astro/py-astropy-healpix/Makefile +++ b/astro/py-astropy-healpix/Makefile @@ -15,12 +15,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extension-helpers>0:astro/py-extension-helpers@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>=5:astro/py-astropy@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-astropy>0:astro/py-pytest-astropy@${PY_FLAVOR} diff --git a/astro/py-astropy-helpers/Makefile b/astro/py-astropy-helpers/Makefile index f309096134f0..29cdb6900064 100644 --- a/astro/py-astropy-helpers/Makefile +++ b/astro/py-astropy-helpers/Makefile @@ -12,8 +12,8 @@ WWW= https://github.com/astropy/astropy-helpers LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/astro/py-astropy/Makefile b/astro/py-astropy/Makefile index 134e12fe386f..f0bfc0a3b867 100644 --- a/astro/py-astropy/Makefile +++ b/astro/py-astropy/Makefile @@ -13,9 +13,9 @@ WWW= https://www.astropy.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}extension-helpers>=0:astro/py-extension-helpers@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyerfa>=0:astro/py-pyerfa@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}astropy-iers-data>=0:astro/py-astropy-iers-data@${PY_FLAVOR} diff --git a/astro/py-jplephem/Makefile b/astro/py-jplephem/Makefile index 1aab97b5af04..cdb986532a97 100644 --- a/astro/py-jplephem/Makefile +++ b/astro/py-jplephem/Makefile @@ -11,8 +11,8 @@ WWW= https://github.com/brandon-rhodes/python-jplephem LICENSE= MIT -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} #USE_GITHUB= yes #GH_ACCOUNT= brandon-rhodes diff --git a/astro/py-pykep/Makefile b/astro/py-pykep/Makefile index 95ac38f263f4..f7b2a56cebe7 100644 --- a/astro/py-pykep/Makefile +++ b/astro/py-pykep/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \ libkeplerian_toolbox.so:astro/pykep \ ${PY_BOOST} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygmo2>0:science/py-pygmo2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} diff --git a/astro/py-pysofa/Makefile b/astro/py-pysofa/Makefile index 663a9c60ff54..bfb172a15a4d 100644 --- a/astro/py-pysofa/Makefile +++ b/astro/py-pysofa/Makefile @@ -13,7 +13,7 @@ LICENSE= PD LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${LOCALBASE}/lib/libsofa_c.so:astro/sofa \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python NO_ARCH= yes diff --git a/astro/py-pysolar/Makefile b/astro/py-pysolar/Makefile index e7d7dc01165d..ff5083c63b1a 100644 --- a/astro/py-pysolar/Makefile +++ b/astro/py-pysolar/Makefile @@ -13,7 +13,7 @@ WWW= https://pysolar.org/ \ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/astro/py-skyfield/Makefile b/astro/py-skyfield/Makefile index a21f18a12e09..4a69d2b791bf 100644 --- a/astro/py-skyfield/Makefile +++ b/astro/py-skyfield/Makefile @@ -11,11 +11,11 @@ WWW= https://rhodesmill.org/skyfield/ LICENSE= MIT -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sgp4>0:astro/py-sgp4@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jplephem>0:astro/py-jplephem@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ diff --git a/astro/py-spktype01/Makefile b/astro/py-spktype01/Makefile index b3ab87a08aa4..2918fa9b7fdf 100644 --- a/astro/py-spktype01/Makefile +++ b/astro/py-spktype01/Makefile @@ -10,8 +10,8 @@ WWW= https://github.com/whiskie14142/spktype01 LICENSE= MIT -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jplephem>0:astro/py-jplephem@${PY_FLAVOR} USE_GITHUB= yes diff --git a/astro/py-spktype21/Makefile b/astro/py-spktype21/Makefile index ec6d957bf533..70b84e7ebf32 100644 --- a/astro/py-spktype21/Makefile +++ b/astro/py-spktype21/Makefile @@ -10,8 +10,8 @@ WWW= https://github.com/whiskie14142/spktype21 LICENSE= MIT -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jplephem>0:astro/py-jplephem@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spktype01>0:astro/py-spktype01@${PY_FLAVOR} \ py.test:devel/py-pytest@${PY_FLAVOR} diff --git a/astro/py-sunpy/Makefile b/astro/py-sunpy/Makefile index cf092e1f4f3b..f74afd8df38d 100644 --- a/astro/py-sunpy/Makefile +++ b/astro/py-sunpy/Makefile @@ -12,12 +12,12 @@ WWW= https://www.sunpy.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}astropy>=0:astro/py-astropy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}extension-helpers>=0:astro/py-extension-helpers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}astropy>=0:astro/py-astropy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR} \ diff --git a/audio/moodbar/Makefile b/audio/moodbar/Makefile index 9729ae95c1a7..2000bf0e49bf 100644 --- a/audio/moodbar/Makefile +++ b/audio/moodbar/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfftw3.so:math/fftw3 -TEST_DEPENDS= ${PYNUMPY} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++17-lang gnome gstreamer meson pkgconfig python:test \ shebangfix tar:xz diff --git a/audio/py-SoundFile/Makefile b/audio/py-SoundFile/Makefile index b5a2858d061f..13f6bb67e371 100644 --- a/audio/py-SoundFile/Makefile +++ b/audio/py-SoundFile/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0:devel/py-cffi@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0:devel/py-cffi@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PREFIX}/lib/libsndfile.so:audio/libsndfile USES= python diff --git a/audio/py-aubio/Makefile b/audio/py-aubio/Makefile index aec61f68b124..8f5d2f9d9f13 100644 --- a/audio/py-aubio/Makefile +++ b/audio/py-aubio/Makefile @@ -6,8 +6,8 @@ MAINTAINER= jhale@FreeBSD.org COMMENT= Python bindings for aubio music analysis LIB_DEPENDS= libaubio.so:audio/aubio -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= sox:audio/sox USES+= python diff --git a/audio/py-auditok/Makefile b/audio/py-auditok/Makefile index fbd97d5a3306..9aee953ed282 100644 --- a/audio/py-auditok/Makefile +++ b/audio/py-auditok/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydub>0:audio/py-pydub@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} diff --git a/audio/py-essentia/Makefile b/audio/py-essentia/Makefile index 3208f040a44c..889cfaaa3288 100644 --- a/audio/py-essentia/Makefile +++ b/audio/py-essentia/Makefile @@ -14,11 +14,11 @@ WWW= https://essentia.upf.edu/ \ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.txt -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} LIB_DEPENDS= libessentia.so:audio/essentia -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} diff --git a/audio/py-librosa/Makefile b/audio/py-librosa/Makefile index 87c753fbd61a..a8733aaa24da 100644 --- a/audio/py-librosa/Makefile +++ b/audio/py-librosa/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}audioread>=2.1.9:audio/py-audioread@${PY_FLA ${PYTHON_PKGNAMEPREFIX}lazy_loader>=0.1:devel/py-lazy_loader@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>=0.51.0:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pooch>=1.1:devel/py-pooch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.1.0:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/audio/py-music21/Makefile b/audio/py-music21/Makefile index 431562138c7f..7398438cce3e 100644 --- a/audio/py-music21/Makefile +++ b/audio/py-music21/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpickle>0:devel/py-jsonpickle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webcolors>=1.5:graphics/py-webcolors@${PY_FLAVOR} \ lilypond:print/lilypond \ diff --git a/audio/py-pysndfile/Makefile b/audio/py-pysndfile/Makefile index dad4372dc93c..d36158691783 100644 --- a/audio/py-pysndfile/Makefile +++ b/audio/py-pysndfile/Makefile @@ -11,10 +11,10 @@ WWW= https://forge-2.ircam.fr/roebel/pysndfile LICENSE= LGPL3 -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} LIB_DEPENDS= libsndfile.so:audio/libsndfile -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python localbase USE_PYTHON= distutils autoplist cython pytest diff --git a/audio/py-resampy/Makefile b/audio/py-resampy/Makefile index e9f432305c3e..3dfe00405714 100644 --- a/audio/py-resampy/Makefile +++ b/audio/py-resampy/Makefile @@ -13,7 +13,7 @@ LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numba>=0.53:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/audio/py-samplerate/Makefile b/audio/py-samplerate/Makefile index 243a70273752..344d282664c4 100644 --- a/audio/py-samplerate/Makefile +++ b/audio/py-samplerate/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ pybind11>0:devel/pybind11 \ cmake:devel/cmake-core LIB_DEPENDS= libsamplerate.so:audio/libsamplerate -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake compiler:c++14-lang pkgconfig python USE_PYTHON= flavors pytest diff --git a/audio/py-sounddevice/Makefile b/audio/py-sounddevice/Makefile index 7bde463c8a88..db3a16630021 100644 --- a/audio/py-sounddevice/Makefile +++ b/audio/py-sounddevice/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ portaudio>0:audio/portaudio USES= python diff --git a/audio/py-soxr/Makefile b/audio/py-soxr/Makefile index 81262f80a15b..0aad3ed11f85 100644 --- a/audio/py-soxr/Makefile +++ b/audio/py-soxr/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0.9.0:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= pep517 autoplist pytest diff --git a/audio/py-wavio/Makefile b/audio/py-wavio/Makefile index 938dfc9d5aa3..08251ee41e98 100644 --- a/audio/py-wavio/Makefile +++ b/audio/py-wavio/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/WarrenWeckesser/wavio/ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/biology/groopm/Makefile b/biology/groopm/Makefile index 92d44ed83a8e..0d64d547a841 100644 --- a/biology/groopm/Makefile +++ b/biology/groopm/Makefile @@ -11,7 +11,7 @@ WWW= https://ecogenomics.github.io/GroopM/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1.0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.10.1:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tables>=2.3:devel/py-tables@${PY_FLAVOR} diff --git a/biology/prodigy-lig/Makefile b/biology/prodigy-lig/Makefile index 37913457187b..866f357313fb 100644 --- a/biology/prodigy-lig/Makefile +++ b/biology/prodigy-lig/Makefile @@ -11,7 +11,7 @@ WWW= https://nestor.science.uu.nl/prodigy/lig LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}biopython>0:biology/py-biopython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}biopython>0:biology/py-biopython@${PY_FLAVOR} diff --git a/biology/py-PySCeS/Makefile b/biology/py-PySCeS/Makefile index ee1350ce2310..5e1750a708c9 100644 --- a/biology/py-PySCeS/Makefile +++ b/biology/py-PySCeS/Makefile @@ -14,9 +14,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meson-python>0:devel/meson-python@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} PY_EXTRA= ${PYTHON_PKGNAMEPREFIX}python-libsbml>0:biology/py-python-libsbml@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PY_EXTRA} diff --git a/biology/py-biom-format/Makefile b/biology/py-biom-format/Makefile index 1dd753d79aff..c73a91796140 100644 --- a/biology/py-biom-format/Makefile +++ b/biology/py-biom-format/Makefile @@ -11,9 +11,9 @@ WWW= https://biom-format.org/ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.3.1:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.20.0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>=2.2.0:science/py-h5py@${PY_FLAVOR} diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile index 5c131cfa505b..1c81dea53bd7 100644 --- a/biology/py-biopython/Makefile +++ b/biology/py-biopython/Makefile @@ -12,8 +12,8 @@ WWW= https://biopython.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/biology/py-biosig/Makefile b/biology/py-biosig/Makefile index b1eaac088600..79dd6be9e5d1 100644 --- a/biology/py-biosig/Makefile +++ b/biology/py-biosig/Makefile @@ -13,7 +13,7 @@ WWW= https://biosig.sourceforge.net/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/../../COPYING -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libbiosig.so:biology/biosig USES= python tar:xz diff --git a/biology/py-bx-python/Makefile b/biology/py-bx-python/Makefile index 3884f6998dfb..329032d640ef 100644 --- a/biology/py-bx-python/Makefile +++ b/biology/py-bx-python/Makefile @@ -13,7 +13,7 @@ WWW= https://github.com/bxlab/bx-python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PY_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} diff --git a/biology/py-deeptools/Makefile b/biology/py-deeptools/Makefile index dc03e09d2bcf..e83d82db1e00 100644 --- a/biology/py-deeptools/Makefile +++ b/biology/py-deeptools/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/deeptools/deepTools LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.17.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysam>=0.14.0:biology/py-pysam@${PY_FLAVOR} \ diff --git a/biology/py-ete3/Makefile b/biology/py-ete3/Makefile index f6d9518113bb..528ce2f79082 100644 --- a/biology/py-ete3/Makefile +++ b/biology/py-ete3/Makefile @@ -12,7 +12,7 @@ WWW= http://etetoolkit.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} diff --git a/biology/py-goatools/Makefile b/biology/py-goatools/Makefile index 6c8869a0b03d..904793dab0e8 100644 --- a/biology/py-goatools/Makefile +++ b/biology/py-goatools/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # xlrd should be == 1.2.0 RUN_DEPENDS= ${PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}statsmodels>0:math/py-statsmodels@${PY_FLAVOR} \ diff --git a/biology/py-htseq/Makefile b/biology/py-htseq/Makefile index 8fc5135ba2e7..d057c5e18783 100644 --- a/biology/py-htseq/Makefile +++ b/biology/py-htseq/Makefile @@ -13,10 +13,10 @@ WWW= https://github.com/htseq/htseq/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysam>0:biology/py-pysam@${PY_FLAVOR} RUN_DEPENDS= ${PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysam>0:biology/py-pysam@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.1.0:math/py-pandas@${PY_FLAVOR} \ diff --git a/biology/py-loompy/Makefile b/biology/py-loompy/Makefile index 87ac799814dc..b059cd0a64e4 100644 --- a/biology/py-loompy/Makefile +++ b/biology/py-loompy/Makefile @@ -12,7 +12,7 @@ WWW= https://loompy.org/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \ diff --git a/biology/py-macs2/Makefile b/biology/py-macs2/Makefile index 4d905909aa13..3114c6dd2fd0 100644 --- a/biology/py-macs2/Makefile +++ b/biology/py-macs2/Makefile @@ -12,8 +12,8 @@ WWW= https://github.com/taoliu/MACS LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cykhash>0:devel/py-cykhash@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ bash:shells/bash diff --git a/biology/py-macs3/Makefile b/biology/py-macs3/Makefile index 697cda306f9b..99cc072bf654 100644 --- a/biology/py-macs3/Makefile +++ b/biology/py-macs3/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON_i386=Requires _Float16 -COMMON_DEPENDS= ${PYNUMPY} \ +COMMON_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>1.11.1:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cykhash>=2.0,<3.0:devel/py-cykhash@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.3:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/biology/py-mrcfile/Makefile b/biology/py-mrcfile/Makefile index 504e9349c3c6..a97aad8ff9b0 100644 --- a/biology/py-mrcfile/Makefile +++ b/biology/py-mrcfile/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/ccpem/mrcfile LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist diff --git a/biology/py-multiqc/Makefile b/biology/py-multiqc/Makefile index d17816870f94..2bbf2609bd76 100644 --- a/biology/py-multiqc/Makefile +++ b/biology/py-multiqc/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE # Use either py-kaleido (not in ports yet) or py-orca + py-psutil -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}humanize>0:devel/py-humanize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}orca>0:devel/py-orca@${PY_FLAVOR} \ diff --git a/biology/py-ont-fast5-api/Makefile b/biology/py-ont-fast5-api/Makefile index 284b6dc8b28e..d667f0e94b64 100644 --- a/biology/py-ont-fast5-api/Makefile +++ b/biology/py-ont-fast5-api/Makefile @@ -13,7 +13,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libvbz_hdf_plugin.so:archivers/vbz-compression -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>=2.2.0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${PY_FLAVOR} diff --git a/biology/py-pydeseq2/Makefile b/biology/py-pydeseq2/Makefile index 25285f85cd4f..ec4fc77c30a2 100644 --- a/biology/py-pydeseq2/Makefile +++ b/biology/py-pydeseq2/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}anndata>=0.8.0:devel/py-anndata@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}formulaic>=1.0.2:math/py-formulaic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}formulaic_contrasts>=0.2.0:math/py-formulaic-contrasts@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.6.2:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.4.0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.1.0:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>1.11.0:science/py-scipy@${PY_FLAVOR} diff --git a/biology/py-scikit-bio/Makefile b/biology/py-scikit-bio/Makefile index 9a7245b2ad97..c3de41cee3a3 100644 --- a/biology/py-scikit-bio/Makefile +++ b/biology/py-scikit-bio/Makefile @@ -17,7 +17,7 @@ BROKEN_aarch64= fails to build: invalid conversion between vector type '__m64' ( BROKEN= requires OpenMP support that is missing on this architecture .endif -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}biom-format>0:biology/py-biom-format@${PY_FLAVOR} \ @@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}biom-format>0:biology/py-biom-format@${PY_FL ${PYTHON_PKGNAMEPREFIX}ipython>=3.2.0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}natsort>=4.0.3:devel/py-natsort@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.19.1:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/biology/pyfasta/Makefile b/biology/pyfasta/Makefile index 6c190c2737b0..7d0dfb3d302d 100644 --- a/biology/pyfasta/Makefile +++ b/biology/pyfasta/Makefile @@ -11,7 +11,7 @@ WWW= https://bitbucket.org/brentp/biostuff/src/ LICENSE= MIT -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python diff --git a/cad/py-gdstk/Makefile b/cad/py-gdstk/Makefile index 7d1faf89f4a5..884315df6162 100644 --- a/cad/py-gdstk/Makefile +++ b/cad/py-gdstk/Makefile @@ -15,13 +15,13 @@ LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>0:devel/py-pyproject-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ cmake:devel/cmake-core LIB_DEPENDS= libqhull_r.so:math/qhull -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++17-lang python USE_PYTHON= autoplist pep517 pytest diff --git a/cad/py-pyfda/Makefile b/cad/py-pyfda/Makefile index cf94b364dc4d..ca53e86b42db 100644 --- a/cad/py-pyfda/Makefile +++ b/cad/py-pyfda/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= python pyqt:5 diff --git a/cad/py-pygmsh/Makefile b/cad/py-pygmsh/Makefile index 78743ff241c7..946ca82dddf4 100644 --- a/cad/py-pygmsh/Makefile +++ b/cad/py-pygmsh/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmsh>0:cad/py-gmsh@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}meshio>=4.3.2:science/py-meshio@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/cad/xyce/Makefile b/cad/xyce/Makefile index 3d1b816c03eb..8c0994241de4 100644 --- a/cad/xyce/Makefile +++ b/cad/xyce/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= libblas.so:math/blas \ libsuitesparseconfig.so:math/suitesparse-config \ libumfpack.so:math/suitesparse-umfpack TEST_DEPENDS= git:devel/git \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss diff --git a/comms/apitran/Makefile b/comms/apitran/Makefile index 64d222a2303d..85423ea84f27 100644 --- a/comms/apitran/Makefile +++ b/comms/apitran/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ sox:audio/sox diff --git a/comms/cubicsdr/Makefile b/comms/cubicsdr/Makefile index 9c16baf002f3..4453704206e4 100644 --- a/comms/cubicsdr/Makefile +++ b/comms/cubicsdr/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libhamlib.so:comms/hamlib \ libpulse.so:audio/pulseaudio \ libSoapySDR.so:misc/soapysdr RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake:noninja compiler:c++11-lib gl python USE_GL+= egl glu diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index cbb2d5e47113..06ca2b1500a9 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -10,7 +10,7 @@ WWW= https://www.gnuradio.org/ LICENSE= GPLv3 -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyqtgraph>0:graphics/py-pyqtgraph@${PY_FLAVOR} \ diff --git a/comms/nanovna-saver/Makefile b/comms/nanovna-saver/Makefile index bdd7edced48b..8d78c750d5fe 100644 --- a/comms/nanovna-saver/Makefile +++ b/comms/nanovna-saver/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/NanoVNA-Saver/nanovna-saver LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile index 3b3d91b57b7b..9c9a7ef42b89 100644 --- a/comms/uhd/Makefile +++ b/comms/uhd/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ rst2html:textproc/py-docutils@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0:devel/py-ruamel.yaml@${PY_FLAVOR} diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile index 80ce62887a35..2fb065a1f8cf 100644 --- a/databases/arrow/Makefile +++ b/databases/arrow/Makefile @@ -145,8 +145,8 @@ BUILD_UTILITIES_CMAKE_BOOL= ARROW_BUILD_UTILITIES #PYTHON_DESC= Build python extension support #PYTHON_CMAKE_BOOL= ARROW_PYTHON #PYTHON_USES= python -#PYTHON_BUILD_DEPENDS= ${PYNUMPY} # see https://issues.apache.org/jira/browse/ARROW-16820 -#PYTHON_RUN_DEPENDS= ${PYNUMPY} +#PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} # see https://issues.apache.org/jira/browse/ARROW-16820 +#PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} #PYTHON_IMPLIES= COMPUTE CSV DATASET FILESYSTEM HDFS JSON #PYTHON_VARS= PLIST_SUB+=PYTHON_SUFFIX=${PYTHON_SUFFIX} diff --git a/databases/py-apache-arrow/Makefile b/databases/py-apache-arrow/Makefile index 485699a67da9..668c4291a5ea 100644 --- a/databases/py-apache-arrow/Makefile +++ b/databases/py-apache-arrow/Makefile @@ -16,11 +16,11 @@ LICENSE_FILE= ${WRKSRC}/../LICENSE.txt BROKEN_i386= compilation fails: ran out of registers during register allocation BUILD_DEPENDS= cmake:devel/cmake-core \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libarrow.so:databases/arrow # assumes that arrow is built with PYTHON=ON (python support is built) USES= compiler:c++11-lang pkgconfig python diff --git a/databases/py-duckdb/Makefile b/databases/py-duckdb/Makefile index 51cd9d00a1e6..3f6406639e09 100644 --- a/databases/py-duckdb/Makefile +++ b/databases/py-duckdb/Makefile @@ -14,10 +14,10 @@ LICENSE= MIT BUILD_DEPENDS= cmake:devel/cmake-core \ ninja:devel/ninja \ ${PYTHON_PKGNAMEPREFIX}pybind11>=2.6.0:devel/py-pybind11@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fsspec>0:filesystems/py-fsspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}google-cloud-storage>0:www/py-google-cloud-storage@${PY_FLAVOR} \ diff --git a/databases/py-redisvl/Makefile b/databases/py-redisvl/Makefile index 9e136c325eb3..1cfef5f644fb 100644 --- a/databases/py-redisvl/Makefile +++ b/databases/py-redisvl/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4<7.0:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}redis>=5.0<8.0:databases/py-redis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>=2<3:devel/py-pydantic2@${PY_FLAVOR} \ diff --git a/devel/cpp2py/Makefile b/devel/cpp2py/Makefile index 5357f429506c..7e8bb48a03ee 100644 --- a/devel/cpp2py/Makefile +++ b/devel/cpp2py/Makefile @@ -13,7 +13,7 @@ WWW= https://github.com/TRIQS/cpp2py LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} diff --git a/devel/py-aiortc/Makefile b/devel/py-aiortc/Makefile index d8927e7ed1a0..8c85af2f009e 100644 --- a/devel/py-aiortc/Makefile +++ b/devel/py-aiortc/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PY_SETUPTOOLS} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}aioice>=0.10.1:devel/py-aioice@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}av>=14.0.0:multimedia/py-av@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}google-crc32c>=1.1:devel/py-google-crc32c@${PY_FLAVOR} \ diff --git a/devel/py-asteval/Makefile b/devel/py-asteval/Makefile index c4e3c67de2ab..354934a939ee 100644 --- a/devel/py-asteval/Makefile +++ b/devel/py-asteval/Makefile @@ -14,7 +14,7 @@ LICENSE_FILES= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/devel/py-autoray/Makefile b/devel/py-autoray/Makefile index fa93bda17c47..1d7db4a57b7e 100644 --- a/devel/py-autoray/Makefile +++ b/devel/py-autoray/Makefile @@ -20,7 +20,7 @@ BE_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autograd>0:math/py-autograd@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sparse>0:devel/py-sparse@${PY_FLAVOR} #BE_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVOR} # tests crash with tensorflow TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ ${BE_DEPENDS} diff --git a/devel/py-beartype/Makefile b/devel/py-beartype/Makefile index b896a9410598..fc704711721f 100644 --- a/devel/py-beartype/Makefile +++ b/devel/py-beartype/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mypy>0:devel/py-mypy@${PY_FLAVOR} \ diff --git a/devel/py-bullet3/Makefile b/devel/py-bullet3/Makefile index 8000254a6c42..1db4b8c512b8 100644 --- a/devel/py-bullet3/Makefile +++ b/devel/py-bullet3/Makefile @@ -11,7 +11,7 @@ WWW= https://pybullet.org/wordpress/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gym>0:math/py-gym@${PY_FLAVOR} USES= compiler:c++11-lang gl localbase python diff --git a/devel/py-cclib/Makefile b/devel/py-cclib/Makefile index 3d2430d7e6c0..6b212dabb7c8 100644 --- a/devel/py-cclib/Makefile +++ b/devel/py-cclib/Makefile @@ -12,8 +12,8 @@ WWW= https://cclib.github.io LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/devel/py-cftime/Makefile b/devel/py-cftime/Makefile index c2a8d55efb3e..5c0106366331 100644 --- a/devel/py-cftime/Makefile +++ b/devel/py-cftime/Makefile @@ -12,8 +12,8 @@ WWW= https://github.com/Unidata/cftime LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} diff --git a/devel/py-colorspacious/Makefile b/devel/py-colorspacious/Makefile index a10728bf542f..6765c72e3875 100644 --- a/devel/py-colorspacious/Makefile +++ b/devel/py-colorspacious/Makefile @@ -12,8 +12,8 @@ WWW= https://github.com/njsmith/colorspacious LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/devel/py-ewah-bool-utils/Makefile b/devel/py-ewah-bool-utils/Makefile index 1468c500a808..0c72c4030fdf 100644 --- a/devel/py-ewah-bool-utils/Makefile +++ b/devel/py-ewah-bool-utils/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.37.1:devel/py-wheel@${PY_FLAVOR} \ - ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= autoplist cython pep517 pytest diff --git a/devel/py-fastf1/Makefile b/devel/py-fastf1/Makefile index ec9003b44fba..05f4ffb1a3c5 100644 --- a/devel/py-fastf1/Makefile +++ b/devel/py-fastf1/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatch-vcs>=0:devel/py-hatch-vcs@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.3:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-cache>=0:www/py-requests-cache@${PY_FLAVOR} \ diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile index 15d65ff2cc17..a8cb77c59978 100644 --- a/devel/py-game/Makefile +++ b/devel/py-game/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/docs/LGPL.txt BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat USES= compiler:c11 jpeg localbase pkgconfig python sdl xorg diff --git a/devel/py-ipydatawidgets/Makefile b/devel/py-ipydatawidgets/Makefile index a548991248ab..b60819dbf19d 100644 --- a/devel/py-ipydatawidgets/Makefile +++ b/devel/py-ipydatawidgets/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter-packaging>0:devel/py-jupyter-packaging@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipywidgets>=7.0.0:devel/py-ipywidgets@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traittypes>=0.2.0:devel/py-traittypes@${PY_FLAVOR} USES= python diff --git a/devel/py-ipympl/Makefile b/devel/py-ipympl/Makefile index 6cd29818c136..b64720e8d0e4 100644 --- a/devel/py-ipympl/Makefile +++ b/devel/py-ipympl/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-jupyter-builder>=0.8.3:devel/py-hatc ${PYTHON_PKGNAMEPREFIX}hatch-nodejs-version>=0.3.2:devel/py-hatch-nodejs-version@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jupyterlab>=4.0.0:devel/py-jupyterlab@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jupyterlab>=4.0.0:devel/py-jupyterlab@${PY_FLAVOR} \ diff --git a/devel/py-jaxtyping/Makefile b/devel/py-jaxtyping/Makefile index 8483cf8e0902..21682c072b9b 100644 --- a/devel/py-jaxtyping/Makefile +++ b/devel/py-jaxtyping/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wadler-lindig>=0.1.3:devel/py-wadler-lindig@ ${PYTHON_PKGNAMEPREFIX}equinox>=0.13.1:misc/py-equinox@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jax>0:math/py-jax@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=1.2.0:devel/py-pytest-asyncio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=8.4.2:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVOR} \ diff --git a/devel/py-jep/Makefile b/devel/py-jep/Makefile index c0aa1eac9268..aafbca85b38c 100644 --- a/devel/py-jep/Makefile +++ b/devel/py-jep/Makefile @@ -27,8 +27,8 @@ LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NUMPY OPTIONS_DEFAULT= NUMPY -NUMPY_BUILD_DEPENDS= ${PYNUMPY} -NUMPY_RUN_DEPENDS= ${PYNUMPY} +NUMPY_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} post-install: ${LN} -s ${PYTHON_SITELIBDIR}/jep/jep-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jep.jar diff --git a/devel/py-joblib/Makefile b/devel/py-joblib/Makefile index a4d63d568408..d5734c3a3e8c 100644 --- a/devel/py-joblib/Makefile +++ b/devel/py-joblib/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -TEST_DEPENDS= ${PYNUMPY} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} #TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}threadpoolctl>0:devel/py-threadpoolctl@${PY_FLAVOR} USES= python diff --git a/devel/py-jsonpickle/Makefile b/devel/py-jsonpickle/Makefile index 18d3a9a1c911..9e1dc430deea 100644 --- a/devel/py-jsonpickle/Makefile +++ b/devel/py-jsonpickle/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}\ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/py-pymongo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-benchmark>0:devel/py-pytest-benchmark@${PY_FLAVOR} \ diff --git a/devel/py-jupyter-rfb/Makefile b/devel/py-jupyter-rfb/Makefile index adc1c7eed3f5..52af43fefe8d 100644 --- a/devel/py-jupyter-rfb/Makefile +++ b/devel/py-jupyter-rfb/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}simplejpeg>0:graphics/py-simplejpeg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipywidgets>=7.6.0:devel/py-ipywidgets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jupyterlab-widgets>0:devel/py-jupyterlab-widgets@${PY_FLAVOR} \ - ${PYNUMPY} # probably only one of pillow and simplejpeg is needed + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} # probably only one of pillow and simplejpeg is needed USES= python USE_PYTHON= pep517 autoplist concurrent pytest diff --git a/devel/py-monty/Makefile b/devel/py-monty/Makefile index 59bcec6bebc5..4c651d1fa7ef 100644 --- a/devel/py-monty/Makefile +++ b/devel/py-monty/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}invoke>0:devel/py-invoke@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \ diff --git a/devel/py-pycompilation/Makefile b/devel/py-pycompilation/Makefile index 84b7defd1e8d..f132e87c173c 100644 --- a/devel/py-pycompilation/Makefile +++ b/devel/py-pycompilation/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/bjodah/pycompilation LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} USES= python diff --git a/devel/py-pyquil/Makefile b/devel/py-pyquil/Makefile index 6b1637adbb9d..0527b2993611 100644 --- a/devel/py-pyquil/Makefile +++ b/devel/py-pyquil/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lark>=0.11.1:devel/py-lark@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=2.5:math/py-networkx@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=23.1:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic>=1.10.7:devel/py-pydantic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qcs-sdk-python>=0.16.3:devel/py-qcs-sdk-python@${PY_FLAVOR} \ diff --git a/devel/py-pysimdjson/Makefile b/devel/py-pysimdjson/Makefile index b1816814fa99..a7e9f65a53da 100644 --- a/devel/py-pysimdjson/Makefile +++ b/devel/py-pysimdjson/Makefile @@ -11,7 +11,7 @@ WWW= https://pysimdjson.tkte.ch/ LICENSE= MIT -#TEST_DEPENDS= ${PYNUMPY} \ +#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ # ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \ # ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ # ${PYTHON_PKGNAMEPREFIX}pytest-benchmark>=0:devel/py-pytest-benchmark@${PY_FLAVOR} diff --git a/devel/py-pytest-arraydiff/Makefile b/devel/py-pytest-arraydiff/Makefile index 22c2484a2010..92df124a5321 100644 --- a/devel/py-pytest-arraydiff/Makefile +++ b/devel/py-pytest-arraydiff/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=4.6:devel/py-pytest@${PY_FLAVOR} USES= python diff --git a/devel/py-pythran/Makefile b/devel/py-pythran/Makefile index a37b031ea698..224aff79a90d 100644 --- a/devel/py-pythran/Makefile +++ b/devel/py-pythran/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gast>=0.7.0<=0.8:devel/py-gast@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beniget>=0.4.0:devel/py-beniget@${PY_FLAVOR} diff --git a/devel/py-qcs-sdk-python/Makefile b/devel/py-qcs-sdk-python/Makefile index 2862826f9d7c..6e8870e74681 100644 --- a/devel/py-qcs-sdk-python/Makefile +++ b/devel/py-qcs-sdk-python/Makefile @@ -15,7 +15,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>=1.2.3:devel/py-maturin@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cargo python USE_PYTHON= pep517 autoplist diff --git a/devel/py-qutip-qip/Makefile b/devel/py-qutip-qip/Makefile index 69788fbc3631..fe7155ac956c 100644 --- a/devel/py-qutip-qip/Makefile +++ b/devel/py-qutip-qip/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qutip>=4.5:devel/py-qutip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} # optional dependency required for tests diff --git a/devel/py-qutip/Makefile b/devel/py-qutip/Makefile index e546b5f68f86..f7cf185518f0 100644 --- a/devel/py-qutip/Makefile +++ b/devel/py-qutip/Makefile @@ -12,7 +12,7 @@ WWW= https://qutip.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.9:science/py-scipy@${PY_FLAVOR} diff --git a/devel/py-rapidfuzz/Makefile b/devel/py-rapidfuzz/Makefile index 240688779e25..1bd99f563cbf 100644 --- a/devel/py-rapidfuzz/Makefile +++ b/devel/py-rapidfuzz/Makefile @@ -16,12 +16,12 @@ BUILD_DEPENDS= cmake:devel/cmake-core \ ninja:devel/ninja \ rapidfuzz-cpp>0:devel/rapidfuzz-cpp \ taskflow>0:devel/taskflow \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rapidfuzz-capi>=1.0.5:devel/py-rapidfuzz-capi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0.10.7:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build>=0.13.0:devel/py-scikit-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} USES= compiler:c++14-lang python diff --git a/devel/py-rpcq/Makefile b/devel/py-rpcq/Makefile index 406e9877a4cc..8199be90991b 100644 --- a/devel/py-rpcq/Makefile +++ b/devel/py-rpcq/Makefile @@ -12,12 +12,12 @@ WWW= https://github.com/rigetti/rpcq LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.6:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-rapidjson>0:devel/py-python-rapidjson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyzmq>=17:net/py-pyzmq@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} -TEST_DEPENDS= ${PYNUMPY} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=5.4.0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} diff --git a/devel/py-spyder-kernels/Makefile b/devel/py-spyder-kernels/Makefile index 37b261b16afe..30b984938fa5 100644 --- a/devel/py-spyder-kernels/Makefile +++ b/devel/py-spyder-kernels/Makefile @@ -26,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAV # 100 passed, 7 skipped, 4 warnings # 1 failure may occur, see https://github.com/spyder-ide/spyder-kernels/issues/501 # test_django_settings fail if www/djangoXX not installed -#TEST_DEPENDS= ${PYNUMPY} \ +#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ # ${PYTHON_PKGNAMEPREFIX}codecov>0:devel/py-codecov@${PY_FLAVOR} \ # ${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} \ # ${PYTHON_PKGNAMEPREFIX}dask>0:devel/py-dask@${PY_FLAVOR} \ diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile index 8f55bfc89781..2c59faf2a392 100644 --- a/devel/py-tables/Makefile +++ b/devel/py-tables/Makefile @@ -11,7 +11,7 @@ WWW= https://www.pytables.org/ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}py-cpuinfo>=0:sysutils/py-py-cpuinfo@${PY_FLAVOR} diff --git a/devel/py-tabulate2/Makefile b/devel/py-tabulate2/Makefile index be3a81ae20f2..1ecf371a8ca9 100644 --- a/devel/py-tabulate2/Makefile +++ b/devel/py-tabulate2/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4.3:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR} -TEST_DEPENDS= ${PYNUMPY} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR} diff --git a/devel/py-traits/Makefile b/devel/py-traits/Makefile index 0644e7294796..487847306d00 100644 --- a/devel/py-traits/Makefile +++ b/devel/py-traits/Makefile @@ -11,7 +11,7 @@ WWW= https://pypi.org/project/traits/ LICENSE= BSD3CLAUSE PSFL LICENSE_COMB= multi -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/devel/py-xarray-einstats/Makefile b/devel/py-xarray-einstats/Makefile index 219272f3af19..c7abae6ab835 100644 --- a/devel/py-xarray-einstats/Makefile +++ b/devel/py-xarray-einstats/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>0:devel/py-flit-core@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}einops>0:misc/py-einops@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.9:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xarray>=2022.09.0:devel/py-xarray@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \ diff --git a/devel/py-xarray-simlab/Makefile b/devel/py-xarray-simlab/Makefile index b1ec3240a483..03e123220acb 100644 --- a/devel/py-xarray-simlab/Makefile +++ b/devel/py-xarray-simlab/Makefile @@ -20,7 +20,7 @@ GH_ACCOUNT= xarray-contrib RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=18.1.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dask>0:devel/py-dask@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xarray>=0.10.0:devel/py-xarray@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zarr>=2.3.0:devel/py-zarr@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}distributed>0:devel/py-distributed@${PY_FLAVOR} # extra dep for devel/py-dask diff --git a/devel/py-zarr/Makefile b/devel/py-zarr/Makefile index 84a62fcb53a0..6795b1283f7f 100644 --- a/devel/py-zarr/Makefile +++ b/devel/py-zarr/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asciitree>0:graphics/py-asciitree@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fasteners>0:devel/py-fasteners@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numcodecs>=0.10.0:misc/py-numcodecs@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fsspec>0:filesystems/py-fsspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} diff --git a/devel/py-zfp/Makefile b/devel/py-zfp/Makefile index b79799d3ca79..07881baccf31 100644 --- a/devel/py-zfp/Makefile +++ b/devel/py-zfp/Makefile @@ -13,10 +13,10 @@ WWW= https://computing.llnl.gov/projects/zfp \ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/scikit-build-cmake/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_SETUPTOOLS} LIB_DEPENDS= libzfp.so:devel/zfp -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake localbase:ldflags python USE_PYTHON= cython flavors pytest diff --git a/devel/root/Makefile b/devel/root/Makefile index 864f296de111..205ee279464c 100644 --- a/devel/root/Makefile +++ b/devel/root/Makefile @@ -161,7 +161,7 @@ OPENGL_USE= gl=glew,glu,opengl PYROOT_CMAKE_BOOL= pyroot tpython tmva-pymva PYROOT_DESC= Enable bindings between Python and C++ with PyROOT -PYROOT_BUILD_DEPENDS= ${PYNUMPY} +PYROOT_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} PYROOT_USES= python:build,run PYROOT_USES_OFF= python:build diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile index 1e2731285998..fde201400b37 100644 --- a/devel/shiboken6/Makefile +++ b/devel/shiboken6/Makefile @@ -46,8 +46,8 @@ DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} DOCS_ALL_TARGET= all doc DOCS_PORTDOCS= * -NUMPY_BUILD_DEPENDS= ${PYNUMPY} -NUMPY_RUN_DEPENDS= ${PYNUMPY} +NUMPY_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} NUMPY_CMAKE_ON= -DNUMPY_INCLUDE_DIR:PATH="${PYTHON_SITELIBDIR}/numpy/core/include" post-install: diff --git a/devel/vitables/Makefile b/devel/vitables/Makefile index 04b269def7f3..2b2b67912b2a 100644 --- a/devel/vitables/Makefile +++ b/devel/vitables/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}QtPy>=2.2:devel/py-QtPy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tables>=3.0:devel/py-tables@${PY_FLAVOR} diff --git a/finance/py-Nasdaq-Data-Link/Makefile b/finance/py-Nasdaq-Data-Link/Makefile index ff722908be11..68cf85b4248d 100644 --- a/finance/py-Nasdaq-Data-Link/Makefile +++ b/finance/py-Nasdaq-Data-Link/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}inflection>=0.3.1:devel/py-inflection@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.14:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} diff --git a/finance/py-exchange-calendars/Makefile b/finance/py-exchange-calendars/Makefile index 170e65504bc1..1d0e2ce208f3 100644 --- a/finance/py-exchange-calendars/Makefile +++ b/finance/py-exchange-calendars/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}korean-lunar-calendar>0:korean/py-korean-lunar-calendar@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyluach>0:hebrew/py-pyluach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toolz>0:devel/py-toolz@${PY_FLAVOR} \ diff --git a/finance/py-ffn/Makefile b/finance/py-ffn/Makefile index 132fb2bec355..90887c4beeee 100644 --- a/finance/py-ffn/Makefile +++ b/finance/py-ffn/Makefile @@ -14,12 +14,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=5.0.7:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.15:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas-datareader>=0.2:math/py-pandas-datareader@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.19:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.15:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/finance/py-investpy/Makefile b/finance/py-investpy/Makefile index b96871ee8e04..6513264f2ecf 100644 --- a/finance/py-investpy/Makefile +++ b/finance/py-investpy/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.25.1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.3:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \ diff --git a/finance/py-pandas-ta/Makefile b/finance/py-pandas-ta/Makefile index 3f9bd35e0787..180b7d43becc 100644 --- a/finance/py-pandas-ta/Makefile +++ b/finance/py-pandas-ta/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.2.0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2021.1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} diff --git a/finance/py-ta-lib/Makefile b/finance/py-ta-lib/Makefile index 63fd0d0c8fb6..e4c3bc26ad01 100644 --- a/finance/py-ta-lib/Makefile +++ b/finance/py-ta-lib/Makefile @@ -14,9 +14,9 @@ WWW= https://ta-lib.github.io/ta-lib-python/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libta_lib.so:devel/ta-lib -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}polars>0:misc/py-polars@${PY_FLAVOR} USES= python diff --git a/french/aster/Makefile b/french/aster/Makefile index 50d7f65af01e..05fe9a0ee54f 100644 --- a/french/aster/Makefile +++ b/french/aster/Makefile @@ -33,7 +33,7 @@ BUILD_DEPENDS+= astk-serveur>0:cad/astk-serveur \ bash:shells/bash \ getopt>=0:misc/getopt \ xterm:x11/xterm \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} # pylupdate5:textproc/py-qt5-xml LIB_DEPENDS+= libhdf5-110.so:science/hdf5-110 \ @@ -44,7 +44,7 @@ LIB_DEPENDS+= libhdf5-110.so:science/hdf5-110 \ RUN_DEPENDS+= ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ astk-serveur>0:cad/astk-serveur \ xterm:x11/xterm \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} USES= bison blaslapack:openblas fortran gettext python qt:5 tk diff --git a/games/endgame-singularity/Makefile b/games/endgame-singularity/Makefile index 475fc8e84bce..109c211051e7 100644 --- a/games/endgame-singularity/Makefile +++ b/games/endgame-singularity/Makefile @@ -29,7 +29,7 @@ LICENSE_PERMS_MEMESBRUH03= dist-mirror dist-sell pkg-mirror pkg-sell \ auto-accept RUN_DEPENDS= ${PYGAME} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} USES= python sdl shebangfix diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile index c67312147937..9d3213dbe7e4 100644 --- a/games/fretsonfire/Makefile +++ b/games/fretsonfire/Makefile @@ -13,7 +13,7 @@ WWW= http://fretsonfire.sf.net LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/copying.txt -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYGAME} \ ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ diff --git a/games/krank/Makefile b/games/krank/Makefile index be2d657ee9c4..eb20d360361a 100644 --- a/games/krank/Makefile +++ b/games/krank/Makefile @@ -9,7 +9,7 @@ COMMENT= Little casual game WWW= https://krank.sourceforge.net/ RUN_DEPENDS= ${PYGAME} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python:run tar:bzip2 NO_BUILD= yes diff --git a/games/openage/Makefile b/games/openage/Makefile index 492af265256c..d30fb98a5279 100644 --- a/games/openage/Makefile +++ b/games/openage/Makefile @@ -16,7 +16,7 @@ BROKEN_armv7= error: non-constant-expression cannot be narrowed from type \ BROKEN_i386= error: non-constant-expression cannot be narrowed from type \ 'long long' to 'unsigned int' in initializer list -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \ @@ -34,7 +34,7 @@ LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libopusfile.so:audio/opusfile \ libpng.so:graphics/png \ libnyan.so:lang/nyan -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index f0be3c9fa226..e43feb7cd08b 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/doc/license/GPL3-license.txt ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le riscv64 ONLY_FOR_ARCHS_REASON= static_assert(sizeof(unsigned long long) == sizeof(struct hipArray*)) -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libfreetype.so:print/freetype2 \ libepoxy.so:graphics/libepoxy \ libOpenImageIO.so:graphics/openimageio \ @@ -24,7 +24,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libsamplerate.so:audio/libsamplerate \ libtiff.so:graphics/tiff \ libzstd.so:archivers/zstd -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake:noninja compiler:c++17-lang cpe eigen:3 jpeg llvm:build,run \ pkgconfig python:3.11 shebangfix tar:xz xorg diff --git a/graphics/blender4/Makefile b/graphics/blender4/Makefile index 2791ecf82df2..432fa54aac15 100644 --- a/graphics/blender4/Makefile +++ b/graphics/blender4/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/doc/license/GPL3-license.txt ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le riscv64 ONLY_FOR_ARCHS_REASON= static_assert(sizeof(unsigned long long) == sizeof(struct hipArray*)) -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libfreetype.so:print/freetype2 \ libepoxy.so:graphics/libepoxy \ @@ -25,7 +25,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libzstd.so:archivers/zstd -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} # libboost_regex.so just acts as a placeholder; several boost # libraries are used, if either of the most common options in blender # are set. We will pull boost in just to be on the safe side. diff --git a/graphics/mahotas/Makefile b/graphics/mahotas/Makefile index 5df3181c4d4c..e75dcf8fc11c 100644 --- a/graphics/mahotas/Makefile +++ b/graphics/mahotas/Makefile @@ -9,7 +9,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Computer vision and image processing library for Python WWW= https://packages.python.org/mahotas/ -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libfreeimage.so:graphics/freeimage USE_GCC= yes diff --git a/graphics/matplotlib-cpp/Makefile b/graphics/matplotlib-cpp/Makefile index c9ca0db12659..9aaa25c9b853 100644 --- a/graphics/matplotlib-cpp/Makefile +++ b/graphics/matplotlib-cpp/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake:testing compiler:c++17-lang python diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile index 7e8362239784..4e9a378778b8 100644 --- a/graphics/mypaint/Makefile +++ b/graphics/mypaint/Makefile @@ -17,13 +17,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= swig:devel/swig \ mypaint-brushes2>0:graphics/mypaint-brushes2 \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libjson-c.so:devel/json-c \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libmypaint.so:graphics/libmypaint RUN_DEPENDS= mypaint-brushes2>0:graphics/mypaint-brushes2 \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++11-lib desktop-file-utils gettext gnome localbase \ pkgconfig python tar:xz diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile index 00ce7cf317ce..62f159a1cf8c 100644 --- a/graphics/piglit/Makefile +++ b/graphics/piglit/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT GPLv2 GPLv3 LGPL20 LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ vulkan-headers>0:graphics/vulkan-headers \ @@ -22,7 +22,7 @@ LIB_DEPENDS= libdrm.so:graphics/libdrm \ libwaffle-1.so:graphics/waffle \ libwayland-egl.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} diff --git a/graphics/py-PyOpenGL/Makefile b/graphics/py-PyOpenGL/Makefile index 20055f63b7ad..44661f33ebfb 100644 --- a/graphics/py-PyOpenGL/Makefile +++ b/graphics/py-PyOpenGL/Makefile @@ -13,9 +13,9 @@ WWW= https://pyopengl.sourceforge.net/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_PILLOW} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_PILLOW} NO_ARCH= yes diff --git a/graphics/py-agx-emulsion/Makefile b/graphics/py-agx-emulsion/Makefile index 18de2d853b35..12e5d5db5845 100644 --- a/graphics/py-agx-emulsion/Makefile +++ b/graphics/py-agx-emulsion/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openimageio>0:graphics/py-openimageio@${PY_F ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}napari>=0.5.5:misc/py-napari@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>=0.61.0:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}opt-einsum>=3.4.0:math/py-opt-einsum@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyFFTW>=0.15.0:math/py-pyFFTW@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \ diff --git a/graphics/py-albucore/Makefile b/graphics/py-albucore/Makefile index 1b6e61c088fa..002ce465a24b 100644 --- a/graphics/py-albucore/Makefile +++ b/graphics/py-albucore/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simsimd>=5.9.2:devel/py-simsimd@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stringzilla>=3.10.4:devel/py-stringzilla@${PY_FLAVOR} \ opencv>0:graphics/opencv diff --git a/graphics/py-albumentations/Makefile b/graphics/py-albumentations/Makefile index 40ad7a86c484..448267793e64 100644 --- a/graphics/py-albumentations/Makefile +++ b/graphics/py-albumentations/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}albucore>=0.0.23:graphics/py-albucore@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>=2.9.2:devel/py-pydantic2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.3.2:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/graphics/py-cairocffi/Makefile b/graphics/py-cairocffi/Makefile index 4d0d11c890a2..0d24655e733f 100644 --- a/graphics/py-cairocffi/Makefile +++ b/graphics/py-cairocffi/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flit-core>0:devel/py-flit-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xcffib>=0.3.2:x11/py-xcffib@${PY_FLAVOR} -TEST_DEPENDS= ${PYNUMPY} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ gdk-pixbuf2>0:graphics/gdk-pixbuf2 diff --git a/graphics/py-easyocr/Makefile b/graphics/py-easyocr/Makefile index 85f12293bdfb..f91cc1fc8ee5 100644 --- a/graphics/py-easyocr/Makefile +++ b/graphics/py-easyocr/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 USES= python USE_PYTHON= distutils autoplist pytest -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ opencv>0:graphics/opencv \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyclipper>0:math/py-pyclipper@${PY_FLAVOR} \ diff --git a/graphics/py-fury/Makefile b/graphics/py-fury/Makefile index 3ede5fac21a2..c1d992f165fb 100644 --- a/graphics/py-fury/Makefile +++ b/graphics/py-fury/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-vcs>0:devel/py-hatch-vcs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.8.4:www/py-aiohttp@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lazy_loader>=0.4:devel/py-lazy_loader@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=17.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=5.4.1:graphics/py-pillow@${PY_FLAVOR} \ diff --git a/graphics/py-gizeh/Makefile b/graphics/py-gizeh/Makefile index 923ccdd21dae..a853234d0077 100644 --- a/graphics/py-gizeh/Makefile +++ b/graphics/py-gizeh/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/graphics/py-imutils/Makefile b/graphics/py-imutils/Makefile index a6d3e9a2a278..559e3de416cf 100644 --- a/graphics/py-imutils/Makefile +++ b/graphics/py-imutils/Makefile @@ -9,7 +9,7 @@ MAINTAINER= python@FreeBSD.org COMMENT= Series of convenience image processing functions WWW= https://github.com/PyImageSearch/imutils -RUN_DEPENDS= opencv>0:graphics/opencv ${PYNUMPY} +RUN_DEPENDS= opencv>0:graphics/opencv ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile index de4975462def..090c0f05edaf 100644 --- a/graphics/py-mayavi/Makefile +++ b/graphics/py-mayavi/Makefile @@ -22,11 +22,11 @@ LICENSE_FILE_APACHE11= ${WRKSRC}/LICENSE_COLORBREWER.txt BROKEN= compilation fails: VTK throws std::runtime_erroe, see https://gitlab.kitware.com/vtk/vtk/-/issues/19994 BROKEN_i386= stage fails: Building TVTK classes... Fatal Python error: Illegal instruction -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_SPHINX} \ sphinx-build:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}apptools>0:devel/py-apptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}envisage>0:devel/py-envisage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyface>=6.1.1:devel/py-pyface@${PY_FLAVOR} \ diff --git a/graphics/py-moderngl-window/Makefile b/graphics/py-moderngl-window/Makefile index 20afb79b0fbf..3d2ac144f532 100644 --- a/graphics/py-moderngl-window/Makefile +++ b/graphics/py-moderngl-window/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}moderngl<6:graphics/py-moderngl@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pyglet>=2.0.0:graphics/py-pyglet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyglm>=2.7.0:graphics/py-pyglm@${PY_FLAVOR} \ diff --git a/graphics/py-moderngl/Makefile b/graphics/py-moderngl/Makefile index 837ce11e488d..bb5554e6d85a 100644 --- a/graphics/py-moderngl/Makefile +++ b/graphics/py-moderngl/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}glcontext>=3.0.0:graphics/py-glcontext@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR} -TEST_DEPENDS= ${PYNUMPY} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.2.1:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/graphics/py-mpl-scatter-density/Makefile b/graphics/py-mpl-scatter-density/Makefile index 7270ed85c035..2dbcfe6fec72 100644 --- a/graphics/py-mpl-scatter-density/Makefile +++ b/graphics/py-mpl-scatter-density/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fast-histogram>=0.3:misc/py-fast-histogram@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0:math/py-matplotlib@${PY_FLAVOR} diff --git a/graphics/py-pyqtgraph/Makefile b/graphics/py-pyqtgraph/Makefile index 1df64047680d..48c875d1404d 100644 --- a/graphics/py-pyqtgraph/Makefile +++ b/graphics/py-pyqtgraph/Makefile @@ -12,7 +12,7 @@ WWW= https://www.pyqtgraph.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorcet>0:graphics/py-colorcet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ diff --git a/graphics/py-pyrsgis/Makefile b/graphics/py-pyrsgis/Makefile index cdda6c302873..b36aa9fc4298 100644 --- a/graphics/py-pyrsgis/Makefile +++ b/graphics/py-pyrsgis/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdal>=0:graphics/py-gdal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib-scalebar>=0:math/py-matplotlib-scalebar@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} diff --git a/graphics/py-pytesseract/Makefile b/graphics/py-pytesseract/Makefile index 6af70194188f..3bc1269bc506 100644 --- a/graphics/py-pytesseract/Makefile +++ b/graphics/py-pytesseract/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= tesseract:graphics/tesseract \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} TEST_DEPENDS= ${RUN_DEPENDS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} # if py-tox cannot detect py-filelock, be sure to have version 3.4.2_1 of the latter diff --git a/graphics/py-pyvista/Makefile b/graphics/py-pyvista/Makefile index 14355a18e271..c7d4bbb8a61d 100644 --- a/graphics/py-pyvista/Makefile +++ b/graphics/py-pyvista/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/pyvista/pyvista LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ diff --git a/graphics/py-qudida/Makefile b/graphics/py-qudida/Makefile index 4e93e80d4bd7..df4d439d2fd0 100644 --- a/graphics/py-qudida/Makefile +++ b/graphics/py-qudida/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/arsenyinfo/qudida LICENSE= MIT -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ opencv>=4.0.1:graphics/opencv \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.19.1:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile index 807e62445f1d..e418b34742d6 100644 --- a/graphics/py-scikit-image/Makefile +++ b/graphics/py-scikit-image/Makefile @@ -13,13 +13,13 @@ WWW= https://scikit-image.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lazy_loader>=0.4:devel/py-lazy_loader@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}meson-python>=0.16:devel/meson-python@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pythran>=0.16:devel/py-pythran@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imageio>2.35.0:graphics/py-imageio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lazy_loader>=0.4:devel/py-lazy_loader@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=3.0:math/py-networkx@${PY_FLAVOR} \ diff --git a/graphics/py-simplejpeg/Makefile b/graphics/py-simplejpeg/Makefile index 8487c9744542..dbeac4d54a59 100644 --- a/graphics/py-simplejpeg/Makefile +++ b/graphics/py-simplejpeg/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} USES= cmake:indirect python diff --git a/graphics/py-vispy/Makefile b/graphics/py-vispy/Makefile index 0bf768448b9f..18c3c44a00d1 100644 --- a/graphics/py-vispy/Makefile +++ b/graphics/py-vispy/Makefile @@ -13,14 +13,14 @@ WWW= https://vispy.org/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=7.1:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freetype-py>0:print/py-freetype-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hsluv>0:graphics/py-hsluv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}kiwisolver>0:math/py-kiwisolver@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} USES= python diff --git a/graphics/py-visvis/Makefile b/graphics/py-visvis/Makefile index ee7e9e9cf01f..b8dcd4f0c4c9 100644 --- a/graphics/py-visvis/Makefile +++ b/graphics/py-visvis/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfltk.so:x11-toolkits/fltk BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.2.0<4:devel/py-flit-core@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imageio>=0:graphics/py-imageio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyside2>=0:devel/pyside2@${PY_FLAVOR} diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index 839324c8ee0f..82af182c6f5f 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -82,7 +82,7 @@ RUN_DEPENDS= astyle:devel/astyle \ ${PYTHON_PKGNAMEPREFIX}netCDF4>=1.6.2:science/py-netCDF4@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=2.8.8:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nltk>=3.7:textproc/py-nltk@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \ diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index d88b395274ed..a41563374b08 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -80,7 +80,7 @@ RUN_DEPENDS= astyle:devel/astyle \ ${PYTHON_PKGNAMEPREFIX}netCDF4>=1.6.2:science/py-netCDF4@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=2.8.8:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nltk>=3.7:textproc/py-nltk@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \ diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index 7aef68a7b9d9..4b8ab35f14d8 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -42,9 +42,9 @@ NUMPY_DESC= NumPy mathematical computing (USE Fortran/GCC47+) NUMPY_CMAKE_BOOL= WITH_VIGRANUMPY NUMPY_USES= compiler:gcc-c++11-lib python:build NUMPY_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} NUMPY_LIB_DEPENDS= ${PY_BOOST} # On FreeBSD < 11 libc++ lacks support for sized delete operators. # GCC dropped the builtin version of these operators in 6+ by diff --git a/math/Imath/Makefile b/math/Imath/Makefile index 1f075df542d2..7a363a8be316 100644 --- a/math/Imath/Makefile +++ b/math/Imath/Makefile @@ -39,10 +39,10 @@ OPTIONS_SUB= yes LARGE_STACK_DESC= Enable sys-dependent large stack optimizations LARGE_STACK_CMAKE_BOOL= IMATH_ENABLE_LARGE_STACK -PYTHON_BUILD_DEPENDS= ${PYNUMPY} +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} PYTHON_LIB_DEPENDS= ${PY_BOOST} \ libboost_container.so:devel/boost-libs -PYTHON_RUN_DEPENDS= ${PYNUMPY} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} PYTHON_USES= python PYTHON_CMAKE_BOOL= PYTHON diff --git a/math/gau2grid/Makefile b/math/gau2grid/Makefile index 830f77cad108..79540a0b1bde 100644 --- a/math/gau2grid/Makefile +++ b/math/gau2grid/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= BUG: ValueError: descr is not a valid dtype descriptor: '<f16' (see https://github.com/dgasmith/gau2grid/issues/25) -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_SETUPTOOLS} USES= cmake compiler:c11 python:build # C code build depends on python to generate some headers diff --git a/math/mathgl/Makefile b/math/mathgl/Makefile index 60827df065ce..f90e30951b74 100644 --- a/math/mathgl/Makefile +++ b/math/mathgl/Makefile @@ -54,8 +54,8 @@ PTHREADS_DESC= Enable POSIX threads support (broken, fix pending release) PYTHON_CMAKE_BOOL= enable-python PYTHON_BUILD_DEPENDS= swig:devel/swig \ - ${PYNUMPY} -PYTHON_RUN_DEPENDS= ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} PYTHON_BROKEN= Python option needs to be fixed: lgpl needs to be enabled for it MPI_CMAKE_BOOL= enable-mpi diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile index ed491099db70..93e87de09dee 100644 --- a/math/nlopt/Makefile +++ b/math/nlopt/Makefile @@ -19,10 +19,10 @@ BROKEN_armv7= fails to package: Unable to access file site-packages/_nlopt.a:No FLAVORS= full minimal FLAVOR?= ${FLAVORS:[1]} -full_BUILD_DEPENDS= ${PYNUMPY} \ +full_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ swig:devel/swig full_LIB_DEPENDS= liboctave.so:math/octave -full_RUN_DEPENDS= ${PYNUMPY} +full_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} full_CONFLICTS_INSTALL= ${PORTNAME}-minimal minimal_PKGNAMESUFFIX= -minimal minimal_CONFLICTS_INSTALL= ${PORTNAME} diff --git a/math/ntpoly/Makefile b/math/ntpoly/Makefile index 34fc117a83d9..90c1d76cf27d 100644 --- a/math/ntpoly/Makefile +++ b/math/ntpoly/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= swig>0:devel/swig -TEST_DEPENDS= ${PYNUMPY} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}mpi4py-mpich>0:net/py-mpi4py-mpich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} diff --git a/math/openturns/Makefile b/math/openturns/Makefile index e8f15a0fb7ee..ad8af6bac237 100644 --- a/math/openturns/Makefile +++ b/math/openturns/Makefile @@ -73,7 +73,7 @@ OPTIONS_SUB= yes PYTHON_USES= python PYTHON_CMAKE_BOOL= BUILD_PYTHON PYTHON_CMAKE_ON= -DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig -PYTHON_PY_DEPENDS= ${PYNUMPY} \ +PYTHON_PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chaospy>0:math/py-chaospy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.3.1:math/py-matplotlib@${PY_FLAVOR} \ diff --git a/math/py-CyLP/Makefile b/math/py-CyLP/Makefile index 79799f164468..0088b6b9e703 100644 --- a/math/py-CyLP/Makefile +++ b/math/py-CyLP/Makefile @@ -16,7 +16,7 @@ LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libblas.so:math/blas \ libCbc.so:math/cbc \ @@ -25,7 +25,7 @@ LIB_DEPENDS= libblas.so:math/blas \ libCoinUtils.so:math/coinutils \ liblapack.so:math/lapack \ libOsi.so:math/osi -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.10.0:science/py-scipy@${PY_FLAVOR} USES= compiler:c++11-lang python diff --git a/math/py-GridDataFormats/Makefile b/math/py-GridDataFormats/Makefile index c0d52b83fc8c..76bd7a25d81e 100644 --- a/math/py-GridDataFormats/Makefile +++ b/math/py-GridDataFormats/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/MDAnalysis/GridDataFormats LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mrcfile>0:biology/py-mrcfile@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} diff --git a/math/py-POT/Makefile b/math/py-POT/Makefile index 07a8a12b01e5..13b79080aaa6 100644 --- a/math/py-POT/Makefile +++ b/math/py-POT/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.6:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/math/py-Py-BOBYQA/Makefile b/math/py-Py-BOBYQA/Makefile index 55c5673722d8..d1bfde821b8e 100644 --- a/math/py-Py-BOBYQA/Makefile +++ b/math/py-Py-BOBYQA/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv3 BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.17:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.17:science/py-scipy@${PY_FLAVOR} # extras: trustregion diff --git a/math/py-PySCIPOpt/Makefile b/math/py-PySCIPOpt/Makefile index 5ba0bf778c25..513306fd394a 100644 --- a/math/py-PySCIPOpt/Makefile +++ b/math/py-PySCIPOpt/Makefile @@ -13,7 +13,7 @@ WWW= https://github.com/SCIP-Interfaces/PySCIPOpt LICENSE= MIT LIB_DEPENDS= libscip.so:math/SCIP -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} USES= localbase python diff --git a/math/py-SQNomad/Makefile b/math/py-SQNomad/Makefile index a817ed159f24..a3d5c1681905 100644 --- a/math/py-SQNomad/Makefile +++ b/math/py-SQNomad/Makefile @@ -12,10 +12,10 @@ WWW= https://www.gerad.ca/nomad/ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}SQCommon>0:misc/py-SQCommon@${PY_FLAVOR} USES= python diff --git a/math/py-algopy/Makefile b/math/py-algopy/Makefile index 4647edd49615..3c7ac3a8d768 100644 --- a/math/py-algopy/Makefile +++ b/math/py-algopy/Makefile @@ -11,7 +11,7 @@ WWW= https://pythonhosted.org/algopy/ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python zip USE_PYTHON= distutils autoplist diff --git a/math/py-ambit/Makefile b/math/py-ambit/Makefile index 01431d123ed3..4472f9ef2c75 100644 --- a/math/py-ambit/Makefile +++ b/math/py-ambit/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/jturney/ambit LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/../COPYING -PY_DEPENDS= ${PYNUMPY} +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} BUILD_DEPENDS= pybind11>0:devel/pybind11 \ ${PY_DEPENDS} LIB_DEPENDS= libambit.so:math/ambit \ diff --git a/math/py-annoy/Makefile b/math/py-annoy/Makefile index 90383cb91414..f358fe841444 100644 --- a/math/py-annoy/Makefile +++ b/math/py-annoy/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest # tests fail because nose is broken diff --git a/math/py-apgl/Makefile b/math/py-apgl/Makefile index 37ea391e682e..fdddfcb72a1b 100644 --- a/math/py-apgl/Makefile +++ b/math/py-apgl/Makefile @@ -11,7 +11,7 @@ WWW= http://packages.python.org/apgl/ LICENSE= GPLv3 -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:science/py-scipy@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} diff --git a/math/py-arviz/Makefile b/math/py-arviz/Makefile index acd605820485..fe64c69f2d58 100644 --- a/math/py-arviz/Makefile +++ b/math/py-arviz/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dm-tree>=0.1.8:devel/py-dm-tree@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.8:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2.1.0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.11.0:science/py-scipy@${PY_FLAVOR} \ diff --git a/math/py-autograd/Makefile b/math/py-autograd/Makefile index 4bda6058f026..05c8f34c4ef3 100644 --- a/math/py-autograd/Makefile +++ b/math/py-autograd/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PY_SETUPTOOLS} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} USES= python diff --git a/math/py-baycomp/Makefile b/math/py-baycomp/Makefile index 91eb484581ab..2e2f59572e29 100644 --- a/math/py-baycomp/Makefile +++ b/math/py-baycomp/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/janezd/baycomp LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.19.1:science/py-scipy@${PY_FLAVOR} #RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pystan>=3.4.0:math/py-pystan@${PY_FLAVOR} diff --git a/math/py-benford_py/Makefile b/math/py-benford_py/Makefile index e7b0cefe609c..6593cb6a3415 100644 --- a/math/py-benford_py/Makefile +++ b/math/py-benford_py/Makefile @@ -13,7 +13,7 @@ WWW= https://github.com/milcent/benford_py LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} diff --git a/math/py-chaospy/Makefile b/math/py-chaospy/Makefile index 703c4128b036..df18b53b63c6 100644 --- a/math/py-chaospy/Makefile +++ b/math/py-chaospy/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpoly>0:math/py-numpoly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} diff --git a/math/py-clarabel/Makefile b/math/py-clarabel/Makefile index ca24c511470e..c894f26617ae 100644 --- a/math/py-clarabel/Makefile +++ b/math/py-clarabel/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md BROKEN_i386= compilation fails, see https://github.com/sarah-ek/gemm/issues/30 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>=1.0:devel/py-maturin@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= cargo python diff --git a/math/py-cmyt/Makefile b/math/py-cmyt/Makefile index 089a88ad4361..dbdec3864c6f 100644 --- a/math/py-cmyt/Makefile +++ b/math/py-cmyt/Makefile @@ -14,7 +14,7 @@ WWW= https://yt-project.org \ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.2.0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}more-itertools>=8.4:devel/py-more-itertools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorspacious>=1.1.2:devel/py-colorspacious@${PY_FLAVOR} diff --git a/math/py-contourpy/Makefile b/math/py-contourpy/Makefile index 73ad4c8b9294..83fca0dec846 100644 --- a/math/py-contourpy/Makefile +++ b/math/py-contourpy/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/pybind11:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}meson-python>=0:devel/meson-python@${PY_FLAVOR} \ meson:devel/meson -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} USES= localbase pkgconfig python diff --git a/math/py-cvxpy/Makefile b/math/py-cvxpy/Makefile index 3e139ecac272..8c0e212326a8 100644 --- a/math/py-cvxpy/Makefile +++ b/math/py-cvxpy/Makefile @@ -13,9 +13,9 @@ WWW= https://www.cvxpy.org \ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ecos>=2:math/py-ecos@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}clarabel>=0.5.0:math/py-clarabel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}daqp>0:math/py-daqp@${PY_FLAVOR} \ diff --git a/math/py-cyipopt/Makefile b/math/py-cyipopt/Makefile index b0536a240dd8..713a90d9c8e4 100644 --- a/math/py-cyipopt/Makefile +++ b/math/py-cyipopt/Makefile @@ -11,11 +11,11 @@ WWW= https://github.com/matthias-k/cyipopt LICENSE= EPL -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libblas.so:math/blas \ libipopt.so:math/ipopt \ liblapack.so:math/lapack -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= fortran python pkgconfig # fortran because ipopt's pkg-config returns gcc libs diff --git a/math/py-deap/Makefile b/math/py-deap/Makefile index bb167aa4c207..ffe0a2e87ec0 100644 --- a/math/py-deap/Makefile +++ b/math/py-deap/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/DEAP/deap LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/math/py-dgl/Makefile b/math/py-dgl/Makefile index 13177630eb27..ec2071bfd960 100644 --- a/math/py-dgl/Makefile +++ b/math/py-dgl/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${BACKEND_DEPENDS} LIB_DEPENDS= libdgl.so:math/dgl RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.8.0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.19.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.1.0:science/py-scipy@${PY_FLAVOR} \ diff --git a/math/py-diffcp/Makefile b/math/py-diffcp/Makefile index dbad31a80f15..692cd5efff55 100644 --- a/math/py-diffcp/Makefile +++ b/math/py-diffcp/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/cvxgrp/diffcp/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.13.2:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_SETUPTOOLS} \ diff --git a/math/py-ducc0/Makefile b/math/py-ducc0/Makefile index b40be0270fc2..32c0e97083b7 100644 --- a/math/py-ducc0/Makefile +++ b/math/py-ducc0/Makefile @@ -16,7 +16,7 @@ BROKEN_armv7= clang runs out of memory BROKEN_i386= non-constant-expression cannot be narrowed from type 'long long' to 'int' in initializer list (reported to the author on 2021-05-02 and 2022-02-01) BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++17-lang python diff --git a/math/py-ecos/Makefile b/math/py-ecos/Makefile index 2fac2b5d50b8..48848e6428b5 100644 --- a/math/py-ecos/Makefile +++ b/math/py-ecos/Makefile @@ -12,8 +12,8 @@ WWW= https://www.embotech.com/ECOS LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/math/py-emcee/Makefile b/math/py-emcee/Makefile index b558cb717db0..c7088a1fcc02 100644 --- a/math/py-emcee/Makefile +++ b/math/py-emcee/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} diff --git a/math/py-faiss/Makefile b/math/py-faiss/Makefile index b6c7831efc31..7b57daddc833 100644 --- a/math/py-faiss/Makefile +++ b/math/py-faiss/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/../../LICENSE BROKEN_i386= clang crashes, see bug#261580 -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} BUILD_DEPENDS= swig:devel/swig \ ${PY_DEPENDS} diff --git a/math/py-fenics-basix/Makefile b/math/py-fenics-basix/Makefile index cdf2f271edef..f438eac96cb7 100644 --- a/math/py-fenics-basix/Makefile +++ b/math/py-fenics-basix/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= pybind11>=2.6.4:devel/pybind11 \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libbasix.so:math/fenics-basix RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fenics-ufl>0:math/py-fenics-ufl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ diff --git a/math/py-fpylll/Makefile b/math/py-fpylll/Makefile index e40e68eea834..2440379c1f60 100644 --- a/math/py-fpylll/Makefile +++ b/math/py-fpylll/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/fplll/fpylll LICENSE= GPLv2 -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}black>0:devel/py-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pythran>0:devel/py-pythran@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR} \ @@ -21,7 +21,7 @@ LIB_DEPENDS= libfplll.so:math/fplll \ libmpfr.so:math/mpfr \ libpari.so:math/pari \ libqd.so:math/qd -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}black>0:devel/py-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pythran>0:devel/py-pythran@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR} diff --git a/math/py-fsph/Makefile b/math/py-fsph/Makefile index 655e3331daf0..7ad997de3775 100644 --- a/math/py-fsph/Makefile +++ b/math/py-fsph/Makefile @@ -12,7 +12,7 @@ WWW= https://fsph.readthedocs.io/en/latest/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} # ${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVOR} # tensorflow is an optional dependency that is currently broken: https://github.com/glotzerlab/fsph/issues/6 BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ diff --git a/math/py-gau2grid/Makefile b/math/py-gau2grid/Makefile index ecb338c33943..f8bbdf7bf5d7 100644 --- a/math/py-gau2grid/Makefile +++ b/math/py-gau2grid/Makefile @@ -12,9 +12,9 @@ WWW= https://github.com/dgasmith/gau2grid LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ cmake:devel/cmake-core -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= cmake compiler:c11 python diff --git a/math/py-gimmik/Makefile b/math/py-gimmik/Makefile index 26a9b0ffeb9a..ba9cd5020c2c 100644 --- a/math/py-gimmik/Makefile +++ b/math/py-gimmik/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/vincentlab/GiMMiK LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} USES= python diff --git a/math/py-hdmedians/Makefile b/math/py-hdmedians/Makefile index 1a88158d1ccf..5084264b6115 100644 --- a/math/py-hdmedians/Makefile +++ b/math/py-hdmedians/Makefile @@ -11,9 +11,9 @@ WWW= https://github.com/daleroberts/hdmedians LICENSE= APACHE20 -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils cython autoplist diff --git a/math/py-heyoka/Makefile b/math/py-heyoka/Makefile index 71501b0d58d4..7791918143d4 100644 --- a/math/py-heyoka/Makefile +++ b/math/py-heyoka/Makefile @@ -13,7 +13,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= pybind11>0:devel/pybind11 \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \ libfmt.so:devel/libfmt \ libgmp.so:math/gmp \ @@ -23,7 +23,7 @@ LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \ libmpfr.so:math/mpfr \ libtbb.so:devel/onetbb \ libspdlog.so:devel/spdlog -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} diff --git a/math/py-highspy/Makefile b/math/py-highspy/Makefile index 390eacc52304..f1a5497a30e9 100644 --- a/math/py-highspy/Makefile +++ b/math/py-highspy/Makefile @@ -12,10 +12,10 @@ WWW= https://github.com/automl/random_forest_run LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0.3.3:devel/py-scikit-build-core@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake:indirect compiler:c++11-lang python USE_PYTHON= pep517 autoplist pytest diff --git a/math/py-hmmlearn/Makefile b/math/py-hmmlearn/Makefile index 49bf368cb66b..c54a354b3935 100644 --- a/math/py-hmmlearn/Makefile +++ b/math/py-hmmlearn/Makefile @@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= wheel-${PYTHON_VER}:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4.3:devel/py-setuptools-scm@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.19:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.16:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>=0:devel/py-pybind11@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.19:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.16:science/py-scikit-learn@${PY_FLAVOR} diff --git a/math/py-iminuit/Makefile b/math/py-iminuit/Makefile index 49f54f71f1fe..1998eae9b6c5 100644 --- a/math/py-iminuit/Makefile +++ b/math/py-iminuit/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= cmake:devel/cmake-core \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathspec>0:devel/py-pathspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>0:devel/py-pyproject-metadata@${PY_FLAVOR} # devel/py-scikit-build-core's optional dependencies are for some reason required here -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}annotated-types>0:devel/py-annotated-types@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}boost-histogram>0:misc/py-boost-histogram@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ diff --git a/math/py-ipyopt/Makefile b/math/py-ipyopt/Makefile index 3ec2e92f7872..46f78029c8f1 100644 --- a/math/py-ipyopt/Makefile +++ b/math/py-ipyopt/Makefile @@ -12,7 +12,7 @@ WWW= https://gitlab.com/g-braeunlich/ipyopt LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} LIB_DEPENDS= libipopt.so:math/ipopt diff --git a/math/py-isosurfaces/Makefile b/math/py-isosurfaces/Makefile index f1c762dd96a8..d9b36292db5f 100644 --- a/math/py-isosurfaces/Makefile +++ b/math/py-isosurfaces/Makefile @@ -11,9 +11,9 @@ WWW= https://github.com/jared-hughes/isosurfaces LICENSE= MIT -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycairo>0:graphics/py-pycairo@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ xdg-open:devel/xdg-utils USES= python diff --git a/math/py-jacobi/Makefile b/math/py-jacobi/Makefile index fe02b35d7b1a..a105a34dab6d 100644 --- a/math/py-jacobi/Makefile +++ b/math/py-jacobi/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= pep517 autoplist pytest diff --git a/math/py-jij-cimod/Makefile b/math/py-jij-cimod/Makefile index 52774739c679..f7b1acfd717b 100644 --- a/math/py-jij-cimod/Makefile +++ b/math/py-jij-cimod/Makefile @@ -13,7 +13,7 @@ WWW= https://www.openjij.org/ \ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0.10:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ diff --git a/math/py-keras-applications/Makefile b/math/py-keras-applications/Makefile index 2fc636e22995..baf98e0d75de 100644 --- a/math/py-keras-applications/Makefile +++ b/math/py-keras-applications/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/keras-team/keras-applications LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>=0:science/py-h5py@${PY_FLAVOR} USES= python diff --git a/math/py-keras-preprocessing/Makefile b/math/py-keras-preprocessing/Makefile index 67dc7f87634c..72a65b6eac16 100644 --- a/math/py-keras-preprocessing/Makefile +++ b/math/py-keras-preprocessing/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/keras-team/keras-preprocessing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} USES= python diff --git a/math/py-keras/Makefile b/math/py-keras/Makefile index 3df2bedc5fd4..f14617d74dfb 100644 --- a/math/py-keras/Makefile +++ b/math/py-keras/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}absl-py>0:devel/py-absl-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ml-dtypes>0:math/py-ml-dtypes@${PY_FLAVOR} \ diff --git a/math/py-levmar/Makefile b/math/py-levmar/Makefile index 1e5b93aaecf3..3902a969a613 100644 --- a/math/py-levmar/Makefile +++ b/math/py-levmar/Makefile @@ -13,11 +13,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libblas.so:math/blas \ liblapack.so:math/lapack -TEST_DEPENDS= ${PYNUMPY} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= pep517 cython autoplist pytest diff --git a/math/py-libceed/Makefile b/math/py-libceed/Makefile index 63524cceae78..7bfc0c410aea 100644 --- a/math/py-libceed/Makefile +++ b/math/py-libceed/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} BUILD_DEPENDS= gmake:devel/gmake \ ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/math/py-linearmodels/Makefile b/math/py-linearmodels/Makefile index 8cd1b23d3606..9086cee45f2b 100644 --- a/math/py-linearmodels/Makefile +++ b/math/py-linearmodels/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}formulaic>=1.0.0:math/py-formulaic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mypy_extensions>=0.4:devel/py-mypy_extensions@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.4.0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}property-cached>=1.6.3:devel/py-property-cached@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyhdfe>=0.1:math/py-pyhdfe@${PY_FLAVOR} \ diff --git a/math/py-lmfit/Makefile b/math/py-lmfit/Makefile index 248825a4da19..c87bbd873ba7 100644 --- a/math/py-lmfit/Makefile +++ b/math/py-lmfit/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PY_DEPENDS} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asteval>=1.0:devel/py-asteval@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dill>=0.3.4:devel/py-dill@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.10.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}uncertainties>=3.2.2:math/py-uncertainties@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ diff --git a/math/py-luminol/Makefile b/math/py-luminol/Makefile index fe6b9d057d80..c9bb45ebecf3 100644 --- a/math/py-luminol/Makefile +++ b/math/py-luminol/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/linkedin/luminol LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/math/py-mapbox-earcut/Makefile b/math/py-mapbox-earcut/Makefile index 171d6368ed09..d5ad0da47fa9 100644 --- a/math/py-mapbox-earcut/Makefile +++ b/math/py-mapbox-earcut/Makefile @@ -14,7 +14,7 @@ LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/math/py-mathics/Makefile b/math/py-mathics/Makefile index 2a29f7c1760f..ad7a94436b2a 100644 --- a/math/py-mathics/Makefile +++ b/math/py-mathics/Makefile @@ -12,7 +12,7 @@ WWW= https://mathics.org/ LICENSE= GPLv3+ -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}pint>0:devel/py-pint@${PY_FLAVOR} \ @@ -29,7 +29,7 @@ BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Mathics_Scanner>0:math/py-mathics-scanner -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_PILLOW} \ bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py@${PY_FLAVOR} \ diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile index feb672df0127..c91ebd5998ac 100644 --- a/math/py-matplotlib/Makefile +++ b/math/py-matplotlib/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libqhull_r.so:math/qhull -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}contourpy>=1.0.1:math/py-contourpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fonttools>=4.22.0:print/py-fonttools@${PY_FLAVOR} \ diff --git a/math/py-minorminer/Makefile b/math/py-minorminer/Makefile index 522d79c2fe34..ef83692a0737 100644 --- a/math/py-minorminer/Makefile +++ b/math/py-minorminer/Makefile @@ -16,7 +16,7 @@ PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0.19:devel/py-fasteners@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}homebase>=1.0.1:devel/py-homebase@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=3.2.1:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dwave-networkx>=0.8.15:science/py-dwave-networkx@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rectangle-packer>=2.0.1:math/py-rectangle-packer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.13.1:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} diff --git a/math/py-mnnpy/Makefile b/math/py-mnnpy/Makefile index 38fecc82cedd..c5b1504cf150 100644 --- a/math/py-mnnpy/Makefile +++ b/math/py-mnnpy/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}anndata>0:devel/py-anndata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} diff --git a/math/py-nlopt/Makefile b/math/py-nlopt/Makefile index 40f688671bd4..57c441a0c8cd 100644 --- a/math/py-nlopt/Makefile +++ b/math/py-nlopt/Makefile @@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ swig:devel/swig \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils # autoplist is broken, see https://github.com/DanielBok/nlopt-python/issues/17 diff --git a/math/py-numba-stats/Makefile b/math/py-numba-stats/Makefile index c510847f4d60..4946d0031319 100644 --- a/math/py-numba-stats/Makefile +++ b/math/py-numba-stats/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numba>=0.53:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.5:science/py-scipy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py-pydocstyle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-benchmark>0:devel/py-pytest-benchmark@${PY_FLAVOR} \ diff --git a/math/py-numpoly/Makefile b/math/py-numpoly/Makefile index df105ac5d893..b496271b3d0b 100644 --- a/math/py-numpoly/Makefile +++ b/math/py-numpoly/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/jonathf/numpoly LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/math/py-numpy-groupies/Makefile b/math/py-numpy-groupies/Makefile index de52cfa38f0f..91f6d0832330 100644 --- a/math/py-numpy-groupies/Makefile +++ b/math/py-numpy-groupies/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} diff --git a/math/py-numpy-stl/Makefile b/math/py-numpy-stl/Makefile index 565d9e2a3190..683f67b3b139 100644 --- a/math/py-numpy-stl/Makefile +++ b/math/py-numpy-stl/Makefile @@ -12,9 +12,9 @@ WWW= https://github.com/WoLpH/numpy-stl LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-utils>=2.3.0:misc/py-python-utils@${PY_FLAVOR} USES= python diff --git a/math/py-openTSNE/Makefile b/math/py-openTSNE/Makefile index 3d898c3b6fc0..fd5946257544 100644 --- a/math/py-openTSNE/Makefile +++ b/math/py-openTSNE/Makefile @@ -13,10 +13,10 @@ WWW= https://github.com/pavlin-policar/openTSNE LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libfftw3.so:math/fftw3 -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.20:science/py-scikit-learn@${PY_FLAVOR} diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile index f96fe82b9422..21705218b434 100644 --- a/math/py-or-tools/Makefile +++ b/math/py-or-tools/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv7= SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32 BROKEN_i386= SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32 # see https://github.com/google/or-tools/issues/2130 -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}absl-py>0:devel/py-absl-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} \ diff --git a/math/py-osqp/Makefile b/math/py-osqp/Makefile index 77ef754eb5b7..d32e4e01b287 100644 --- a/math/py-osqp/Makefile +++ b/math/py-osqp/Makefile @@ -13,7 +13,7 @@ WWW= https://osqp.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qdldl>0:math/py-qdldl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.13.2:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} \ diff --git a/math/py-pdal/Makefile b/math/py-pdal/Makefile index 29e01a6c879d..cacfb72c3778 100644 --- a/math/py-pdal/Makefile +++ b/math/py-pdal/Makefile @@ -12,7 +12,7 @@ WWW= https://pypi.python.org/pypi/pdal LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0.2.0:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PYNUMPY} \ cmake:devel/cmake-core LIB_DEPENDS= libpdalcpp.so:math/pdal RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= compiler:c++11-lang ninja:build python diff --git a/math/py-petsc4py/Makefile b/math/py-petsc4py/Makefile index c81c339ffa50..e6e7c1aa161d 100644 --- a/math/py-petsc4py/Makefile +++ b/math/py-petsc4py/Makefile @@ -14,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst BROKEN_armv7= compilation fails: LLVM ERROR: out of memory -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libpetsc.so:science/PETSc -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= autoplist cython distutils pytest # tests fail to run, see https://gitlab.com/petsc/petsc/-/issues/1301 diff --git a/math/py-point-annotator/Makefile b/math/py-point-annotator/Makefile index 4decc69ac003..660c7e6fb534 100644 --- a/math/py-point-annotator/Makefile +++ b/math/py-point-annotator/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} diff --git a/math/py-primme/Makefile b/math/py-primme/Makefile index fba524eb043d..8a553cefe22d 100644 --- a/math/py-primme/Makefile +++ b/math/py-primme/Makefile @@ -13,13 +13,13 @@ WWW= https://www.cs.wm.edu/~andreas/software/ \ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libprimme.so:math/primme \ libblas.so:math/blas \ liblapack.so:math/lapack -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} diff --git a/math/py-pwlf/Makefile b/math/py-pwlf/Makefile index 0ae769d55c21..271e484b88a0 100644 --- a/math/py-pwlf/Makefile +++ b/math/py-pwlf/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/cjekel/piecewise_linear_fit_py LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.8.0:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/math/py-py-find-1st/Makefile b/math/py-py-find-1st/Makefile index 9c6088345bf8..65d330c602d5 100644 --- a/math/py-py-find-1st/Makefile +++ b/math/py-py-find-1st/Makefile @@ -13,9 +13,9 @@ WWW= https://github.com/roebel/py_find_1st LICENSE= GPLv3 BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= pep517 autoplist pytest # tests are broken, see https://github.com/roebel/py_find_1st/issues/13 diff --git a/math/py-pyFFTW/Makefile b/math/py-pyFFTW/Makefile index d29bb023a68f..f9c03efb1451 100644 --- a/math/py-pyFFTW/Makefile +++ b/math/py-pyFFTW/Makefile @@ -14,7 +14,7 @@ WWW= https://hgomersall.github.io/pyFFTW/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dask>=1.0.0:devel/py-dask@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.2.0:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} diff --git a/math/py-pygslodeiv2/Makefile b/math/py-pygslodeiv2/Makefile index 1ef8cad383d1..23581d722854 100644 --- a/math/py-pygslodeiv2/Makefile +++ b/math/py-pygslodeiv2/Makefile @@ -12,9 +12,9 @@ WWW= https://github.com/bjodah/pygslodeiv2 LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libgsl.so:math/gsl -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++11-lang localbase python USE_PYTHON= autoplist cython0 distutils pytest diff --git a/math/py-pyhull/Makefile b/math/py-pyhull/Makefile index 11d0ac946f5f..6fb9a466edd9 100644 --- a/math/py-pyhull/Makefile +++ b/math/py-pyhull/Makefile @@ -12,8 +12,8 @@ WWW= https://pypi.org/project/pyhull/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.rst -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/math/py-pymc3/Makefile b/math/py-pymc3/Makefile index ef61b8517414..616496cfa617 100644 --- a/math/py-pymc3/Makefile +++ b/math/py-pymc3/Makefile @@ -12,7 +12,7 @@ WWW= https://docs.pymc.io/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}arviz>=0.11.0:math/py-arviz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cachetools>=4.2.1:devel/py-cachetools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}deprecat>0:devel/py-deprecat@${PY_FLAVOR} \ diff --git a/math/py-pyneqsys/Makefile b/math/py-pyneqsys/Makefile index 4ff400d5282d..fd5984e4114b 100644 --- a/math/py-pyneqsys/Makefile +++ b/math/py-pyneqsys/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/bjodah/pyneqsys LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sym>=0.3.1:math/py-sym@${PY_FLAVOR} \ diff --git a/math/py-pynleq2/Makefile b/math/py-pynleq2/Makefile index f1043e913ce9..09fbc781559e 100644 --- a/math/py-pynleq2/Makefile +++ b/math/py-pynleq2/Makefile @@ -13,7 +13,7 @@ WWW= https://github.com/bjodah/pynleq2 LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= fortran python USE_PYTHON= distutils autoplist diff --git a/math/py-pynndescent/Makefile b/math/py-pynndescent/Makefile index 9e4f9b8f6528..a0ea1c5acac4 100644 --- a/math/py-pynndescent/Makefile +++ b/math/py-pynndescent/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/lmcinnes/pynndescent LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}joblib>0.11:devel/py-joblib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.30:devel/py-llvmlite@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>=0.51.2:devel/py-numba@${PY_FLAVOR} \ diff --git a/math/py-pyodeint/Makefile b/math/py-pyodeint/Makefile index b43f1d70ac27..5ad4de32069a 100644 --- a/math/py-pyodeint/Makefile +++ b/math/py-pyodeint/Makefile @@ -12,9 +12,9 @@ WWW= https://github.com/bjodah/pyodeint LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${LOCALBASE}/include/boost/config.hpp:devel/boost-libs -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++11-lang localbase python USE_PYTHON= distutils autoplist pytest diff --git a/math/py-pyodesys/Makefile b/math/py-pyodesys/Makefile index 201e30df6793..314ee06fcddd 100644 --- a/math/py-pyodesys/Makefile +++ b/math/py-pyodesys/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.5:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}notebook>=5.7.8:www/py-notebook@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.2.3:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sym>=0.3.7:math/py-sym@${PY_FLAVOR} \ diff --git a/math/py-pyrr/Makefile b/math/py-pyrr/Makefile index e12341cab623..40fb4130070e 100644 --- a/math/py-pyrr/Makefile +++ b/math/py-pyrr/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}multipledispatch>0:devel/py-multipledispatch@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/math/py-pysym/Makefile b/math/py-pysym/Makefile index 1280a0aba623..011fb729a51c 100644 --- a/math/py-pysym/Makefile +++ b/math/py-pysym/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/math/py-pytensor/Makefile b/math/py-pytensor/Makefile index 5a1591977142..9431f27f1fb2 100644 --- a/math/py-pytensor/Makefile +++ b/math/py-pytensor/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/doc/LICENSE.txt BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}versioneer>=0.29:devel/py-versioneer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PY_DEPENDS} @@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cons>0:devel/py-cons@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}logical-unification>0:math/py-logical-unification@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}miniKanren>0:devel/py-miniKanren@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>=0.57:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/math/py-python-fcl/Makefile b/math/py-python-fcl/Makefile index 48e86f2d346f..24cab36d095b 100644 --- a/math/py-python-fcl/Makefile +++ b/math/py-python-fcl/Makefile @@ -14,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfcl05.so:math/fcl05 \ liboctomap.so:math/octomap -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++11-lang eigen:3 python diff --git a/math/py-python-louvain/Makefile b/math/py-python-louvain/Makefile index 765291bd07c3..463e460a2eed 100644 --- a/math/py-python-louvain/Makefile +++ b/math/py-python-louvain/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/taynaud/python-louvain LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} USES= python diff --git a/math/py-python-picard/Makefile b/math/py-python-picard/Makefile index f919aac4c5ca..35676849e892 100644 --- a/math/py-python-picard/Makefile +++ b/math/py-python-picard/Makefile @@ -12,8 +12,8 @@ WWW= https://pierreablin.github.io/picard/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numexpr>0:math/py-numexpr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/math/py-pywavelets/Makefile b/math/py-pywavelets/Makefile index 6861a3c779f0..90b418b74a01 100644 --- a/math/py-pywavelets/Makefile +++ b/math/py-pywavelets/Makefile @@ -12,9 +12,9 @@ WWW= https://github.com/PyWavelets/pywt LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}meson-python>=0.16:devel/meson-python@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= autoplist cython pep517 diff --git a/math/py-qats/Makefile b/math/py-qats/Makefile index 4b551deaf480..88eaf16378bb 100644 --- a/math/py-qats/Makefile +++ b/math/py-qats/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}QtPy>=1.9.0:devel/py-QtPy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.3:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}myst-parser>=0.18.1:textproc/py-myst-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}npTDMS>=1.1.0:misc/py-npTDMS@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openpyxl>=3.0.5:textproc/py-openpyxl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymatreader>=0.0.24:misc/py-pymatreader@${PY_FLAVOR} \ diff --git a/math/py-qdldl/Makefile b/math/py-qdldl/Makefile index 3a78ac7de394..0e602206b356 100644 --- a/math/py-qdldl/Makefile +++ b/math/py-qdldl/Makefile @@ -17,7 +17,7 @@ BROKEN_i386= error: no matching function for call to 'amd_l_order', see https:// BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ cmake:devel/cmake-core -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.13.2:science/py-scipy@${PY_FLAVOR} TEST_DEPENDS= pytest:devel/py-pytest@${PY_FLAVOR} diff --git a/math/py-resample/Makefile b/math/py-resample/Makefile index f9df41224cdb..d5eda4a50071 100644 --- a/math/py-resample/Makefile +++ b/math/py-resample/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.10:science/py-scipy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} diff --git a/math/py-rustworkx/Makefile b/math/py-rustworkx/Makefile index 4b4c2388a7be..3b74406a4667 100644 --- a/math/py-rustworkx/Makefile +++ b/math/py-rustworkx/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-rust>0:devel/py-setuptools-rust@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=5.4:graphics/py-pillow@${PY_FLAVOR} #${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} diff --git a/math/py-scikit-umfpack/Makefile b/math/py-scikit-umfpack/Makefile index 38c3bd2755bb..9fbd67ad65ce 100644 --- a/math/py-scikit-umfpack/Makefile +++ b/math/py-scikit-umfpack/Makefile @@ -15,14 +15,14 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meson-python>0:devel/meson-python@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ swig:devel/swig LIB_DEPENDS= libamd.so:math/suitesparse-amd \ libcblas.so:math/cblas \ libopenblas.so:math/openblas \ libumfpack.so:math/suitesparse-umfpack -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= fortran localbase:ldflags python diff --git a/math/py-scs/Makefile b/math/py-scs/Makefile index cbbbee9e35bb..bced5719061c 100644 --- a/math/py-scs/Makefile +++ b/math/py-scs/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meson-python>0:devel/meson-python@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libopenblas.so:math/openblas -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.13.2:science/py-scipy@${PY_FLAVOR} USES= python blaslapack:openblas fortran localbase:ldflags pkgconfig # fortran is for openblas diff --git a/math/py-seriate/Makefile b/math/py-seriate/Makefile index 0a68ec1d7933..eff6650d65e1 100644 --- a/math/py-seriate/Makefile +++ b/math/py-seriate/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/src-d/seriate LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}or-tools>0:math/py-or-tools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} diff --git a/math/py-slepc4py/Makefile b/math/py-slepc4py/Makefile index 6b408fb0b223..4164cb0a6bf4 100644 --- a/math/py-slepc4py/Makefile +++ b/math/py-slepc4py/Makefile @@ -12,14 +12,14 @@ WWW= https://bitbucket.org/slepc/slepc4py LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}petsc4py>0:math/py-petsc4py@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} LIB_DEPENDS= libmpich.so:net/mpich \ libpetsc.so:science/PETSc \ libslepc.so:math/slepc -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= fortran python USE_PYTHON= autoplist cython distutils pytest diff --git a/math/py-spectral/Makefile b/math/py-spectral/Makefile index 335baa08ad71..5eb4c1d73c31 100644 --- a/math/py-spectral/Makefile +++ b/math/py-spectral/Makefile @@ -12,7 +12,7 @@ WWW= https://www.spectralpython.net/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/math/py-ssm/Makefile b/math/py-ssm/Makefile index 979e2b7c4cd7..025ea3683f73 100644 --- a/math/py-ssm/Makefile +++ b/math/py-ssm/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/lindermanlab/ssm LICENSE= MIT -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}autograd>0:math/py-autograd@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ diff --git a/math/py-sym/Makefile b/math/py-sym/Makefile index f544a6f58b73..f66641803a11 100644 --- a/math/py-sym/Makefile +++ b/math/py-sym/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/bjodah/sym LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile index c62a76d33d04..6aecbcfea736 100644 --- a/math/py-theano/Makefile +++ b/math/py-theano/Makefile @@ -13,7 +13,7 @@ WWW= http://deeplearning.net/software/theano/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} diff --git a/math/py-timple/Makefile b/math/py-timple/Makefile index b9ae1913f15e..999c839efb5a 100644 --- a/math/py-timple/Makefile +++ b/math/py-timple/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/theOehrly/Timple LICENSE= MIT -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} USES= python diff --git a/math/py-torchsde/Makefile b/math/py-torchsde/Makefile index d17f14fcfb47..63af3da0e4e5 100644 --- a/math/py-torchsde/Makefile +++ b/math/py-torchsde/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>=1.6.0:misc/py-pytorch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.5:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}trampoline>=0.1.2:devel/py-trampoline@${PY_FLAVOR} diff --git a/math/py-umap-learn/Makefile b/math/py-umap-learn/Makefile index 562ad2b98c5e..a8df41a0ab3c 100644 --- a/math/py-umap-learn/Makefile +++ b/math/py-umap-learn/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/lmcinnes/umap LICENSE= BSD3CLAUSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numba>=0.51.2:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pynndescent>=0.5:math/py-pynndescent@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.22:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.3.1:science/py-scipy@${PY_FLAVOR} \ diff --git a/math/py-uncertainties/Makefile b/math/py-uncertainties/Makefile index 039e6057fe6d..a619574ec077 100644 --- a/math/py-uncertainties/Makefile +++ b/math/py-uncertainties/Makefile @@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} -TEST_DEPENDS= ${PYNUMPY} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} USES= python diff --git a/math/py-unyt/Makefile b/math/py-unyt/Makefile index 1d34d2bdaa65..3bf079be1770 100644 --- a/math/py-unyt/Makefile +++ b/math/py-unyt/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=7.0.1:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>=1.7:math/py-sympy@${PY_FLAVOR} diff --git a/math/py-yt/Makefile b/math/py-yt/Makefile index 8b95e75471d3..de044ff2c252 100644 --- a/math/py-yt/Makefile +++ b/math/py-yt/Makefile @@ -13,16 +13,16 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.txt # dependencies are in setup.cfg -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ewah-bool-utils>=1.0.2:devel/py-ewah-bool-utils@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cmyt>=0.2.2:math/py-cmyt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ewah-bool-utils>=1.0.2:devel/py-ewah-bool-utils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>=1.0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}more-itertools>=8.4:devel/py-more-itertools@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.2:devel/py-pyparsing@${PY_FLAVOR} \ diff --git a/math/spot/Makefile b/math/spot/Makefile index 02e3edf44022..2277906f38a9 100644 --- a/math/spot/Makefile +++ b/math/spot/Makefile @@ -10,7 +10,7 @@ WWW= https://spot.lrde.epita.fr LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -TEST_DEPENDS= ${PYNUMPY} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ syfco:math/hs-syfco diff --git a/math/xtensor-python/Makefile b/math/xtensor-python/Makefile index e655514f484f..4117580f6129 100644 --- a/math/xtensor-python/Makefile +++ b/math/xtensor-python/Makefile @@ -11,7 +11,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE HPP_DEPENDS= xtensor>0:math/xtensor \ pybind11>0:devel/pybind11 \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} BUILD_DEPENDS= ${HPP_DEPENDS} RUN_DEPENDS= ${HPP_DEPENDS} TEST_DEPENDS= googletest>0:devel/googletest \ diff --git a/misc/adios2/Makefile b/misc/adios2/Makefile index 91fc09b8ad87..47ca4550638d 100644 --- a/misc/adios2/Makefile +++ b/misc/adios2/Makefile @@ -15,7 +15,7 @@ BROKEN_armv7= compilation fails: non-constant-expression cannot be narrowed from BROKEN_i386= constant expression evaluates to 18446744073709551613 which cannot be narrowed to type 'unsigned int': https://github.com/ornladios/ADIOS2/issues/2469 BROKEN_powerpc= constant expression evaluates to 18446744073709551613 which cannot be narrowed to type 'unsigned int': https://github.com/ornladios/ADIOS2/issues/2469 -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mpi4py-mpich>=3.0.3:net/py-mpi4py-mpich@${PY_FLAVOR} BUILD_DEPENDS= bash:shells/bash \ pybind11>0:devel/pybind11 \ diff --git a/misc/caffe/Makefile b/misc/caffe/Makefile index 3ae2024eed4f..651755a7a0ad 100644 --- a/misc/caffe/Makefile +++ b/misc/caffe/Makefile @@ -16,7 +16,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bash:shells/bash \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libsnappy.so:archivers/snappy \ libleveldb.so:databases/leveldb \ liblmdb.so:databases/lmdb \ @@ -28,7 +28,7 @@ LIB_DEPENDS= libsnappy.so:archivers/snappy \ libopencv_highgui.so:graphics/opencv \ libopenblas.so:math/openblas \ libhdf5.so:science/hdf5 -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydot>0:graphics/py-pydot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydotplus>0:graphics/py-pydotplus@${PY_FLAVOR} \ diff --git a/misc/comfyui/Makefile b/misc/comfyui/Makefile index 90b0cb7361fc..b69d500a7d2e 100644 --- a/misc/comfyui/Makefile +++ b/misc/comfyui/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.11.8:www/py-aiohttp@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}glfw>0:graphics/py-glfw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}kornia>=0.7.1:graphics/py-kornia@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic-settings>=2.0:devel/py-pydantic-settings@${PY_FLAVOR} \ diff --git a/misc/mmdnn/Makefile b/misc/mmdnn/Makefile index 40e23ddac362..678077fc347b 100644 --- a/misc/mmdnn/Makefile +++ b/misc/mmdnn/Makefile @@ -10,7 +10,7 @@ WWW= https://github.com/microsoft/MMdnn LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.6.0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} diff --git a/misc/py-QSpectrumAnalyzer/Makefile b/misc/py-QSpectrumAnalyzer/Makefile index ee84d7af0c39..a8ef54191420 100644 --- a/misc/py-QSpectrumAnalyzer/Makefile +++ b/misc/py-QSpectrumAnalyzer/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/xmikos/qspectrumanalyzer LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyqtgraph>=0.10.0:graphics/py-pyqtgraph@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}soapy_power>=1.5.0:misc/py-soapy_power@${PY_FLAVOR} diff --git a/misc/py-SQCommon/Makefile b/misc/py-SQCommon/Makefile index 7f2c40a96d4f..987c082cc119 100644 --- a/misc/py-SQCommon/Makefile +++ b/misc/py-SQCommon/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= pep517 autoplist pytest diff --git a/misc/py-SQImFil/Makefile b/misc/py-SQImFil/Makefile index cec7712b28a1..57ea2a99ccc1 100644 --- a/misc/py-SQImFil/Makefile +++ b/misc/py-SQImFil/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}SQCommon>0:misc/py-SQCommon@${PY_FLAVOR} USES= python diff --git a/misc/py-SQSnobFit/Makefile b/misc/py-SQSnobFit/Makefile index 5729f9a07f9c..c1517827534c 100644 --- a/misc/py-SQSnobFit/Makefile +++ b/misc/py-SQSnobFit/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}SQCommon>0:misc/py-SQCommon@${PY_FLAVOR} USES= python diff --git a/misc/py-SimpleSoapy/Makefile b/misc/py-SimpleSoapy/Makefile index b4a01b06134e..c5538e0656f9 100644 --- a/misc/py-SimpleSoapy/Makefile +++ b/misc/py-SimpleSoapy/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/xmikos/simplesoapy LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}SoapySDR>0:misc/py-SoapySDR@${PY_FLAVOR} USES= python diff --git a/misc/py-accelerate/Makefile b/misc/py-accelerate/Makefile index a6027549c6af..4edcbef5570b 100644 --- a/misc/py-accelerate/Makefile +++ b/misc/py-accelerate/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}huggingface-hub>=0.21.0:misc/py-huggingface-hub@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>=2.0.0:misc/py-pytorch@${PY_FLAVOR} \ diff --git a/misc/py-apache-beam/Makefile b/misc/py-apache-beam/Makefile index cd51c929faec..6f6abfe925e7 100644 --- a/misc/py-apache-beam/Makefile +++ b/misc/py-apache-beam/Makefile @@ -20,7 +20,7 @@ PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cloudpickle>=2.2.0:devel/py-cloudpickle@${PY_ ${PYTHON_PKGNAMEPREFIX}grpcio>=1.33.1>0:devel/py-grpcio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hdfs>=2.1.0:www/py-hdfs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.8:www/py-httplib2@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}orjson<4.0:devel/py-orjson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}objsize>=0.5.2:devel/py-objsize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}proto-plus>=1.7.1:devel/py-proto-plus@${PY_FLAVOR} \ diff --git a/misc/py-bitsandbytes/Makefile b/misc/py-bitsandbytes/Makefile index 1f2093c780c1..05537e51f7aa 100644 --- a/misc/py-bitsandbytes/Makefile +++ b/misc/py-bitsandbytes/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}einops>=0.8.0:misc/py-einops@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lion-pytorch>=0.2.3:misc/py-lion-pytorch@${PY_FLAVOR} \ diff --git a/misc/py-boost-histogram/Makefile b/misc/py-boost-histogram/Makefile index a9f8e50f557b..84bbf3c4381a 100644 --- a/misc/py-boost-histogram/Makefile +++ b/misc/py-boost-histogram/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/config.hpp:devel/boost-libs \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hypothesis>=6.0:devel/py-hypothesis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-benchmark>0:devel/py-pytest-benchmark@${PY_FLAVOR} diff --git a/misc/py-cmap/Makefile b/misc/py-cmap/Makefile index 284afe22327d..5b90ee51046a 100644 --- a/misc/py-cmap/Makefile +++ b/misc/py-cmap/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-vcs>0:devel/py-hatch-vcs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bokeh>0:www/py-bokeh@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorspacious>0:devel/py-colorspacious@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colour>0:graphics/py-colour@${PY_FLAVOR} \ diff --git a/misc/py-codecarbon/Makefile b/misc/py-codecarbon/Makefile index 45172db110f4..88565661cf28 100644 --- a/misc/py-codecarbon/Makefile +++ b/misc/py-codecarbon/Makefile @@ -26,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typer>0:devel/py-typer@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-mock>0:www/py-requests-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR} USES= python diff --git a/misc/py-datasets/Makefile b/misc/py-datasets/Makefile index 72ab1df7199b..774f71a63205 100644 --- a/misc/py-datasets/Makefile +++ b/misc/py-datasets/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httpx>0:www/py-httpx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}huggingface-hub>=0.25.0:misc/py-huggingface-hub@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}multiprocess>0:devel/py-multiprocess@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyarrow>=21.0.0:databases/py-pyarrow@${PY_FLAVOR} \ diff --git a/misc/py-detecta/Makefile b/misc/py-detecta/Makefile index c5878fc06bc4..cb8c343e01b3 100644 --- a/misc/py-detecta/Makefile +++ b/misc/py-detecta/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/demotu/detecta LICENSE= APACHE20 PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/misc/py-diffusers/Makefile b/misc/py-diffusers/Makefile index 49060c9a5399..2de2a5470b05 100644 --- a/misc/py-diffusers/Makefile +++ b/misc/py-diffusers/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}httpx>0:www/py-httpx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}huggingface-hub>=0.34.0:misc/py-huggingface-hub@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}safetensors>0:misc/py-safetensors@${PY_FLAVOR} diff --git a/misc/py-evaluate/Makefile b/misc/py-evaluate/Makefile index b5285f0d113e..6da9ffc8323e 100644 --- a/misc/py-evaluate/Makefile +++ b/misc/py-evaluate/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}datasets>=2.0.0:misc/py-datasets@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}huggingface-hub>=0.7.0:misc/py-huggingface-hub@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}multiprocess>0:devel/py-multiprocess@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.19.0:www/py-requests@${PY_FLAVOR} \ diff --git a/misc/py-ezc3d/Makefile b/misc/py-ezc3d/Makefile index d1e9da15969d..f9b1a69f8000 100644 --- a/misc/py-ezc3d/Makefile +++ b/misc/py-ezc3d/Makefile @@ -13,12 +13,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ cmake:devel/cmake-core \ swig:devel/swig -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= pep517 autoplist pytest # autoplist is broken due to https://github.com/pyomeca/ezc3d/issues/258 ; 3 tests fail, see https://github.com/pyomeca/ezc3d/issues/291 diff --git a/misc/py-facenet-pytorch/Makefile b/misc/py-facenet-pytorch/Makefile index 443e29f8c9e6..c246d5c5bd3e 100644 --- a/misc/py-facenet-pytorch/Makefile +++ b/misc/py-facenet-pytorch/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/timesler/facenet-pytorch LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}torchvision>0:misc/py-torchvision@${PY_FLAVOR} diff --git a/misc/py-fast-histogram/Makefile b/misc/py-fast-histogram/Makefile index c637c977d944..d38521cc5c34 100644 --- a/misc/py-fast-histogram/Makefile +++ b/misc/py-fast-histogram/Makefile @@ -13,9 +13,9 @@ WWW= https://github.com/astrofrog/fast-histogram LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/misc/py-fastscapelib/Makefile b/misc/py-fastscapelib/Makefile index c653e4b5424f..bd0e436added 100644 --- a/misc/py-fastscapelib/Makefile +++ b/misc/py-fastscapelib/Makefile @@ -16,13 +16,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ xtensor>0:math/xtensor \ xtensor-python>0:math/xtensor-python \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>0:devel/py-pyproject-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} LIB_DEPENDS= libhealpix_cxx.so:science/healpix -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= pep517 autoplist pytest diff --git a/misc/py-gguf/Makefile b/misc/py-gguf/Makefile index 68f74683b7b9..a4838cac908e 100644 --- a/misc/py-gguf/Makefile +++ b/misc/py-gguf/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sentencepiece>=0.1.98:textproc/py-sentencepiece@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.27:misc/py-tqdm@${PY_FLAVOR} diff --git a/misc/py-gymnasium/Makefile b/misc/py-gymnasium/Makefile index 2460270dd367..a4324e195a93 100644 --- a/misc/py-gymnasium/Makefile +++ b/misc/py-gymnasium/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cloudpickle>=1.2.0:devel/py-cloudpickle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Farama-Notifications>=0.0.1:devel/py-Farama-Notifications@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.3.0:devel/py-typing-extensions@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dill>=0.3.7:devel/py-dill@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.7.3:science/py-scipy@${PY_FLAVOR} diff --git a/misc/py-hist/Makefile b/misc/py-hist/Makefile index 8fe84fe88b9b..ed2a8254a3f4 100644 --- a/misc/py-hist/Makefile +++ b/misc/py-hist/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-vcs>0:devel/py-hatch-vcs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boost-histogram>=1.5:misc/py-boost-histogram@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}histoprint>=2.2.0:misc/py-histoprint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4:devel/py-typing-extensions@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dask>=2022:devel/py-dask@${PY_FLAVOR} \ diff --git a/misc/py-histoprint/Makefile b/misc/py-histoprint/Makefile index 0e4b0365efc9..60c3d0707e04 100644 --- a/misc/py-histoprint/Makefile +++ b/misc/py-histoprint/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=7.0.0:devel/py-click@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}uhi>=0.2.1:misc/py-uhi@${PY_FLAVOR} diff --git a/misc/py-ipyfastscape/Makefile b/misc/py-ipyfastscape/Makefile index 4758d5153543..686dbba808a3 100644 --- a/misc/py-ipyfastscape/Makefile +++ b/misc/py-ipyfastscape/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipygany>=0.5.0:science/py-ipygany@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xarray>0:devel/py-xarray@${PY_FLAVOR} USES= python diff --git a/misc/py-kokoro/Makefile b/misc/py-kokoro/Makefile index 30a41aa97820..ed3c10c00362 100644 --- a/misc/py-kokoro/Makefile +++ b/misc/py-kokoro/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}huggingface-hub>0:misc/py-huggingface-hub@${ ${PYTHON_PKGNAMEPREFIX}loguru>0:devel/py-loguru@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}misaki>=0.9.4:misc/py-misaki@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}num2words>0:devel/py-num2words@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spacy>0:textproc/py-spacy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}transformers>=0:misc/py-transformers@${PY_FLAVOR} diff --git a/misc/py-langchain-core/Makefile b/misc/py-langchain-core/Makefile index 17d73adff545..0c616b0edb0d 100644 --- a/misc/py-langchain-core/Makefile +++ b/misc/py-langchain-core/Makefile @@ -25,7 +25,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blockbuster>=1.5.18:devel/py-blockbuster@${ ${PYTHON_PKGNAMEPREFIX}freezegun>=1.2.2:devel/py-freezegun@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}grandalf>=0.8:math/py-grandalf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}langchain-tests>0:misc/py-langchain-tests@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0.21.1:devel/py-pytest-asyncio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-benchmark>0:devel/py-pytest-benchmark@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-codspeed>0:devel/py-pytest-codspeed@${PY_FLAVOR} \ diff --git a/misc/py-langchain-google-genai/Makefile b/misc/py-langchain-google-genai/Makefile index de2ed7b125a1..5fe927248f4d 100644 --- a/misc/py-langchain-google-genai/Makefile +++ b/misc/py-langchain-google-genai/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filetype>=1.2.0:devel/py-filetype@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}pydantic2>=2:devel/py-pydantic2@${PY_FLAVOR} #TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freezegun>=1.2.2:devel/py-freezegun@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}langchain-tests>=0.3.20:misc/py-langchain-tests@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0.21.1:devel/py-pytest-asyncio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-mock>=3.10.0:devel/py-pytest-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-watcher>0:devel/py-pytest-watcher@${PY_FLAVOR} \ diff --git a/misc/py-langchain-tests/Makefile b/misc/py-langchain-tests/Makefile index afe29f5089d7..5c4f97c12feb 100644 --- a/misc/py-langchain-tests/Makefile +++ b/misc/py-langchain-tests/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httpx>=0.28.1:www/py-httpx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}langchain-core>=1.1.2:misc/py-langchain-core@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=7:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0.20:devel/py-pytest-asyncio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-benchmark>0:devel/py-pytest-benchmark@${PY_FLAVOR} \ diff --git a/misc/py-langgraph-checkpoint/Makefile b/misc/py-langgraph-checkpoint/Makefile index 09997941999d..7d954694ed23 100644 --- a/misc/py-langgraph-checkpoint/Makefile +++ b/misc/py-langgraph-checkpoint/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}langchain-core>=0.2.38:misc/py-langchain-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ormsgpack>=1.12.0:devel/py-ormsgpack@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dataclasses-json>0:devel/py-dataclasses-json@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas-stubs>=2.2.2.240807:math/py-pandas-stubs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} \ diff --git a/misc/py-laspy/Makefile b/misc/py-laspy/Makefile index 004731c3f81d..131b2792a9fe 100644 --- a/misc/py-laspy/Makefile +++ b/misc/py-laspy/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} # optional dependencies RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}lazrs>=0.6.0:misc/py-lazrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}laszip>=0.2.1:archivers/py-laszip@${PY_FLAVOR} \ diff --git a/misc/py-lightgbm/Makefile b/misc/py-lightgbm/Makefile index 2b1027475cc1..c863a8e18e20 100644 --- a/misc/py-lightgbm/Makefile +++ b/misc/py-lightgbm/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= armv6 armv7 i386 # Exception: Cannot install LightGBM in 32-bit Python, please use 64-bit Python instead -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.22.0:science/py-scikit-learn@${PY_FLAVOR} BUILD_DEPENDS= cmake:devel/cmake-core \ diff --git a/misc/py-llama-cpp-python/Makefile b/misc/py-llama-cpp-python/Makefile index cc0e201d3bd1..23c50dd516d5 100644 --- a/misc/py-llama-cpp-python/Makefile +++ b/misc/py-llama-cpp-python/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0.9.2:devel/py-scikit-b LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}diskcache>=5.6.1:devel/py-diskcache@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.11.3:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.5.0:devel/py-typing-extensions@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fastapi>=0.100.0:www/py-fastapi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic-settings>=2.0.1:devel/py-pydantic-settings@${PY_FLAVOR} \ diff --git a/misc/py-mffpy/Makefile b/misc/py-mffpy/Makefile index 69c39d24ddd4..1fc2664388b5 100644 --- a/misc/py-mffpy/Makefile +++ b/misc/py-mffpy/Makefile @@ -15,7 +15,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}deprecated>=1.2.12:devel/py-deprecated@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=4.8.0:devel/py-lxml@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.2:devel/py-pytz@${PY_FLAVOR} USES= python diff --git a/misc/py-mmcv/Makefile b/misc/py-mmcv/Makefile index 759369d86e7c..12082096079e 100644 --- a/misc/py-mmcv/Makefile +++ b/misc/py-mmcv/Makefile @@ -15,11 +15,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ninja:devel/ninja \ ${PREFIX}/include/pybind11/pybind11.h:devel/pybind11 \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}addict>0:devel/py-addict@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mmengine>=0.3.0:misc/py-mmengine@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}yapf>0:textproc/py-yapf@${PY_FLAVOR} \ diff --git a/misc/py-mmdet/Makefile b/misc/py-mmdet/Makefile index 8c778c704167..da3a0511512e 100644 --- a/misc/py-mmdet/Makefile +++ b/misc/py-mmdet/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycocotools>0:devel/py-pycocotools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}shapely>0:devel/py-shapely@${PY_FLAVOR} \ diff --git a/misc/py-mmengine/Makefile b/misc/py-mmengine/Makefile index 814e28518a6f..bbeb6080557d 100644 --- a/misc/py-mmengine/Makefile +++ b/misc/py-mmengine/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}addict>0:devel/py-addict@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rich>0:textproc/py-rich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yapf>0:textproc/py-yapf@${PY_FLAVOR} \ diff --git a/misc/py-mmsegmentation/Makefile b/misc/py-mmsegmentation/Makefile index c38aabd1ef3e..4bd488798403 100644 --- a/misc/py-mmsegmentation/Makefile +++ b/misc/py-mmsegmentation/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 #BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} diff --git a/misc/py-napari/Makefile b/misc/py-napari/Makefile index 9b10db08f863..04b51f99f334 100644 --- a/misc/py-napari/Makefile +++ b/misc/py-napari/Makefile @@ -31,7 +31,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=9.0:graphics/py-pillow@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}napari-plugin-engine>=0.1.9:graphics/py-napari-plugin-engine@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}napari-svg>=0.1.8:misc/py-napari-svg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}npe2>=0.7.9:misc/py-npe2@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpydoc>=1.0.0:textproc/py-numpydoc@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.3.3:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pint>=0.17:devel/py-pint@${PY_FLAVOR} \ diff --git a/misc/py-npTDMS/Makefile b/misc/py-npTDMS/Makefile index 7dc69bd05f8a..864faa459aba 100644 --- a/misc/py-npTDMS/Makefile +++ b/misc/py-npTDMS/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} # optional TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \ diff --git a/misc/py-npe2/Makefile b/misc/py-npe2/Makefile index b5e7b5cc6e8e..c598fec888b6 100644 --- a/misc/py-npe2/Makefile +++ b/misc/py-npe2/Makefile @@ -26,7 +26,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}magicgui>0:x11-toolkits/py-magicgui@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}napari-plugin-engine>0:graphics/py-napari-plugin-engine@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}napari-svg>=0.1.5:misc/py-napari-svg@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-pretty>=0:devel/py-pytest-pretty@${PY_FLAVOR} diff --git a/misc/py-numcodecs/Makefile b/misc/py-numcodecs/Makefile index e70bb4e36a5b..a897e7137ddb 100644 --- a/misc/py-numcodecs/Makefile +++ b/misc/py-numcodecs/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py-cpuinfo>0:sysutils/py-py-cpuinfo@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zfp>0:devel/py-zfp@${PY_FLAVOR} diff --git a/misc/py-onnx/Makefile b/misc/py-onnx/Makefile index 26fa36b4317a..f69c9215a337 100644 --- a/misc/py-onnx/Makefile +++ b/misc/py-onnx/Makefile @@ -29,7 +29,7 @@ BUILD_DEPENDS= bash:shells/bash \ #LIB_DEPENDS= libabsl_base.so:devel/abseil \ libprotobuf.so:devel/protobuf # disable packaged protobuf RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-re2>0:devel/py-google-re2@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.20.2:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.2.1:devel/py-typing-extensions@${PY_FLAVOR} diff --git a/misc/py-openai-whisper/Makefile b/misc/py-openai-whisper/Makefile index b1345a74efca..f494362ac723 100644 --- a/misc/py-openai-whisper/Makefile +++ b/misc/py-openai-whisper/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tiktoken>0:textproc/py-tiktoken@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} diff --git a/misc/py-openai/Makefile b/misc/py-openai/Makefile index e9bbe8010634..a47476e0370c 100644 --- a/misc/py-openai/Makefile +++ b/misc/py-openai/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}anyio>=3.5.0:devel/py-anyio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>4:misc/py-tqdm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.11:devel/py-typing-extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jiter>=0.10.0:textproc/py-jiter@${PY_FLAVOR} -RUN_DEPENDS+= ${PYNUMPY} \ +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.2.3:math/py-pandas@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-identity>0:devel/py-azure-identity@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dirty-equals>=0.6.0:devel/py-dirty-equals@${PY_FLAVOR} \ diff --git a/misc/py-openvdb/Makefile b/misc/py-openvdb/Makefile index 5132f50768fc..44508b295d75 100644 --- a/misc/py-openvdb/Makefile +++ b/misc/py-openvdb/Makefile @@ -14,11 +14,11 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/../../../LICENSE BUILD_DEPENDS= nanobind>0:devel/nanobind \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ libopenvdb.so:misc/openvdb \ libtbb.so:devel/onetbb -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake compiler:c++17-lang localbase:ldflags python USE_LDCONFIG= yes diff --git a/misc/py-optuna/Makefile b/misc/py-optuna/Makefile index 550c9b810fba..1184fedef286 100644 --- a/misc/py-optuna/Makefile +++ b/misc/py-optuna/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}alembic>=1.5.0:databases/py-alembic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorlog>0:devel/py-colorlog@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy20>=1.4.2:databases/py-sqlalchemy20@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \ diff --git a/misc/py-peft/Makefile b/misc/py-peft/Makefile index dd7b51622c97..63507f40f150 100644 --- a/misc/py-peft/Makefile +++ b/misc/py-peft/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}accelerate>=0.21.0:misc/py-accelerate@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}huggingface-hub>=0.25.0:misc/py-huggingface-hub@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>=1.13.0:misc/py-pytorch@${PY_FLAVOR} \ diff --git a/misc/py-pkbar/Makefile b/misc/py-pkbar/Makefile index ab9c27704773..6bde32ce05ab 100644 --- a/misc/py-pkbar/Makefile +++ b/misc/py-pkbar/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/misc/py-pyEDFlib/Makefile b/misc/py-pyEDFlib/Makefile index 65f35d1c6d78..9fe1517cb1c7 100644 --- a/misc/py-pyEDFlib/Makefile +++ b/misc/py-pyEDFlib/Makefile @@ -13,8 +13,8 @@ WWW= https://github.com/holgern/pyedflib LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= fortran python USE_PYTHON= distutils cython autoplist diff --git a/misc/py-pymatreader/Makefile b/misc/py-pymatreader/Makefile index a3e656b73359..67fe45df036b 100644 --- a/misc/py-pymatreader/Makefile +++ b/misc/py-pymatreader/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-regex-commit>0:devel/py-hatch-regex-commit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.7.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xmltodict>=0:devel/py-xmltodict@${PY_FLAVOR} diff --git a/misc/py-pytorch-lightning/Makefile b/misc/py-pytorch-lightning/Makefile index d5d153278ec7..db571d6781f2 100644 --- a/misc/py-pytorch-lightning/Makefile +++ b/misc/py-pytorch-lightning/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fsspec>=2022.5.0:filesystems/py-fsspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lightning-utilities>=0.10.0:misc/py-lightning-utilities@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>=2.0.0:misc/py-pytorch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}torchmetrics>=0.7.0:misc/py-torchmetrics@${PY_FLAVOR} \ diff --git a/misc/py-pytorch/Makefile b/misc/py-pytorch/Makefile index 7d8f7051357f..91a649919464 100644 --- a/misc/py-pytorch/Makefile +++ b/misc/py-pytorch/Makefile @@ -24,7 +24,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ cmake:devel/cmake-core \ gmake:devel/gmake \ pybind11>0:devel/pybind11 \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${LOCALBASE}/include/fxdiv.h:devel/fxdiv \ ${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fsspec>0:filesystems/py-fsspec@${PY_FLAVOR} \ @@ -49,7 +49,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}fsspec>0:filesystems/py-fsspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>=1.13.3:math/py-sympy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.10.0:devel/py-typing-extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR} diff --git a/misc/py-safetensors/Makefile b/misc/py-safetensors/Makefile index b75f1bbb0e65..e51be986f66d 100644 --- a/misc/py-safetensors/Makefile +++ b/misc/py-safetensors/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/../../LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-rust>0:devel/py-setuptools-rust@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}maturin>0:devel/py-maturin@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>=1.10:misc/py-pytorch@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h5py>=3.7.0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}huggingface-hub>=0.12.1:misc/py-huggingface-hub@${PY_FLAVOR} \ diff --git a/misc/py-sagemaker-core/Makefile b/misc/py-sagemaker-core/Makefile index 50e61c80a1d2..05599159d7d9 100644 --- a/misc/py-sagemaker-core/Makefile +++ b/misc/py-sagemaker-core/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=20.3.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=7.0>=1.4.0:devel/py-importlib-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}omegaconf>=2.1.0:devel/py-omegaconf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.0.0:math/py-pandas@${PY_FLAVOR} \ diff --git a/misc/py-scikit-fusion/Makefile b/misc/py-scikit-fusion/Makefile index 546b35a57790..80f42741689d 100644 --- a/misc/py-scikit-fusion/Makefile +++ b/misc/py-scikit-fusion/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/marinkaz/scikit-fusion LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}joblib>=0.8.4:devel/py-joblib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.12.0:science/py-scipy@${PY_FLAVOR} diff --git a/misc/py-sentence-transformers/Makefile b/misc/py-sentence-transformers/Makefile index 03371e23bcdc..ed5d8c6adc48 100644 --- a/misc/py-sentence-transformers/Makefile +++ b/misc/py-sentence-transformers/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}huggingface-hub>=0.20.0:misc/py-huggingface-hub@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>=1.11.0:misc/py-pytorch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/misc/py-shap2/Makefile b/misc/py-shap2/Makefile index 3639dc0e21b3..f8a96d8fecfd 100644 --- a/misc/py-shap2/Makefile +++ b/misc/py-shap2/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/slundberg/shap LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ diff --git a/misc/py-soapy_power/Makefile b/misc/py-soapy_power/Makefile index 17614b8da1da..94413b1e559b 100644 --- a/misc/py-soapy_power/Makefile +++ b/misc/py-soapy_power/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/xmikos/soapy_power LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyFFTW>0:math/py-pyFFTW@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}SimpleSoapy>=1.5.0:misc/py-SimpleSoapy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}SimpleSpectral>0:science/py-SimpleSpectral@${PY_FLAVOR} diff --git a/misc/py-spandrel/Makefile b/misc/py-spandrel/Makefile index 556bd3b8d813..24b890c5f423 100644 --- a/misc/py-spandrel/Makefile +++ b/misc/py-spandrel/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}einops>0:misc/py-einops@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}safetensors>0:misc/py-safetensors@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}torchvision>0:misc/py-torchvision@${PY_FLAVOR} \ diff --git a/misc/py-tflearn/Makefile b/misc/py-tflearn/Makefile index 3b724b8f240b..f41e873d877a 100644 --- a/misc/py-tflearn/Makefile +++ b/misc/py-tflearn/Makefile @@ -12,7 +12,7 @@ WWW= http://tflearn.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVOR} diff --git a/misc/py-tflite-support/Makefile b/misc/py-tflite-support/Makefile index ac88bb075202..e8f216da15d7 100644 --- a/misc/py-tflite-support/Makefile +++ b/misc/py-tflite-support/Makefile @@ -12,7 +12,7 @@ WWW= https://www.tensorflow.org/ LICENSE= APACHE20 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>=2.4:devel/py-pybind11@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}absl-py>=0.7.0:devel/py-absl-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>=2.4:devel/py-pybind11@${PY_FLAVOR} diff --git a/misc/py-tflite/Makefile b/misc/py-tflite/Makefile index 48e98c7f5472..75bf37f2dbf5 100644 --- a/misc/py-tflite/Makefile +++ b/misc/py-tflite/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flatbuffers>0:devel/py-flatbuffers@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= pep517 autoplist pytest diff --git a/misc/py-thermocouples_reference/Makefile b/misc/py-thermocouples_reference/Makefile index 49f1dae7ec91..1876ce0b0d6e 100644 --- a/misc/py-thermocouples_reference/Makefile +++ b/misc/py-thermocouples_reference/Makefile @@ -12,7 +12,7 @@ WWW= https://pypi.org/project/thermocouples_reference/ LICENSE= PD #BUILD_DEPENDS= ${PY_SETUPTOOLS} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/misc/py-timm-vis/Makefile b/misc/py-timm-vis/Makefile index 1424eb94ba63..1ecf3fee59a2 100644 --- a/misc/py-timm-vis/Makefile +++ b/misc/py-timm-vis/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}torchvision>0:misc/py-torchvision@${PY_FLAVOR} diff --git a/misc/py-torch-geometric/Makefile b/misc/py-torch-geometric/Makefile index 359b99a030c1..884b5cbe0a7a 100644 --- a/misc/py-torch-geometric/Makefile +++ b/misc/py-torch-geometric/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dgl>0:math/py-dgl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fsspec>0:filesystems/py-fsspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.8.0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} \ diff --git a/misc/py-torchao/Makefile b/misc/py-torchao/Makefile index 77461d18f247..81b83a47dc2e 100644 --- a/misc/py-torchao/Makefile +++ b/misc/py-torchao/Makefile @@ -13,7 +13,7 @@ WWW= https://docs.pytorch.org/ao/stable/index.html \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/misc/py-torchmetrics/Makefile b/misc/py-torchmetrics/Makefile index b2f5fea4fd8c..4dd83ff01504 100644 --- a/misc/py-torchmetrics/Makefile +++ b/misc/py-torchmetrics/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lightning-utilities>=0.8.0:misc/py-lightning-utilities@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nltk>=3.6:textproc/py-nltk@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>17.1:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=2021.9.24:textproc/py-regex@${PY_FLAVOR} \ diff --git a/misc/py-torchsummary/Makefile b/misc/py-torchsummary/Makefile index 8fa6259c5153..93d289fae796 100644 --- a/misc/py-torchsummary/Makefile +++ b/misc/py-torchsummary/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/sksq96/pytorch-summary LICENSE= MIT -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} USES= python diff --git a/misc/py-torchvision/Makefile b/misc/py-torchvision/Makefile index b63b7f4d902c..83ac66a07693 100644 --- a/misc/py-torchvision/Makefile +++ b/misc/py-torchvision/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpng16.so:graphics/png \ libwebp.so:graphics/webp -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} PY_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=5.3.0:graphics/py-pillow@${PY_FLAVOR} # image backend diff --git a/misc/py-transformers/Makefile b/misc/py-transformers/Makefile index 06434ff63dfd..07c3e820366b 100644 --- a/misc/py-transformers/Makefile +++ b/misc/py-transformers/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}huggingface-hub>=1.3.0:misc/py-huggingface-hub@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=2019.12.17:textproc/py-regex@${PY_FLAVOR} \ diff --git a/misc/py-tvm/Makefile b/misc/py-tvm/Makefile index 1e6fe0ded16c..8d3373a5ff9b 100644 --- a/misc/py-tvm/Makefile +++ b/misc/py-tvm/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libtvm.so:misc/tvm -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \ diff --git a/misc/py-uhi/Makefile b/misc/py-uhi/Makefile index 5e300b7a0735..e264d77e5a07 100644 --- a/misc/py-uhi/Makefile +++ b/misc/py-uhi/Makefile @@ -12,11 +12,11 @@ WWW= https://uhi.readthedocs.io/en/latest/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fastjsonschema>0:devel/py-fastjsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatch-vcs>0:devel/py-hatch-vcs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boost-histogram>=1.0:misc/py-boost-histogram@${PY_FLAVOR} USES= compiler:c++14-lang python diff --git a/misc/py-wurlitzer/Makefile b/misc/py-wurlitzer/Makefile index ba6c60b1c645..545b427581a9 100644 --- a/misc/py-wurlitzer/Makefile +++ b/misc/py-wurlitzer/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} diff --git a/misc/py-xformers/Makefile b/misc/py-xformers/Makefile index c3627e5b02a7..b482f6fcb53a 100644 --- a/misc/py-xformers/Makefile +++ b/misc/py-xformers/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= pybind11>0:devel/pybind11 \ ${PYTHON_PKGNAMEPREFIX}pytorch>=2.1:misc/py-pytorch@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytorch>=2.1:misc/py-pytorch@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++17-lang localbase python USE_PYTHON= distutils autoplist pytest # tests fail, see https://github.com/facebookresearch/xformers/issues/1003 diff --git a/misc/py-xgboost/Makefile b/misc/py-xgboost/Makefile index eef7e565ea23..d7b1aca7fa80 100644 --- a/misc/py-xgboost/Makefile +++ b/misc/py-xgboost/Makefile @@ -18,7 +18,7 @@ BROKEN_i386= compilation fails, see https://github.com/dmlc/xgboost/issues/10002 BUILD_DEPENDS= cmake:devel/cmake-core \ ${PYTHON_PKGNAMEPREFIX}hatchling>=1.12.1:devel/py-hatchling@${PY_FLAVOR} LIB_DEPENDS= libdmlc.so:devel/dmlc-core -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pandas>=1.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyarrow>0:databases/py-pyarrow@${PY_FLAVOR} \ diff --git a/misc/pytorch/Makefile b/misc/pytorch/Makefile index a51870ac6398..d7c5294e40ac 100644 --- a/misc/pytorch/Makefile +++ b/misc/pytorch/Makefile @@ -50,7 +50,7 @@ OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes PYTHON_CMAKE_BOOL= BUILD_PYTHON -PYTHON_PY_DEPENDS= ${PYNUMPY} \ +PYTHON_PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} PYTHON_BUILD_DEPENDS= ${PYTHON_PY_DEPENDS} \ diff --git a/misc/urh/Makefile b/misc/urh/Makefile index b9b193177d9d..36f19eca5fe7 100644 --- a/misc/urh/Makefile +++ b/misc/urh/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN= requires OpenMP support that is missing on this architecture .endif -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR} diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile index 0f998254a016..957e26f4703c 100644 --- a/multimedia/pitivi/Makefile +++ b/multimedia/pitivi/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.14.0:multimedia/py-gstreamer1@ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cpe desktop-file-utils gettext-tools gnome gstreamer meson \ pkgconfig python shared-mime-info shebangfix tar:xz diff --git a/multimedia/py-pretty_midi/Makefile b/multimedia/py-pretty_midi/Makefile index 75b8d02a9cef..5d34a3590344 100644 --- a/multimedia/py-pretty_midi/Makefile +++ b/multimedia/py-pretty_midi/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/craffel/pretty-midi LICENSE= MIT -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mido>=1.1.16:multimedia/py-mido@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} diff --git a/multimedia/py-scenedetect/Makefile b/multimedia/py-scenedetect/Makefile index 6d8490ac37bd..07ec02dea49c 100644 --- a/multimedia/py-scenedetect/Makefile +++ b/multimedia/py-scenedetect/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=63.1:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.37:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=8.0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>0:devel/py-platformdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \ diff --git a/multimedia/py-torchcodec/Makefile b/multimedia/py-torchcodec/Makefile index cc9cdf47f75d..fc040225f6cd 100644 --- a/multimedia/py-torchcodec/Makefile +++ b/multimedia/py-torchcodec/Makefile @@ -25,7 +25,7 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libprotobuf.so:devel/protobuf RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}torchvision>0:misc/py-torchvision@${PY_FLAVOR} -TEST_DEPENDS= ${PYNUMPY} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake:indirect compiler:c++17-lang python USE_PYTHON= pep517 autoplist pytest diff --git a/science/abinit/Makefile b/science/abinit/Makefile index 5308e985f03e..9409e66c23d2 100644 --- a/science/abinit/Makefile +++ b/science/abinit/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le BUILD_DEPENDS= gm4:devel/m4 \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}graphviz>0:graphics/py-graphviz@${PY_FLAVOR} @@ -29,7 +29,7 @@ LIB_DEPENDS= libelpa.so:math/elpa \ libnetcdff.so:science/netcdf-fortran RUN_DEPENDS= atompaw:science/atompaw TEST_DEPENDS= bash:shells/bash \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ libyaml>0:textproc/libyaml USES= autoreconf:build blaslapack:netlib fortran gmake gnome localbase:ldflags \ diff --git a/science/agrum/Makefile b/science/agrum/Makefile index b690c6ac65ea..de3828ee8c16 100644 --- a/science/agrum/Makefile +++ b/science/agrum/Makefile @@ -43,7 +43,7 @@ OPENMP_CMAKE_BOOL= USE_OPENMP PYTHON_CMAKE_BOOL= BUILD_PYTHON PYTHON_USES= python PYTHON_PLIST_SUB= PYTHON_VER_MAJ=${PYTHON_VER:R} -PYTHON_RUN_DEPENDS= ${PYNUMPY} \ +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib-inline>0:math/py-matplotlib-inline@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nbconvert>0:devel/py-nbconvert@${PY_FLAVOR} \ diff --git a/science/cantera/Makefile b/science/cantera/Makefile index 353d2b626024..25d8b159eced 100644 --- a/science/cantera/Makefile +++ b/science/cantera/Makefile @@ -65,10 +65,10 @@ PYTHON_USE= PYTHON=cython PYTHON_MAKE_ARGS= python_cmd=${PYTHON_CMD} python_package=full PYTHON_MAKE_ARGS_OFF= python_package="none" PYTHON_BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} -PYTHON_RUN_DEPENDS= ${PYNUMPY} \ +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ diff --git a/science/dftbplus/Makefile b/science/dftbplus/Makefile index 9b30895f40ce..e7978e954d5e 100644 --- a/science/dftbplus/Makefile +++ b/science/dftbplus/Makefile @@ -14,7 +14,7 @@ BROKEN_aarch64= Lack of IEEE754 support in gcc causes "Cannot find an intrinsic LIB_DEPENDS= libblas.so:math/blas \ liblapack.so:math/lapack \ libopenblas.so:math/openblas -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= bash:shells/bash USES= cmake compiler:gcc-c++11-lib fortran pkgconfig python:build shebangfix diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 8275fc27a564..53e21c08c2a8 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -93,8 +93,8 @@ NETCDF_CMAKE_ON= -DNETCDF:BOOL=YES -DHDF:BOOL=NO NETCDF_CMAKE_OFF= -DNETCDF:BOOL=NO PYTHON_USES= python -PYTHON_BUILD_DEPENDS= ${PYNUMPY} -PYTHON_RUN_DEPENDS= ${PYNUMPY} \ +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} PYTHON_CMAKE_ON= -DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}" PYTHON_CMAKE_OFF= -DPYTHON:BOOL=NO diff --git a/science/libcint/Makefile b/science/libcint/Makefile index 030c5de31ee3..7556cf970ab9 100644 --- a/science/libcint/Makefile +++ b/science/libcint/Makefile @@ -10,7 +10,7 @@ WWW= https://github.com/sunqm/libcint LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYNUMPY} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyscf>0:science/py-pyscf@${PY_FLAVOR} USES= cmake blaslapack:openblas python:test diff --git a/science/meep/Makefile b/science/meep/Makefile index 9161e5db1bb6..5e5323afe874 100644 --- a/science/meep/Makefile +++ b/science/meep/Makefile @@ -54,7 +54,7 @@ PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autograd>0:math/py-autograd@${PY_FLA ${PYTHON_PKGNAMEPREFIX}jax>0:math/py-jax@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jupyter-rfb>0:devel/py-jupyter-rfb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \ diff --git a/science/mopac/Makefile b/science/mopac/Makefile index 4793323e925b..4582fd80ce4c 100644 --- a/science/mopac/Makefile +++ b/science/mopac/Makefile @@ -12,7 +12,7 @@ WWW= http://openmopac.net \ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYNUMPY} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= blaslapack:openblas cmake:testing fortran python:test USE_LDCONFIG= yes diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 246230266768..df881960552a 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE #BROKEN_i386= no matching member function for call to 'getArrayType' -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ cli11>0:devel/cli11 \ utf8cpp>0:devel/utf8cpp \ fast_float>0:math/fast_float \ @@ -57,7 +57,7 @@ LIB_DEPENDS= libhdf5.so:science/hdf5 \ libboost_thread.so:devel/boost-libs \ libfontconfig.so:x11-fonts/fontconfig \ libdouble-conversion.so:devel/double-conversion -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ bash:shells/bash \ vtk${VTK_VER:R}>0:math/vtk${VTK_VER:R} \ ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR} diff --git a/science/pastix/Makefile b/science/pastix/Makefile index 47f46e15b561..9be0a68d871e 100644 --- a/science/pastix/Makefile +++ b/science/pastix/Makefile @@ -11,13 +11,13 @@ WWW= https://solverstack.gitlabpages.inria.fr/pastix/ LICENSE= LGPL3 BUILD_DEPENDS= bash:shells/bash \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libmetis.so:math/metis \ libjulia.so:lang/julia \ libscotch.so:cad/scotch \ libhwloc.so:devel/hwloc2 RUN_DEPENDS= bash:shells/bash \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake blaslapack:openblas fortran pkgconfig python diff --git a/science/precice/Makefile b/science/precice/Makefile index d25cd5cf9929..041b46bbcb69 100644 --- a/science/precice/Makefile +++ b/science/precice/Makefile @@ -13,10 +13,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN= fails to build with Boost>=1.87 -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libmpicxx.so:net/mpich -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake:noninja,testing compiler:c++14-lang eigen:3 gnome pkgconfig python shebangfix # fails with ninja: phony target 'binprecice' names itself as an input; ignoring USE_GNOME= libxml2 diff --git a/science/py-GPy/Makefile b/science/py-GPy/Makefile index bb89cc77fe45..f2d8f3ce0a22 100644 --- a/science/py-GPy/Makefile +++ b/science/py-GPy/Makefile @@ -17,8 +17,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BROKEN= requires OpenMP support that is missing on this architecture .endif -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.3.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramz>=0.9.6:science/py-paramz@${PY_FLAVOR} \ diff --git a/science/py-GPyOpt/Makefile b/science/py-GPyOpt/Makefile index 8fb425a14826..1d54637749cd 100644 --- a/science/py-GPyOpt/Makefile +++ b/science/py-GPyOpt/Makefile @@ -13,7 +13,7 @@ WWW= https://sheffieldml.github.io/GPyOpt/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.16:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}GPy>=1.8:science/py-GPy@${PY_FLAVOR} diff --git a/science/py-MDAnalysis/Makefile b/science/py-MDAnalysis/Makefile index a381496e9960..fc5924e5d5ee 100644 --- a/science/py-MDAnalysis/Makefile +++ b/science/py-MDAnalysis/Makefile @@ -12,9 +12,9 @@ WWW= https://www.mdanalysis.org LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=2.0:devel/py-packaging@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ clustalw2:biology/clustalw \ rdkit>0:science/rdkit \ ${PYTHON_PKGNAMEPREFIX}biopython>=1.71:biology/py-biopython@${PY_FLAVOR} \ diff --git a/science/py-MDAnalysisTests/Makefile b/science/py-MDAnalysisTests/Makefile index f62458a01906..d29cf5c94e6e 100644 --- a/science/py-MDAnalysisTests/Makefile +++ b/science/py-MDAnalysisTests/Makefile @@ -12,7 +12,7 @@ WWW= https://www.mdanalysis.org LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MDAnalysis>0:science/py-MDAnalysis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} diff --git a/science/py-OpenFermion/Makefile b/science/py-OpenFermion/Makefile index 4c805a94ad0f..0d7ae09cd963 100644 --- a/science/py-OpenFermion/Makefile +++ b/science/py-OpenFermion/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cirq-core>=1.0:science/py-cirq-core@${PY_FLA ${PYTHON_PKGNAMEPREFIX}deprecation>0:devel/py-deprecation@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>=2.8:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PubChemPy>0:science/py-PubChemPy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.18:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.1.0:science/py-scipy@${PY_FLAVOR} \ diff --git a/science/py-OpenMC/Makefile b/science/py-OpenMC/Makefile index a13e6abab86a..dbf2725f8f09 100644 --- a/science/py-OpenMC/Makefile +++ b/science/py-OpenMC/Makefile @@ -12,7 +12,7 @@ WWW= https://openmc.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ diff --git a/science/py-PyFR/Makefile b/science/py-PyFR/Makefile index e606e1717bac..0d649294863d 100644 --- a/science/py-PyFR/Makefile +++ b/science/py-PyFR/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}h5py>=2.10:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>=1.0.0:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mpi4py>=3.1.0:net/py-mpi4py@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=2.2.0:devel/py-platformdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytools>=2016.2.1:devel/py-pytools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rtree>=1.0.1:devel/py-rtree@${PY_FLAVOR} diff --git a/science/py-PyNE/Makefile b/science/py-PyNE/Makefile index 391126e6c6e9..2cf5df597910 100644 --- a/science/py-PyNE/Makefile +++ b/science/py-PyNE/Makefile @@ -27,7 +27,7 @@ BROKEN_armv7= clang runs out of memory PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}progress>0:devel/py-progress@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tables>0:devel/py-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ diff --git a/science/py-SimpleSpectral/Makefile b/science/py-SimpleSpectral/Makefile index 55a6e5b1ff56..ffaaedbdf45f 100644 --- a/science/py-SimpleSpectral/Makefile +++ b/science/py-SimpleSpectral/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/xmikos/simplespectral LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/science/py-abipy/Makefile b/science/py-abipy/Makefile index 9db250fd7a81..15ef1d3eb84e 100644 --- a/science/py-abipy/Makefile +++ b/science/py-abipy/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}APScheduler>0:devel/py-apscheduler@${PY_FLAV ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}monty>0:devel/py-monty@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netCDF4>0:science/py-netCDF4@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}phonopy>0:science/py-phonopy@${PY_FLAVOR} \ diff --git a/science/py-arbor/Makefile b/science/py-arbor/Makefile index 8e48a4c4c3c5..5fead274bc14 100644 --- a/science/py-arbor/Makefile +++ b/science/py-arbor/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= gmake:devel/gmake \ pybind11>0:devel/pybind11 \ nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= libarbor.so:science/arbor -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake compiler:c++17-lang localbase:ldflags python USE_PYTHON= flavors unittest # tests fail to run, see https://github.com/arbor-sim/arbor/issues/2395 diff --git a/science/py-arch/Makefile b/science/py-arch/Makefile index 86a39761607e..ba88f5cb0c9c 100644 --- a/science/py-arch/Makefile +++ b/science/py-arch/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/bashtage/arch LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}property-cached>=1.6.4:devel/py-property-cached@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.5:science/py-scipy@${PY_FLAVOR} \ diff --git a/science/py-asap3/Makefile b/science/py-asap3/Makefile index 0b67866b0dad..b5e6bb08430f 100644 --- a/science/py-asap3/Makefile +++ b/science/py-asap3/Makefile @@ -12,9 +12,9 @@ WWW= https://wiki.fysik.dtu.dk/asap LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libmpich.so:net/mpich # not sure if this is used -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ase>=3.24.0:science/py-ase@${PY_FLAVOR} USES= localbase python diff --git a/science/py-ase/Makefile b/science/py-ase/Makefile index a8f81a71f644..afe8d7f8862e 100644 --- a/science/py-ase/Makefile +++ b/science/py-ase/Makefile @@ -13,7 +13,7 @@ WWW= https://ase-lib.org/ \ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.1.0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.1.0:science/py-scipy@${PY_FLAVOR} # nwchem:science/nwchem diff --git a/science/py-atomium/Makefile b/science/py-atomium/Makefile index 68b26c51660c..0dd6091dff6a 100644 --- a/science/py-atomium/Makefile +++ b/science/py-atomium/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coveralls>0:devel/py-coveralls@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.6.1:devel/py-msgpack@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rmsd>0:science/py-rmsd@${PY_FLAVOR} \ diff --git a/science/py-boutdata/Makefile b/science/py-boutdata/Makefile index 482c573f8f1c..ed92e7b9c2b6 100644 --- a/science/py-boutdata/Makefile +++ b/science/py-boutdata/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.8.0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}natsort>=8.1.0:devel/py-natsort@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netCDF4>0:science/py-netCDF4@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.12.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>=1.5.1:math/py-sympy@${PY_FLAVOR} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ diff --git a/science/py-boututils/Makefile b/science/py-boututils/Makefile index d9582f172304..1d9a06a7b614 100644 --- a/science/py-boututils/Makefile +++ b/science/py-boututils/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.2.1:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netCDF4>=1.5.3:science/py-netCDF4@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.4.1:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \ diff --git a/science/py-chainer-chemistry/Makefile b/science/py-chainer-chemistry/Makefile index 04d74ed97f1b..957c2833e11e 100644 --- a/science/py-chainer-chemistry/Makefile +++ b/science/py-chainer-chemistry/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/pfnet-research/chainer-chemistry LICENSE= MIT -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chainer>=7.0.0:science/py-chainer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ diff --git a/science/py-chainer/Makefile b/science/py-chainer/Makefile index 89d6915dc6d4..bb0543f92a37 100644 --- a/science/py-chainer/Makefile +++ b/science/py-chainer/Makefile @@ -12,7 +12,7 @@ WWW= https://chainer.org/ LICENSE= MIT LIB_DEPENDS= libprotobuf.so:devel/protobuf -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.0.0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ diff --git a/science/py-chempy/Makefile b/science/py-chempy/Makefile index ee41f452c44f..fbc8d0044061 100644 --- a/science/py-chempy/Makefile +++ b/science/py-chempy/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dot2tex>=2.11.3:print/dot2tex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.3:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PuLP>=1.6.8:math/py-PuLP@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyneqsys>=0.5.7:math/py-pyneqsys@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyodesys>=0.14.1:math/py-pyodesys@${PY_FLAVOR} \ diff --git a/science/py-cirq-core/Makefile b/science/py-cirq-core/Makefile index cfbb4119fa75..9d4d4b1d5bab 100644 --- a/science/py-cirq-core/Makefile +++ b/science/py-cirq-core/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/quantumlib/cirq LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cirq-google>0:science/py-cirq-google@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}duet>=0.2.6:net/py-duet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ diff --git a/science/py-dftd4/Makefile b/science/py-dftd4/Makefile index cf2608a561b5..68a23b74f487 100644 --- a/science/py-dftd4/Makefile +++ b/science/py-dftd4/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libdftd4.so:science/dftd4 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= pkgconfig python USE_PYTHON= pep517 autoplist diff --git a/science/py-dimod/Makefile b/science/py-dimod/Makefile index 9796968c7838..e9f00b9033f4 100644 --- a/science/py-dimod/Makefile +++ b/science/py-dimod/Makefile @@ -11,8 +11,8 @@ WWW= https://github.com/dwavesystems/dimod LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mypy>0:devel/py-mypy@${PY_FLAVOR} diff --git a/science/py-dipy/Makefile b/science/py-dipy/Makefile index ae3c6b08bf72..e3a2e42de280 100644 --- a/science/py-dipy/Makefile +++ b/science/py-dipy/Makefile @@ -13,11 +13,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meson-python>0:devel/meson-python@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h5py>=3.1.0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nibabel>=3.0.0:science/py-nibabel@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=21:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.8:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.30.0:misc/py-tqdm@${PY_FLAVOR} \ diff --git a/science/py-dwave-cloud-client/Makefile b/science/py-dwave-cloud-client/Makefile index 4c324c16383a..bae9a6edf3b3 100644 --- a/science/py-dwave-cloud-client/Makefile +++ b/science/py-dwave-cloud-client/Makefile @@ -19,7 +19,7 @@ PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authlib>=1.2:security/py-authlib@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}homebase>=1.0:devel/py-homebase@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}http-sf>=1.0.4:www/py-http-sf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=5.0.0:devel/py-importlib-metadata@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}orjson>=3.10:devel/py-orjson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=19:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plucky>=0.4.3:devel/py-plucky@${PY_FLAVOR} \ diff --git a/science/py-dwave-gate/Makefile b/science/py-dwave-gate/Makefile index ec419c8720c4..cf73e25010ce 100644 --- a/science/py-dwave-gate/Makefile +++ b/science/py-dwave-gate/Makefile @@ -14,9 +14,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= autoplist cython pep517 pytest diff --git a/science/py-dwave-hybrid/Makefile b/science/py-dwave-hybrid/Makefile index 8a9a7b18140d..25a856d7d08f 100644 --- a/science/py-dwave-hybrid/Makefile +++ b/science/py-dwave-hybrid/Makefile @@ -19,7 +19,7 @@ PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>5:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dwave-samplers>=1.0.0:science/py-dwave-samplers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dwave-system>=1.16.0:science/py-dwave-system@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}minorminer>=0.1.7:math/py-minorminer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plucky>=0.4.3:devel/py-plucky@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} diff --git a/science/py-dwave-inspector/Makefile b/science/py-dwave-inspector/Makefile index 55a82df0c9c4..415edaed89ff 100644 --- a/science/py-dwave-inspector/Makefile +++ b/science/py-dwave-inspector/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>=0.10.0:science/py-dimod@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}dwave-cloud-client>=0.13.0:science/py-dwave-cloud-client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dwave-system>=1.3.0:science/py-dwave-system@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flask>=2.2:www/py-flask@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}orjson>=3.10.0:devel/py-orjson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vcrpy>0:devel/py-vcrpy@${PY_FLAVOR} diff --git a/science/py-dwave-networkx/Makefile b/science/py-dwave-networkx/Makefile index 7d2e5ad15f75..c8c9a57e069a 100644 --- a/science/py-dwave-networkx/Makefile +++ b/science/py-dwave-networkx/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>=0.12.0:science/py-dimod@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=3.0:math/py-networkx@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \ diff --git a/science/py-dwave-optimization/Makefile b/science/py-dwave-optimization/Makefile index e985030030c5..f8426d108b2d 100644 --- a/science/py-dwave-optimization/Makefile +++ b/science/py-dwave-optimization/Makefile @@ -13,9 +13,9 @@ WWW= https://github.com/dwavesystems/dwave-optimization LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}meson-python>=0.18.0:devel/meson-python@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= autoplist cython pep517 pytest diff --git a/science/py-dwave-preprocessing/Makefile b/science/py-dwave-preprocessing/Makefile index 658a7b6b773f..8e22e440f4da 100644 --- a/science/py-dwave-preprocessing/Makefile +++ b/science/py-dwave-preprocessing/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>=0.12.6:science/py-dimod@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>=0.12.20:science/py-dimod@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= localbase:ldflags python USE_PYTHON= cython distutils unittest # 1 test fails, see https://github.com/dwavesystems/dwave-preprocessing/issues/74 diff --git a/science/py-dwave-samplers/Makefile b/science/py-dwave-samplers/Makefile index 784e83b2aa29..665b57950646 100644 --- a/science/py-dwave-samplers/Makefile +++ b/science/py-dwave-samplers/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>=0.12.13:science/py-dimod@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=3.0:math/py-networkx@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reno>0:textproc/py-reno@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/science/py-dwave-system/Makefile b/science/py-dwave-system/Makefile index c7e43db6650f..53b4bbaecc2e 100644 --- a/science/py-dwave-system/Makefile +++ b/science/py-dwave-system/Makefile @@ -19,7 +19,7 @@ PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>=0.12.20:science/py-dimod@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}dwave-samplers>=1.0.0:science/py-dwave-samplers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}homebase>=1.0.0:devel/py-homebase@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}minorminer>=0.2.19:math/py-minorminer@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.7.3:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/science/py-earthpy/Makefile b/science/py-earthpy/Makefile index 7e774e2b1c69..c766f7dc2f41 100644 --- a/science/py-earthpy/Makefile +++ b/science/py-earthpy/Makefile @@ -12,13 +12,13 @@ WWW= https://github.com/earthlab/earthpy LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}geopandas>=0:graphics/py-geopandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>=0:graphics/py-scikit-image@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \ diff --git a/science/py-geometric/Makefile b/science/py-geometric/Makefile index 1e3fd75df693..93ea9ad24dcd 100644 --- a/science/py-geometric/Makefile +++ b/science/py-geometric/Makefile @@ -12,7 +12,7 @@ WWW= https://geometric.readthedocs.io/en/latest/ \ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} diff --git a/science/py-gpaw/Makefile b/science/py-gpaw/Makefile index 9e1c778d1d96..f8d58c601c46 100644 --- a/science/py-gpaw/Makefile +++ b/science/py-gpaw/Makefile @@ -13,14 +13,14 @@ WWW= https://wiki.fysik.dtu.dk/gpaw/ \ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libblas.so:math/blas \ libmpich.so:net/mpich \ libopenblas.so:math/openblas \ libxc.so:science/libxc RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ase>0:science/py-ase@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ gpaw-setups>0:science/gpaw-setups diff --git a/science/py-gsd/Makefile b/science/py-gsd/Makefile index 0652dc399f78..a0abe8bc947a 100644 --- a/science/py-gsd/Makefile +++ b/science/py-gsd/Makefile @@ -12,8 +12,8 @@ WWW= https://bitbucket.org/glotzer/gsd/wiki/Home LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils cython autoplist pytest diff --git a/science/py-h5json/Makefile b/science/py-h5json/Makefile index 05c7989010b9..7bdc69fe977c 100644 --- a/science/py-h5json/Makefile +++ b/science/py-h5json/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} USES= python diff --git a/science/py-h5pyd/Makefile b/science/py-h5pyd/Makefile index f013ed993f78..0099da2681d9 100644 --- a/science/py-h5pyd/Makefile +++ b/science/py-h5pyd/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>0:www/py-pyjwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ diff --git a/science/py-hiPhive/Makefile b/science/py-hiPhive/Makefile index 3b000c66153a..f5094d2a1f9a 100644 --- a/science/py-hiPhive/Makefile +++ b/science/py-hiPhive/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ase>0:science/py-ase@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>=0.55:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.0.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/science/py-icet/Makefile b/science/py-icet/Makefile index a33ebe876d0e..1abea2acfeba 100644 --- a/science/py-icet/Makefile +++ b/science/py-icet/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ase>0:science/py-ase@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>=0.55:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.23:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.0.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spglib>=1.12.0:science/py-spglib@${PY_FLAVOR} \ diff --git a/science/py-ipygany/Makefile b/science/py-ipygany/Makefile index 6848ddba8c66..b3bfd46af451 100644 --- a/science/py-ipygany/Makefile +++ b/science/py-ipygany/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter-packaging>0:devel/py-jupyter-packaging@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traittypes>0:devel/py-traittypes@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipydatawidgets>0:devel/py-ipydatawidgets@${PY_FLAVOR} USES= python diff --git a/science/py-kimpy/Makefile b/science/py-kimpy/Makefile index 25a3e5041ae1..b8d987a3c764 100644 --- a/science/py-kimpy/Makefile +++ b/science/py-kimpy/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} LIB_DEPENDS= libkim-api.so:science/kim-api -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++20-lang pkgconfig python USE_PYTHON= distutils autoplist pytest # tests fail to run, see https://github.com/openkim/kimpy/issues/16 diff --git a/science/py-kliff/Makefile b/science/py-kliff/Makefile index e1ba1505967b..07070c7dfd0a 100644 --- a/science/py-kliff/Makefile +++ b/science/py-kliff/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}loguru>0:devel/py-loguru@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}emcee>0:math/py-emcee@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}kimpy>0:science/py-kimpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} \ diff --git a/science/py-libgetar/Makefile b/science/py-libgetar/Makefile index 6d7418ff1407..3893da4c01bf 100644 --- a/science/py-libgetar/Makefile +++ b/science/py-libgetar/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/glotzerlab/libgetar LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}breathe>0:devel/py-breathe@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/science/py-lifelines/Makefile b/science/py-lifelines/Makefile index 7d1e91bf6fca..472e75259c5c 100644 --- a/science/py-lifelines/Makefile +++ b/science/py-lifelines/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/CamDavidsonPilon/lifelines/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.18:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>1.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>2.0:math/py-matplotlib@${PY_FLAVOR} \ diff --git a/science/py-mdp/Makefile b/science/py-mdp/Makefile index b3168197bd5b..acdec4f94038 100644 --- a/science/py-mdp/Makefile +++ b/science/py-mdp/Makefile @@ -12,7 +12,7 @@ WWW= https://mdp-toolkit.sourceforge.net/ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/science/py-meshio/Makefile b/science/py-meshio/Makefile index 7ddb40379bb5..e58f25326083 100644 --- a/science/py-meshio/Makefile +++ b/science/py-meshio/Makefile @@ -11,11 +11,11 @@ WWW= https://github.com/nschloe/meshio LICENSE= MIT -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rich>0:textproc/py-rich@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}netCDF4>0:science/py-netCDF4@${PY_FLAVOR} diff --git a/science/py-mmtf-python/Makefile b/science/py-mmtf-python/Makefile index 44a765d129d9..7c17c9b0b561 100644 --- a/science/py-mmtf-python/Makefile +++ b/science/py-mmtf-python/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.0:devel/py-msgpack@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/science/py-mne/Makefile b/science/py-mne/Makefile index d245e0dcdbe0..9245741a9520 100644 --- a/science/py-mne/Makefile +++ b/science/py-mne/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lazy_loader>=0.3:devel/py-lazy_loader@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.8:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pooch>=1.5:devel/py-pooch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.11:science/py-scipy@${PY_FLAVOR} \ diff --git a/science/py-molmod/Makefile b/science/py-molmod/Makefile index 32e3724b887d..b175972ecf83 100644 --- a/science/py-molmod/Makefile +++ b/science/py-molmod/Makefile @@ -12,8 +12,8 @@ WWW= https://github.com/molmod/molmod LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} diff --git a/science/py-mpcontribs-client/Makefile b/science/py-mpcontribs-client/Makefile index 0a4f01763853..5b4dae6a8652 100644 --- a/science/py-mpcontribs-client/Makefile +++ b/science/py-mpcontribs-client/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boltons>0:devel/py-boltons@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flatten-dict>0:devel/py-flatten-dict@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}json2html>0:textproc/py-json2html@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pint>0:devel/py-pint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR} \ diff --git a/science/py-mplhep/Makefile b/science/py-mplhep/Makefile index dab303fdf531..be6245c36fe2 100644 --- a/science/py-mplhep/Makefile +++ b/science/py-mplhep/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-vcs>0:devel/py-hatch-vcs@${PY_FLAVOR RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mplhep-data>=0.0.4:science/py-mplhep-data@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}uhi>=0.2.0:misc/py-uhi@${PY_FLAVOR} diff --git a/science/py-ncrystal/Makefile b/science/py-ncrystal/Makefile index 65bcdf5502b5..b2436fddb58d 100644 --- a/science/py-ncrystal/Makefile +++ b/science/py-ncrystal/Makefile @@ -13,10 +13,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \ cmake:devel/cmake-core -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= pep517 concurrent autoplist diff --git a/science/py-neo/Makefile b/science/py-neo/Makefile index 86663b0e933e..10bc0ca202b9 100644 --- a/science/py-neo/Makefile +++ b/science/py-neo/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}quantities>=0.16.1:science/py-quantities@${PY_FLAVOR} diff --git a/science/py-netCDF4/Makefile b/science/py-netCDF4/Makefile index f6bedee9fca5..d9fdb0bec74a 100644 --- a/science/py-netCDF4/Makefile +++ b/science/py-netCDF4/Makefile @@ -12,10 +12,10 @@ WWW= https://unidata.github.io/netcdf4-python/ LICENSE= MIT -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libhdf5.so:science/hdf5 \ libnetcdf.so:science/netcdf -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cftime>=0:devel/py-cftime@${PY_FLAVOR} USES= python diff --git a/science/py-nglview/Makefile b/science/py-nglview/Makefile index e143a0dcbabb..785407947a69 100644 --- a/science/py-nglview/Makefile +++ b/science/py-nglview/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipywidgets>=8:devel/py-ipywidgets@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}jupyterlab>=3:devel/py-jupyterlab@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jupyterlab-widgets>0:devel/py-jupyterlab-widgets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}notebook>=7:www/py-notebook@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} USES= python diff --git a/science/py-nibabel/Makefile b/science/py-nibabel/Makefile index dcde7df55c23..4b324568088d 100644 --- a/science/py-nibabel/Makefile +++ b/science/py-nibabel/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-vcs>0:devel/py-hatch-vcs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=17:devel/py-packaging@${PY_FLAVOR} py311_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=1.1.0:devel/py-importlib-resources@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.6:devel/py-typing-extensions@${PY_FLAVOR} diff --git a/science/py-obspy/Makefile b/science/py-obspy/Makefile index 1a8ab9e4b87a..08237a25d430 100644 --- a/science/py-obspy/Makefile +++ b/science/py-obspy/Makefile @@ -10,7 +10,7 @@ WWW= https://www.obspy.org/ LICENSE= LGPL3 -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.7.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.12.4:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.0:math/py-matplotlib@${PY_FLAVOR} \ diff --git a/science/py-oddt/Makefile b/science/py-oddt/Makefile index 60bed3a22c41..9a9a3a7412a1 100644 --- a/science/py-oddt/Makefile +++ b/science/py-oddt/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/oddt/oddt LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}joblib>=0.9.4:devel/py-joblib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.19.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.18:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/science/py-openpiv/Makefile b/science/py-openpiv/Makefile index 38bda7888609..a26bc0dadeba 100644 --- a/science/py-openpiv/Makefile +++ b/science/py-openpiv/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ diff --git a/science/py-optking/Makefile b/science/py-optking/Makefile index 91be9f19901f..dcae07ab8245 100644 --- a/science/py-optking/Makefile +++ b/science/py-optking/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0:devel/py-msgpack@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qcelemental>=0.20.0:science/py-qcelemental@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qcengine>=0.20.0:science/py-qcengine@${PY_FLAVOR} TEST_DEPENDS= dftd3:science/dftd3 diff --git a/science/py-paramz/Makefile b/science/py-paramz/Makefile index ed3901df6ab5..17d1ad2d5d2c 100644 --- a/science/py-paramz/Makefile +++ b/science/py-paramz/Makefile @@ -13,7 +13,7 @@ WWW= https://github.com/sods/paramz LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} diff --git a/science/py-penaltymodel/Makefile b/science/py-penaltymodel/Makefile index 961548aa95b6..962646a4c65a 100644 --- a/science/py-penaltymodel/Makefile +++ b/science/py-penaltymodel/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>=0.12.13:science/py-dimod@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}homebase>=1.0.1:devel/py-homebase@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=3.0:math/py-networkx@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.7.3:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/science/py-periodictable/Makefile b/science/py-periodictable/Makefile index 165a95135838..3c8521b6c7ff 100644 --- a/science/py-periodictable/Makefile +++ b/science/py-periodictable/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR} USES= python diff --git a/science/py-phono3py/Makefile b/science/py-phono3py/Makefile index d018c606fab4..c15072cb915e 100644 --- a/science/py-phono3py/Makefile +++ b/science/py-phono3py/Makefile @@ -13,7 +13,7 @@ WWW= https://phonopy.github.io/phono3py/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>=3.0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.2:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}phonopy>=2.32:science/py-phonopy@${PY_FLAVOR} \ diff --git a/science/py-phonopy/Makefile b/science/py-phonopy/Makefile index 582ec0d93ce3..566821844f21 100644 --- a/science/py-phonopy/Makefile +++ b/science/py-phonopy/Makefile @@ -15,11 +15,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ ${PYTHON_PKGNAMEPREFIX}nanobind>0:devel/py-nanobind@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>=3.0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.2:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spglib>=2.3:science/py-spglib@${PY_FLAVOR} \ diff --git a/science/py-pyberny/Makefile b/science/py-pyberny/Makefile index 8b34ce7d7c66..94bc48c73071 100644 --- a/science/py-pyberny/Makefile +++ b/science/py-pyberny/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/jhrmnn/pyberny LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= python diff --git a/science/py-pygmo2/Makefile b/science/py-pygmo2/Makefile index 100926346dfe..6803d0a1226f 100644 --- a/science/py-pygmo2/Makefile +++ b/science/py-pygmo2/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= pybind11>0:devel/pybind11 LIB_DEPENDS= libpagmo.so:science/pagmo2 \ libboost_serialization.so:devel/boost-libs \ libnlopt.so:math/nlopt -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \ diff --git a/science/py-pyked/Makefile b/science/py-pyked/Makefile index d53ea7654cdd..3a0bdc49ac32 100644 --- a/science/py-pyked/Makefile +++ b/science/py-pyked/Makefile @@ -14,7 +14,7 @@ WWW= https://pr-omethe-us.github.io/PyKED/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cerberus>=1.0.0:devel/py-cerberus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}habanero>=0.6.0:www/py-habanero@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pint>=0.7.2:devel/py-pint@${PY_FLAVOR} \ diff --git a/science/py-pymatgen/Makefile b/science/py-pymatgen/Makefile index 1a00000e9732..131b538fd7a2 100644 --- a/science/py-pymatgen/Makefile +++ b/science/py-pymatgen/Makefile @@ -15,14 +15,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bibtexparser>=1.4.0:textproc/py-bibtexparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}joblib>=1:devel/py-joblib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.8:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}monty>=2025.1.9:devel/py-monty@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=2.7:math/py-networkx@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}orjson>=3.10:devel/py-orjson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}palettable>=3.3.3:misc/py-palettable@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2:math/py-pandas@${PY_FLAVOR} \ diff --git a/science/py-pymol/Makefile b/science/py-pymol/Makefile index d90847e3d9e8..f9239adffe0b 100644 --- a/science/py-pymol/Makefile +++ b/science/py-pymol/Makefile @@ -14,7 +14,7 @@ LICENSE_NAME= Open-Source PyMOL Copyright LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ ${LOCALBASE}/include/mmtf.hpp:science/mmtf-cpp LIB_DEPENDS= libfreetype.so:print/freetype2 \ @@ -22,7 +22,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng16.so:graphics/png RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++11-lang gl gnome python tar:bz2 USE_GL= gl glew glu diff --git a/science/py-pynrrd/Makefile b/science/py-pynrrd/Makefile index 94d793a59ab0..b798992b3df8 100644 --- a/science/py-pynrrd/Makefile +++ b/science/py-pynrrd/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} USES= python diff --git a/science/py-pyprecice/Makefile b/science/py-pyprecice/Makefile index 80bae08c4b44..e2bb2e2cd856 100644 --- a/science/py-pyprecice/Makefile +++ b/science/py-pyprecice/Makefile @@ -12,7 +12,7 @@ WWW= https://precice.org/ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR} diff --git a/science/py-pyqubo/Makefile b/science/py-pyqubo/Makefile index 19288a73796a..5d4d79883e36 100644 --- a/science/py-pyqubo/Makefile +++ b/science/py-pyqubo/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}deprecated>=1.2.10:devel/py-deprecated@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dimod>=0.9.14:science/py-dimod@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dwave-neal>=0.5.7:science/py-dwave-neal@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.15.0:devel/py-six@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}nbsphinx>=0.8.3:textproc/py-nbsphinx@${PY_FLAVOR} \ diff --git a/science/py-pyscf/Makefile b/science/py-pyscf/Makefile index 1877db577d91..3642b355c884 100644 --- a/science/py-pyscf/Makefile +++ b/science/py-pyscf/Makefile @@ -13,7 +13,7 @@ WWW= https://pyscf.org/ \ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>=2.7:science/py-h5py@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} \ diff --git a/science/py-qcelemental/Makefile b/science/py-qcelemental/Makefile index 64f4711a1a06..663e0c4ee492 100644 --- a/science/py-qcelemental/Makefile +++ b/science/py-qcelemental/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.8:devel/py-importlib-m ${PYTHON_PKGNAMEPREFIX}ipykernel>0:devel/py-ipykernel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nglview>=3.0.3:science/py-nglview@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=24.1:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pint>=0.10.0:devel/py-pint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>=1.8.2:devel/py-pydantic2@${PY_FLAVOR} \ diff --git a/science/py-qiskit/Makefile b/science/py-qiskit/Makefile index 07b15e1a043c..1dbb8a659526 100644 --- a/science/py-qiskit/Makefile +++ b/science/py-qiskit/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BROKEN_i386= compilation fails: error[E0277]: the trait bound `u64: Index` is not satisfied, see https://codeberg.org/sarah-quinones/faer/issues/283 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-rust>0:devel/py-setuptools-rust@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}symengine>0.11:math/py-symengine@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rustworkx>=0.15.0:math/py-rustworkx@${PY_FLAVOR} \ diff --git a/science/py-qspin/Makefile b/science/py-qspin/Makefile index 452723a1eba0..42b10e6e9eb5 100644 --- a/science/py-qspin/Makefile +++ b/science/py-qspin/Makefile @@ -12,7 +12,7 @@ WWW= https://bitbucket.org/donald_gavel/qspin LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/science/py-quantities/Makefile b/science/py-quantities/Makefile index 5a8e9ce66c45..3dedb215ec6e 100644 --- a/science/py-quantities/Makefile +++ b/science/py-quantities/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/python-quantities/python-quantities LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest # tests fail to run, see https://github.com/python-quantities/python-quantities/issues/224 diff --git a/science/py-rmsd/Makefile b/science/py-rmsd/Makefile index 009c96d173ec..9dac8b5b3162 100644 --- a/science/py-rmsd/Makefile +++ b/science/py-rmsd/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/charnley/rmsd LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/science/py-scikit-fuzzy/Makefile b/science/py-scikit-fuzzy/Makefile index ddc1db228e46..f73ad18c4ada 100644 --- a/science/py-scikit-fuzzy/Makefile +++ b/science/py-scikit-fuzzy/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=1.9:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_SETUPTOOLS} \ diff --git a/science/py-scikit-learn/Makefile b/science/py-scikit-learn/Makefile index 5f6b4a043497..9c07669673f5 100644 --- a/science/py-scikit-learn/Makefile +++ b/science/py-scikit-learn/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}joblib>=1.3.0:devel/py-joblib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.10.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}threadpoolctl>=3.2.0:devel/py-threadpoolctl@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} diff --git a/science/py-scikit-sparse/Makefile b/science/py-scikit-sparse/Makefile index a4fba04fe3a0..3912e67fc906 100644 --- a/science/py-scikit-sparse/Makefile +++ b/science/py-scikit-sparse/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= libumfpack.so:math/suitesparse-umfpack \ libcholmod.so:math/suitesparse-cholmod -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.19:science/py-scipy@${PY_FLAVOR} USES= fortran python diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile index 7b127f899173..3dc8d4ddacfb 100644 --- a/science/py-scipy/Makefile +++ b/science/py-scipy/Makefile @@ -21,14 +21,14 @@ WWW= https://www.scipy.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pythran>=0:devel/py-pythran@${PY_FLAVOR} \ unzip>0:archivers/unzip LIB_DEPENDS= libblas.so:math/blas \ libopenblas.so:math/openblas -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pooch>0:devel/py-pooch@${PY_FLAVOR} \ diff --git a/science/py-scoria/Makefile b/science/py-scoria/Makefile index a659ffed8abc..4352ed8e61c2 100644 --- a/science/py-scoria/Makefile +++ b/science/py-scoria/Makefile @@ -11,7 +11,7 @@ WWW= https://git.durrantlab.pitt.edu/jdurrant/scoria LICENSE= APACHE20 -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/science/py-sdf/Makefile b/science/py-sdf/Makefile index 2d306975c06d..1874d7edfd05 100644 --- a/science/py-sdf/Makefile +++ b/science/py-sdf/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/nschloe/meshio LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}meshio>0:science/py-meshio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ diff --git a/science/py-seekpath/Makefile b/science/py-seekpath/Makefile index 7608706ca15c..d6ebac531bff 100644 --- a/science/py-seekpath/Makefile +++ b/science/py-seekpath/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.2<4:devel/py-flit-core@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spglib>=1.14.1:science/py-spglib@${PY_FLAVOR} USES= python diff --git a/science/py-segyio/Makefile b/science/py-segyio/Makefile index 433f9ec05792..eede8cd65602 100644 --- a/science/py-segyio/Makefile +++ b/science/py-segyio/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= cmake:devel/cmake-core \ ${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} LIB_DEPENDS= libsegyio.so:science/segyio -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++11-lang python USE_PYTHON= distutils autoplist pytest diff --git a/science/py-spglib/Makefile b/science/py-spglib/Makefile index eb1d06645afb..0b6ceb55c477 100644 --- a/science/py-spglib/Makefile +++ b/science/py-spglib/Makefile @@ -17,10 +17,10 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@$ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>0:devel/py-pyproject-metadata@${PY_FLAVOR} \ cmake:devel/cmake-core \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_SETUPTOOLS} LIB_DEPENDS= libsymspg.so:science/spglib -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.9.0:devel/py-typing-extensions@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-benchmark>0:devel/py-pytest-benchmark@${PY_FLAVOR} diff --git a/science/py-symfc/Makefile b/science/py-symfc/Makefile index 9b270920dce7..47d139ffec58 100644 --- a/science/py-symfc/Makefile +++ b/science/py-symfc/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spglib>0:science/py-spglib@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}phono3py>0:science/py-phono3py@${PY_FLAVOR} diff --git a/science/py-thewalrus/Makefile b/science/py-thewalrus/Makefile index b1d8fa760e11..bed094fb332a 100644 --- a/science/py-thewalrus/Makefile +++ b/science/py-thewalrus/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dask>0:devel/py-dask@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>0:devel/py-numba@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} diff --git a/science/py-trainstation/Makefile b/science/py-trainstation/Makefile index 5b286285b1e7..b7d64b57fc64 100644 --- a/science/py-trainstation/Makefile +++ b/science/py-trainstation/Makefile @@ -12,8 +12,8 @@ WWW= https://trainstation.materialsmodeling.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -xBUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} \ +xBUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} diff --git a/science/py-trx-python/Makefile b/science/py-trx-python/Makefile index 96490c4af9cc..abac4bdcec1a 100644 --- a/science/py-trx-python/Makefile +++ b/science/py-trx-python/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}deepdiff>0:devel/py-deepdiff@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nibabel>0:science/py-nibabel@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=19.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \ diff --git a/science/py-vedo/Makefile b/science/py-vedo/Makefile index e2d5879c6094..6e487091b1f9 100644 --- a/science/py-vedo/Makefile +++ b/science/py-vedo/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \ vtk${VTK_VER:R}>0:math/vtk${VTK_VER:R} \ bash:shells/bash diff --git a/science/py-veusz/Makefile b/science/py-veusz/Makefile index c53154e40a73..6813eaa3b099 100644 --- a/science/py-veusz/Makefile +++ b/science/py-veusz/Makefile @@ -13,9 +13,9 @@ WWW= https://veusz.github.io/ \ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= compiler:c++11-lang python pyqt:6 qt:6 shebangfix USE_GITHUB= yes diff --git a/science/pynn/Makefile b/science/pynn/Makefile index 00ae775ae60b..bdbef78a14ea 100644 --- a/science/pynn/Makefile +++ b/science/pynn/Makefile @@ -15,8 +15,8 @@ LICENSE_NAME= CeCILL Free Software License Version 2.0 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/science/qmcpack/Makefile b/science/qmcpack/Makefile index 3c5daa89e496..bfd7c9141a50 100644 --- a/science/qmcpack/Makefile +++ b/science/qmcpack/Makefile @@ -50,7 +50,7 @@ OPTIONS_SUB= yes NEXUS_DESC= Install Nexus (workflow utility) alongside QMCPACK NEXUS_CMAKE_BOOL= INSTALL_NEXUS -NEXUS_PY_DEPENDS= ${PYNUMPY} \ +NEXUS_PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyscf>0:science/py-pyscf@${PY_FLAVOR} diff --git a/science/rdkit/Makefile b/science/rdkit/Makefile index 4e9e7fb3afad..62246de7dc79 100644 --- a/science/rdkit/Makefile +++ b/science/rdkit/Makefile @@ -79,9 +79,9 @@ PGSQL_DESC= Build the PostgreSQL cartridge PGSQL_CMAKE_BOOL= RDK_BUILD_PGSQL PYTHON_CMAKE_BOOL= RDK_BUILD_PYTHON_WRAPPERS -PYTHON_BUILD_DEPENDS= ${PYNUMPY} +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} PYTHON_LIB_DEPENDS= ${PY_BOOST} -PYTHON_RUN_DEPENDS= ${PYNUMPY} \ +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} diff --git a/science/salome-kernel/Makefile b/science/salome-kernel/Makefile index f92ab9840d67..68465035eac5 100644 --- a/science/salome-kernel/Makefile +++ b/science/salome-kernel/Makefile @@ -12,7 +12,7 @@ WWW= https://www.salome-platform.org/ \ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}omniorb>0:devel/py-omniorb \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} diff --git a/science/siconos/Makefile b/science/siconos/Makefile index 587760c82cc4..6c36778ceaad 100644 --- a/science/siconos/Makefile +++ b/science/siconos/Makefile @@ -43,7 +43,7 @@ OPTIONS_SUB= yes PYTHON_CMAKE_BOOL= WITH_PYTHON_WRAPPER PYTHON_USES= python PYTHON_USES_OFF= python:build -PYTHON_PY_DEPENDS= ${PYNUMPY} \ +PYTHON_PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} PYTHON_BUILD_DEPENDS= ${PYTHON_PY_DEPENDS} \ swig:devel/swig diff --git a/science/smoldyn/Makefile b/science/smoldyn/Makefile index 55178cea9aca..a564917f61c0 100644 --- a/science/smoldyn/Makefile +++ b/science/smoldyn/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/License.txt LIB_DEPENDS= libtiff.so:graphics/tiff TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake:testing compiler:c++11-lang gl localbase:ldflags python:test tar:tgz shebangfix xorg USE_GL= gl glu glut diff --git a/science/tfel-edf/Makefile b/science/tfel-edf/Makefile index 3396673542ce..beaf3e6389bb 100644 --- a/science/tfel-edf/Makefile +++ b/science/tfel-edf/Makefile @@ -11,11 +11,11 @@ WWW= https://tfel.sourceforge.net/ LICENSE= GPLv3 BUILD_DEPENDS= gnuplot:math/gnuplot \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= ${PY_BOOST} \ libboost_thread.so:devel/boost-libs RUN_DEPENDS= gnuplot:math/gnuplot \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= cmake compiler:c++0x fortran localbase python diff --git a/science/tfel/Makefile b/science/tfel/Makefile index 6282e35a550c..6570b3866487 100644 --- a/science/tfel/Makefile +++ b/science/tfel/Makefile @@ -24,10 +24,10 @@ OPTIONS_DEFAULT= DOCS PYTHON OPTIONS_SUB= yes PYTHON_USES= localbase python -PYTHON_BUILD_DEPENDS= ${PYNUMPY} +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} PYTHON_LIB_DEPENDS= ${PY_BOOST} \ libboost_thread.so:devel/boost-libs -PYTHON_RUN_DEPENDS= ${PYNUMPY} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} PYTHON_CMAKE_BOOL= enable-python enable-python-bindings CMAKE_ON= enable-aster enable-calculix enable-fortran diff --git a/science/trilinos/Makefile b/science/trilinos/Makefile index bf02f46f6ed9..494f20183ea0 100644 --- a/science/trilinos/Makefile +++ b/science/trilinos/Makefile @@ -17,7 +17,7 @@ BROKEN_i386= kokkos assumes a 64-bit build; i.e., 8-byte pointers, but found 4-b BUILD_DEPENDS= bash:shells/bash \ boost-libs>0:devel/boost-libs \ swig:devel/swig \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libamd.so:math/suitesparse-amd \ libblas.so:math/blas \ liblapack.so:math/lapack \ diff --git a/science/ttk/Makefile b/science/ttk/Makefile index 42f9e12a5572..61fef2b9bb1a 100644 --- a/science/ttk/Makefile +++ b/science/ttk/Makefile @@ -11,7 +11,7 @@ WWW= https://topology-tool-kit.github.io \ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYNUMPY} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${LOCALBASE}/include/boost/functional/hash.hpp:devel/boost-libs \ diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile index 568055c2e784..f45195c8e860 100644 --- a/science/v_sim/Makefile +++ b/science/v_sim/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= libgdkglext-x11-1.0.so:x11-toolkits/gtkglext \ libmsym.so:science/libmsym \ libftgl.so:graphics/ftgl \ libxc.so:science/libxc -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ xcrysden:science/xcrysden \ libarchive>0:archivers/libarchive \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} diff --git a/science/vmd/Makefile b/science/vmd/Makefile index 6779f3de5c48..818ec2f3855d 100644 --- a/science/vmd/Makefile +++ b/science/vmd/Makefile @@ -22,11 +22,11 @@ LICENSE_COMB= multi ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= makedepend:devel/makedepend \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfltk.so:x11-toolkits/fltk \ libnetcdf.so:science/netcdf -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= gl gmake perl5 python shebangfix sqlite tcl tk xorg SHEBANG_FILES= ${WRKDIR}/plugins/topotools/*.tcl \ diff --git a/science/votca/Makefile b/science/votca/Makefile index 96a50a1b58e5..00c6a4de33b1 100644 --- a/science/votca/Makefile +++ b/science/votca/Makefile @@ -32,7 +32,7 @@ LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libsz.so:science/libaec \ libxc.so:science/libxc RUN_DEPENDS= bash:shells/bash \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_DEPENDS} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} diff --git a/science/wwplot/Makefile b/science/wwplot/Makefile index 36aa16a04c5f..78837d0f7e0c 100644 --- a/science/wwplot/Makefile +++ b/science/wwplot/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} \ qt6-base>0:devel/qt6-base PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyside6>0:devel/pyside6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} diff --git a/science/yoda/Makefile b/science/yoda/Makefile index 5e1c0e4dba01..19a7f8e064e8 100644 --- a/science/yoda/Makefile +++ b/science/yoda/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= bash:shells/bash \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} USES= compiler:c++11-lang gettext-runtime gmake libtool shebangfix diff --git a/textproc/py-gensim/Makefile b/textproc/py-gensim/Makefile index 3818d39dee30..18be9e023d90 100644 --- a/textproc/py-gensim/Makefile +++ b/textproc/py-gensim/Makefile @@ -13,9 +13,9 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.7.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}smart-open>=1.8.1:net/py-smart-open@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ diff --git a/textproc/py-langid/Makefile b/textproc/py-langid/Makefile index e02a82246e67..f6893cec77dd 100644 --- a/textproc/py-langid/Makefile +++ b/textproc/py-langid/Makefile @@ -11,8 +11,8 @@ WWW= https://github.com/saffsd/langid.py LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= saffsd diff --git a/textproc/py-pdf2docx/Makefile b/textproc/py-pdf2docx/Makefile index e6cdc0661e60..f95542682301 100644 --- a/textproc/py-pdf2docx/Makefile +++ b/textproc/py-pdf2docx/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fire>=0.3.0:devel/py-fire@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyMuPDF>=1.19.0:print/py-PyMuPDF@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fonttools>=4.24.0:print/py-fonttools@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-docx>=0.8.10:textproc/py-python-docx@${PY_FLAVOR} \ opencv>0:graphics/opencv BUILD_DEPENDS= ${PY_DEPENDS} \ diff --git a/textproc/py-python-lsp-server/Makefile b/textproc/py-python-lsp-server/Makefile index e0a571ce3be8..1ac4df951938 100644 --- a/textproc/py-python-lsp-server/Makefile +++ b/textproc/py-python-lsp-server/Makefile @@ -47,7 +47,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}rope>0:devel/py-rope@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}whatthepatch>0:textproc/py-whatthepatch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yapf>0:textproc/py-yapf@${PY_FLAVOR} \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} ### Test core dumps at # python_lsp_server-1.12.0/test/plugins/test_autoimport.py:l277ff diff --git a/textproc/py-rouge-score/Makefile b/textproc/py-rouge-score/Makefile index ac4dc84749b0..04345fefff6d 100644 --- a/textproc/py-rouge-score/Makefile +++ b/textproc/py-rouge-score/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}absl-py>=0:devel/py-absl-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nltk>=0:textproc/py-nltk@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} USES= python diff --git a/textproc/py-textdistance/Makefile b/textproc/py-textdistance/Makefile index f4d44f50aab1..6d37bf5e0016 100644 --- a/textproc/py-textdistance/Makefile +++ b/textproc/py-textdistance/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} diff --git a/textproc/py-wordcloud/Makefile b/textproc/py-wordcloud/Makefile index 770c7a5333e8..a3bff40986e9 100644 --- a/textproc/py-wordcloud/Makefile +++ b/textproc/py-wordcloud/Makefile @@ -11,12 +11,12 @@ WWW= https://amueller.github.io/word_cloud/ LICENSE= MIT -BUILD_DEPENDS= ${PYNUMPY} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} diff --git a/www/py-bokeh/Makefile b/www/py-bokeh/Makefile index 6ef2c8e6e2bf..cfc98e756c26 100644 --- a/www/py-bokeh/Makefile +++ b/www/py-bokeh/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=16.8:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.1:devel/py-python-dateutil@${PY_FLAVOR} \ ${PY_PILLOW} \ diff --git a/x11/py-xdot/Makefile b/x11/py-xdot/Makefile index db1744024166..7568297b2073 100644 --- a/x11/py-xdot/Makefile +++ b/x11/py-xdot/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= dot:graphics/graphviz \ - ${PYNUMPY} + ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} USES= gnome python USE_GNOME= cairo gtk30 pygobject3 |