diff --git a/archivers/py-bitshuffle/Makefile b/archivers/py-bitshuffle/Makefile index 6a8e459b2b6e..a2a718399901 100644 --- a/archivers/py-bitshuffle/Makefile +++ b/archivers/py-bitshuffle/Makefile @@ -13,11 +13,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h5py>=2.4.0:science/py-h5py@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h5py>=2.4.0:science/py-h5py@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.24:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.24:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0.7:devel/py-setuptools@${PY_FLAVOR} USES= pkgconfig python diff --git a/archivers/py-blosc2/Makefile b/archivers/py-blosc2/Makefile index c0f598548de2..ed8094412186 100644 --- a/archivers/py-blosc2/Makefile +++ b/archivers/py-blosc2/Makefile @@ -14,13 +14,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= c-blosc2>=2.21.3:archivers/c-blosc2 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0:devel/py-scikit-build-core@${PY_FLAVOR} LIB_DEPENDS= libblosc2.so:archivers/c-blosc2 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ndindex>=0:math/py-ndindex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numexpr>=2.14.1:math/py-numexpr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}py-cpuinfo>=0:sysutils/py-py-cpuinfo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile index ab4cce9b446b..ab19b7aadbd7 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-astlib/Makefile b/astro/py-astlib/Makefile index 3a818bd7736c..c0fe16f21bdc 100644 --- a/astro/py-astlib/Makefile +++ b/astro/py-astlib/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>=3.2,2:astro/py-astropy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.10:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.10:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.7:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/astro/py-astroML/Makefile b/astro/py-astroML/Makefile index b539c6b7745a..ec060be61123 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a09249f6d3fd..b0fbcbc099f3 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 29cdb6900064..4e64e6699ccf 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/astro/py-astropy/Makefile b/astro/py-astropy/Makefile index f0bfc0a3b867..58c0a71cd824 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}extension-helpers>=0:astro/py-extension-helpers@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-astroquery/Makefile b/astro/py-astroquery/Makefile index d19320e411ae..73088dad4a20 100644 --- a/astro/py-astroquery/Makefile +++ b/astro/py-astroquery/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>=5.0:astro/py-astropy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.8:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.999:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}keyring>=15.0:security/py-keyring@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.20:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.20:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyvo>=1.5:astro/py-pyvo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.19:www/py-requests@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fsspec>=0:filesystems/py-fsspec@${PY_FLAVOR} \ diff --git a/astro/py-fitsio/Makefile b/astro/py-fitsio/Makefile index dca6dd6862a2..39b4cd1b68c2 100644 --- a/astro/py-fitsio/Makefile +++ b/astro/py-fitsio/Makefile @@ -12,12 +12,12 @@ WWW= https://github.com/esheldon/fitsio LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.7:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.7:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libcfitsio.so:astro/cfitsio -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.7:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.7:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/astro/py-jplephem/Makefile b/astro/py-jplephem/Makefile index cdb986532a97..647ad48c120d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} #USE_GITHUB= yes #GH_ACCOUNT= brandon-rhodes diff --git a/astro/py-metpy/Makefile b/astro/py-metpy/Makefile index c1d44d6d5dde..c58e12ba42f7 100644 --- a/astro/py-metpy/Makefile +++ b/astro/py-metpy/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FL ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.5.0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.20.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.20.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.4.0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pint>=0.17:devel/py-pint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pooch>=1.2.0:devel/py-pooch@${PY_FLAVOR} \ diff --git a/astro/py-pyerfa/Makefile b/astro/py-pyerfa/Makefile index 06ce42e74c6c..55dfb8b5a916 100644 --- a/astro/py-pyerfa/Makefile +++ b/astro/py-pyerfa/Makefile @@ -1,6 +1,5 @@ PORTNAME= pyerfa -DISTVERSION= 2.0.0.3 -PORTREVISION= 3 +DISTVERSION= 2.0.1.5 CATEGORIES= astro python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,13 +11,14 @@ WWW= https://github.com/liberfa/pyerfa LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.17.0:math/py-numpy1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.17.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.17.0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.17.0:math/py-numpy@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist pep517 .include diff --git a/astro/py-pyerfa/distinfo b/astro/py-pyerfa/distinfo index 78990bacbf6c..edeb03d6f59f 100644 --- a/astro/py-pyerfa/distinfo +++ b/astro/py-pyerfa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679755711 -SHA256 (pyerfa-2.0.0.3.tar.gz) = d77fbbfa58350c194ccb99e5d93aa05d3c2b14d5aad8b662d93c6ad9fff41f39 -SIZE (pyerfa-2.0.0.3.tar.gz) = 813912 +TIMESTAMP = 1775906683 +SHA256 (pyerfa-2.0.1.5.tar.gz) = 17d6b24fe4846c65d5e7d8c362dcb08199dc63b30a236aedd73875cc83e1f6c0 +SIZE (pyerfa-2.0.1.5.tar.gz) = 818430 diff --git a/astro/py-pykep/Makefile b/astro/py-pykep/Makefile index f7b2a56cebe7..b3542bf8df30 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 bfb172a15a4d..c1a1f01ca4c1 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python NO_ARCH= yes diff --git a/astro/py-pysolar/Makefile b/astro/py-pysolar/Makefile index ff5083c63b1a..3936ada40654 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/astro/py-ro/Makefile b/astro/py-ro/Makefile index 584f4e934178..abeb54a8ac5c 100644 --- a/astro/py-ro/Makefile +++ b/astro/py-ro/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/docs/License.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/astro/py-skyfield/Makefile b/astro/py-skyfield/Makefile index 4a69d2b791bf..72a7dbaaeb38 100644 --- a/astro/py-skyfield/Makefile +++ b/astro/py-skyfield/Makefile @@ -11,11 +11,11 @@ WWW= https://rhodesmill.org/skyfield/ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 2918fa9b7fdf..4eab69473520 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 70b84e7ebf32..c7677ec60f1c 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f74afd8df38d..084d0e390263 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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/beets/Makefile b/audio/beets/Makefile index 01f7b12c8e44..e4ba2114b88d 100644 --- a/audio/beets/Makefile +++ b/audio/beets/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}confuse>=1.0.0:devel/py-confuse@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}munkres>=1.0.0:math/py-munkres@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mutagen>=1.45:audio/py-mutagen@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=0:devel/py-platformdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:audio/py-pyacoustid@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \ diff --git a/audio/moodbar/Makefile b/audio/moodbar/Makefile index 2000bf0e49bf..f34fa48e5994 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 13f6bb67e371..a9616a139f94 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PREFIX}/lib/libsndfile.so:audio/libsndfile USES= python diff --git a/audio/py-aubio/Makefile b/audio/py-aubio/Makefile index 8f5d2f9d9f13..2b3ca8494901 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= sox:audio/sox USES+= python diff --git a/audio/py-auditok/Makefile b/audio/py-auditok/Makefile index 9aee953ed282..66abd25a248e 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 889cfaaa3288..d9492220c58f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} LIB_DEPENDS= libessentia.so:audio/essentia -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a8733aaa24da..e5fbf56f6c0b 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 7398438cce3e..ddb0abb96e53 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d36158691783..2b4394fe991e 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} LIB_DEPENDS= libsndfile.so:audio/libsndfile -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python localbase USE_PYTHON= distutils autoplist cython pytest diff --git a/audio/py-resampy/Makefile b/audio/py-resampy/Makefile index 3dfe00405714..d0eab9a2def5 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/audio/py-samplerate/Makefile b/audio/py-samplerate/Makefile index 344d282664c4..290150ea490d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 db3a16630021..42188e8ce13f 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ portaudio>0:audio/portaudio USES= python diff --git a/audio/py-soxr/Makefile b/audio/py-soxr/Makefile index c256da2c7dfe..1ba87ecc6102 100644 --- a/audio/py-soxr/Makefile +++ b/audio/py-soxr/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nanobind>0:devel/py-nanobind@${PY_FLAVOR} ${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}SoundFile>0:audio/py-SoundFile@${PY_FLAVOR} diff --git a/audio/py-wavio/Makefile b/audio/py-wavio/Makefile index 08251ee41e98..bc4e2feeca54 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/benchmarks/py-asv/Makefile b/benchmarks/py-asv/Makefile index 49169a234cf5..97f971bd425b 100644 --- a/benchmarks/py-asv/Makefile +++ b/benchmarks/py-asv/Makefile @@ -29,7 +29,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_F ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>=10.0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}selenium>0:www/py-selenium@${PY_FLAVOR} \ diff --git a/biology/groopm/Makefile b/biology/groopm/Makefile index 0d64d547a841..99ce1d94ee80 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 866f357313fb..9871f88299a0 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 5e1750a708c9..9ea26e874cc9 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} PY_EXTRA= ${PYTHON_PKGNAMEPREFIX}python-libsbml>0:biology/py-python-libsbml@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c73a91796140..4e9443d913ef 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1c81dea53bd7..bc19989a2af0 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/biology/py-biosig/Makefile b/biology/py-biosig/Makefile index 79dd6be9e5d1..2f9330503ebb 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 329032d640ef..8d085e4fada7 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 e83d82db1e00..b5b8cdda296d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 528ce2f79082..be3937b7bed1 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 904793dab0e8..6f981e5cdd11 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d057c5e18783..2c54a66af31d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysam>0:biology/py-pysam@${PY_FLAVOR} RUN_DEPENDS= ${PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 b059cd0a64e4..a4147a95f79b 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 3114c6dd2fd0..d3fcac461251 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 99cc072bf654..ad236e1202ac 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +COMMON_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a97aad8ff9b0..1d3563fe65be 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist diff --git a/biology/py-multiqc/Makefile b/biology/py-multiqc/Makefile index 2bbf2609bd76..a65d1c5974e0 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d667f0e94b64..760b1924351f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 ec4fc77c30a2..c3f50991e9c8 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c3de41cee3a3..b7b0ec8cd791 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 7d0dfb3d302d..12620ab62a5c 100644 --- a/biology/pyfasta/Makefile +++ b/biology/pyfasta/Makefile @@ -11,7 +11,7 @@ WWW= https://bitbucket.org/brentp/biostuff/src/ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index f50a355045ae..26b00ffcbfd1 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -17,7 +17,7 @@ WWW= https://www.openscad.org/ BUILD_DEPENDS= cgal>0:math/cgal \ evdev-proto>0:devel/evdev-proto \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libzip.so:archivers/libzip \ libhidapi.so:comms/hidapi \ diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile index 16f3e65cdad3..6da55245bf7d 100644 --- a/cad/openscad/Makefile +++ b/cad/openscad/Makefile @@ -16,7 +16,7 @@ WWW= https://www.openscad.org/ BUILD_DEPENDS= cgal>0:math/cgal \ evdev-proto>0:devel/evdev-proto \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libzip.so:archivers/libzip \ libhidapi.so:comms/hidapi \ diff --git a/cad/py-gdspy/Makefile b/cad/py-gdspy/Makefile index 125b396570f1..122bba32b0c4 100644 --- a/cad/py-gdspy/Makefile +++ b/cad/py-gdspy/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/heitzmann/gdspy/ LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= pytest:devel/py-pytest@${PY_FLAVOR} USES= python diff --git a/cad/py-gdstk/Makefile b/cad/py-gdstk/Makefile index 884315df6162..5557708e148d 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= compiler:c++17-lang python USE_PYTHON= autoplist pep517 pytest diff --git a/cad/py-lcapy/Makefile b/cad/py-lcapy/Makefile index 01e64949af36..b49f587b4b86 100644 --- a/cad/py-lcapy/Makefile +++ b/cad/py-lcapy/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/mph-/lcapy LICENSE= LGPL21 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} diff --git a/cad/py-pyfda/Makefile b/cad/py-pyfda/Makefile index ca53e86b42db..ca54f50a8e6f 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 946ca82dddf4..d36e05db0a1b 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/cad/xyce/Makefile b/cad/xyce/Makefile index 8c0994241de4..6bc111b43c04 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 85423ea84f27..9903b6329188 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 4453704206e4..04a6758d5aa4 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 06ca2b1500a9..0b51740518e1 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -10,7 +10,7 @@ WWW= https://www.gnuradio.org/ LICENSE= GPLv3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 8d78c750d5fe..be158e0c4b85 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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/py-ModbusTCP/Makefile b/comms/py-ModbusTCP/Makefile index 6bc3e3527b11..b1a44e9a6930 100644 --- a/comms/py-ModbusTCP/Makefile +++ b/comms/py-ModbusTCP/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/sourceperl/pyModbusTCP LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16.0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile index 9c9a7ef42b89..868340d55b11 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 2fb065a1f8cf..028570a9a618 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= ${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_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} # see https://issues.apache.org/jira/browse/ARROW-16820 +#PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 668c4291a5ea..eb2a736e1f43 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 3f6406639e09..502179d4aa19 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-fastparquet/Makefile b/databases/py-fastparquet/Makefile index 987cf8c37e0e..7f8d0fd16775 100644 --- a/databases/py-fastparquet/Makefile +++ b/databases/py-fastparquet/Makefile @@ -12,14 +12,14 @@ WWW= https://github.com/dask/fastparquet LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ thrift:devel/thrift RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cramjam>=2.3:archivers/py-cramjam@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fsspec>=0:filesystems/py-fsspec@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0,1:math/py-pandas@${PY_FLAVOR} diff --git a/databases/py-pyarrow/Makefile b/databases/py-pyarrow/Makefile index 86fc0637d17a..9f183a90260d 100644 --- a/databases/py-pyarrow/Makefile +++ b/databases/py-pyarrow/Makefile @@ -12,7 +12,7 @@ WWW= https://arrow.apache.org/ \ LICENSE= APACHE20 BUILD_DEPENDS= arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/arrow \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.25:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.25:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} diff --git a/databases/py-qdrant-client/Makefile b/databases/py-qdrant-client/Makefile index b3fd2b2efad4..4efcc5535419 100644 --- a/databases/py-qdrant-client/Makefile +++ b/databases/py-qdrant-client/Makefile @@ -15,7 +15,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grpcio>0:devel/py-grpcio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httpx>0:www/py-httpx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}portalocker>0:devel/py-portalocker@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>0:devel/py-pydantic2@${PY_FLAVOR} \ diff --git a/databases/py-redisvl/Makefile b/databases/py-redisvl/Makefile index 1cfef5f644fb..8961a8ae4a5f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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/databases/py-tiledb/Makefile b/databases/py-tiledb/Makefile index ac44df31aeac..696451e482f6 100644 --- a/databases/py-tiledb/Makefile +++ b/databases/py-tiledb/Makefile @@ -14,13 +14,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= error: static assertion failed due to requirement 'sizeof(unsigned long long) <= sizeof(int)': Implicit narrowing is not permitted. -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.25:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.25:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>=0:devel/py-pybind11@${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} \ tiledb>=2.30.1:databases/tiledb LIB_DEPENDS= libtiledb.so:databases/tiledb -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.25:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.25:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} USES= cmake:indirect compiler:c++17-lang localbase python diff --git a/devel/boost-mpi-libs/Makefile b/devel/boost-mpi-libs/Makefile index 1d10499c2181..298d42be9e07 100644 --- a/devel/boost-mpi-libs/Makefile +++ b/devel/boost-mpi-libs/Makefile @@ -11,7 +11,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE_1_0.txt PATCHDIR= ${.CURDIR:H}/boost-libs/files BUILD_DEPENDS= bjam:devel/boost-jam \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ ${PY_BOOST} diff --git a/devel/boost-python-libs/Makefile b/devel/boost-python-libs/Makefile index 95198c675bda..5f1b1822ca6b 100644 --- a/devel/boost-python-libs/Makefile +++ b/devel/boost-python-libs/Makefile @@ -10,7 +10,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE_1_0.txt PATCHDIR= ${.CURDIR:H}/boost-libs/files BUILD_DEPENDS= bjam:devel/boost-jam \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libboost_container.so:devel/boost-libs diff --git a/devel/cpp2py/Makefile b/devel/cpp2py/Makefile index 7e8bb48a03ee..2fe96f60e9f8 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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/nanobind/Makefile b/devel/nanobind/Makefile index adce258b19dc..fffc983c9e56 100644 --- a/devel/nanobind/Makefile +++ b/devel/nanobind/Makefile @@ -17,7 +17,7 @@ TEST_DEPENDS= eigen>0:math/eigen3 \ gmake:devel/gmake \ pytest:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jax>0:math/py-jax@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} # ${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVORA} # tensorflow tests crash the python process diff --git a/devel/py-aiortc/Makefile b/devel/py-aiortc/Makefile index 8c85af2f009e..5fe6593a0cbf 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-anndata/Makefile b/devel/py-anndata/Makefile index 5a20c3e973b3..f70dd52008f5 100644 --- a/devel/py-anndata/Makefile +++ b/devel/py-anndata/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}array-api-compat>=1.7.1:devel/py-array-api-c ${PYTHON_PKGNAMEPREFIX}h5py>=3.8:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}legacy-api-wrap>=0:devel/py-legacy-api-wrap@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}natsort>=0:devel/py-natsort@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=24.2:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2.1.0,1<3,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pooch>=0:devel/py-pooch@${PY_FLAVOR} \ diff --git a/devel/py-array-api-compat/Makefile b/devel/py-array-api-compat/Makefile index 1e9a3d90c600..b20e65435b8f 100644 --- a/devel/py-array-api-compat/Makefile +++ b/devel/py-array-api-compat/Makefile @@ -29,7 +29,7 @@ DASK_DESC= Dask array support SPARSE_DESC= Sparse array support DASK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dask>=2024.9.0:devel/py-dask@${PY_FLAVOR} -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22:math/py-numpy1@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.22:math/py-numpy@${PY_FLAVOR} SPARSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sparse>=0.15.1:devel/py-sparse@${PY_FLAVOR} .include diff --git a/devel/py-array-api-strict/Makefile b/devel/py-array-api-strict/Makefile index 734e25ed7938..276e81071517 100644 --- a/devel/py-array-api-strict/Makefile +++ b/devel/py-array-api-strict/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>8:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} USES= python diff --git a/devel/py-asteval/Makefile b/devel/py-asteval/Makefile index 354934a939ee..a779eef9d3a9 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/devel/py-autoray/Makefile b/devel/py-autoray/Makefile index 1d7db4a57b7e..d1164ed3a6b7 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 fc704711721f..59f984119ac4 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1db4b8c512b8..9357bed3c968 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 6b212dabb7c8..915ff70f152b 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/devel/py-cftime/Makefile b/devel/py-cftime/Makefile index 5c0106366331..1c044f89999c 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-cgen/Makefile b/devel/py-cgen/Makefile index 06912cec68f4..c4c9df894f07 100644 --- a/devel/py-cgen/Makefile +++ b/devel/py-cgen/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.6:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.6:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytools>=2022.1.14:devel/py-pytools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.5:devel/py-typing-extensions@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ruff>0:devel/py-ruff@${PY_FLAVOR} diff --git a/devel/py-cloudpickle/Makefile b/devel/py-cloudpickle/Makefile index c9fd9199ab1f..8a3bbca56f4a 100644 --- a/devel/py-cloudpickle/Makefile +++ b/devel/py-cloudpickle/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=0:devel/py-flit-core@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} diff --git a/devel/py-colorspacious/Makefile b/devel/py-colorspacious/Makefile index 6765c72e3875..bd4b799418d2 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/devel/py-crick/Makefile b/devel/py-crick/Makefile index 114372a49473..dae6b14b9a1f 100644 --- a/devel/py-crick/Makefile +++ b/devel/py-crick/Makefile @@ -11,7 +11,7 @@ WWW= https://github.com/dask/crick LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}versioneer>=0:devel/py-versioneer@${PY_FLAVOR} \ diff --git a/devel/py-dask/Makefile b/devel/py-dask/Makefile index 799a685853b2..801e9291ec68 100644 --- a/devel/py-dask/Makefile +++ b/devel/py-dask/Makefile @@ -43,7 +43,7 @@ DATAFRAME_DESC= Composed of many smaller Pandas DataFrames DATAFRAME_IMPLIES= ARRAY DIAGNOSTICS_DESC= Profile and inspect parallel codes -ARRAY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.24:math/py-numpy1@${PY_FLAVOR} +ARRAY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.24:math/py-numpy@${PY_FLAVOR} DATAFRAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=2.0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyarrow>=16.0:databases/py-pyarrow@${PY_FLAVOR} DIAGNOSTICS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}bokeh>=3.1.0:www/py-bokeh@${PY_FLAVOR} \ diff --git a/devel/py-dataclass-array/Makefile b/devel/py-dataclass-array/Makefile index cf198de8c000..c0d1cd6152d8 100644 --- a/devel/py-dataclass-array/Makefile +++ b/devel/py-dataclass-array/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.8<4:devel/py-flit-core@${PY_F RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}einops>=0:misc/py-einops@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}etils>=0:devel/py-etils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lark>=0:devel/py-lark@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} USES= python:3.11+ diff --git a/devel/py-datatest/Makefile b/devel/py-datatest/Makefile index cf8e14295e2f..11e587e33ea0 100644 --- a/devel/py-datatest/Makefile +++ b/devel/py-datatest/Makefile @@ -23,7 +23,7 @@ OPTIONS_DEFINE= OPTIONAL OPTIONAL_DESC= Optional dependencies OPTIONAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbfread>=0:textproc/py-dbfread@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}squint>=0:databases/py-squint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xlrd>=0:textproc/py-xlrd@${PY_FLAVOR} diff --git a/devel/py-devtools/Makefile b/devel/py-devtools/Makefile index 7116b61e35d9..f5ffe10156e8 100644 --- a/devel/py-devtools/Makefile +++ b/devel/py-devtools/Makefile @@ -20,7 +20,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asyncpg>=0:databases/py-asyncpg@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}black>=0:devel/py-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}multidict>=0:www/py-multidict@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>=0:devel/py-pydantic2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-pretty>=0:devel/py-pytest-pretty@${PY_FLAVOR} \ diff --git a/devel/py-etils/Makefile b/devel/py-etils/Makefile index a83e81e17625..c95efea0fedd 100644 --- a/devel/py-etils/Makefile +++ b/devel/py-etils/Makefile @@ -48,11 +48,11 @@ EAPP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}absl-py>=0:devel/py-absl-py@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}simple-parsing>=0:devel/py-simple-parsing@${PY_FLAVOR} ECOLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter>=0:devel/py-jupyter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mediapy>=0:devel/py-mediapy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=0,1:devel/py-protobuf@${PY_FLAVOR} ENP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}einops>=0:misc/py-einops@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} EPATH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fsspec>=0:filesystems/py-fsspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-resources>=0:devel/py-importlib-resources@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} \ diff --git a/devel/py-ewah-bool-utils/Makefile b/devel/py-ewah-bool-utils/Makefile index 0c72c4030fdf..885938426ef5 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist cython pep517 pytest diff --git a/devel/py-fastf1/Makefile b/devel/py-fastf1/Makefile index 05f4ffb1a3c5..ce82ea5500fc 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-flatbuffers/Makefile b/devel/py-flatbuffers/Makefile index f7a5d3b60c1a..943fc766e8ac 100644 --- a/devel/py-flatbuffers/Makefile +++ b/devel/py-flatbuffers/Makefile @@ -32,6 +32,6 @@ GH_ACCOUNT= google OPTIONS_DEFINE= NUMPY NUMPY_DESC= Support scalar vectors as numpy arrays -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} .include diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile index a8cb77c59978..9170efeba3e1 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat USES= compiler:c11 jpeg localbase pkgconfig python sdl xorg diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile index 94fa4acbc460..24664935480e 100644 --- a/devel/py-hypothesis/Makefile +++ b/devel/py-hypothesis/Makefile @@ -52,7 +52,7 @@ DJANGO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=4.2:www/py-django42@${PY_FL DPCONTRACTS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dpcontracts>=0.4:devel/py-dpcontracts@${PY_FLAVOR} GHOSTWRITER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}black>=20.8b0:devel/py-black@${PY_FLAVOR} LARK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lark>=0.10.1:devel/py-lark@${PY_FLAVOR} -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.21.6:math/py-numpy1@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.21.6:math/py-numpy@${PY_FLAVOR} PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=1.1,1:math/py-pandas@${PY_FLAVOR} PYTEST_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.6,1:devel/py-pytest@${PY_FLAVOR} PYTZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=2014.1,1:devel/py-pytz@${PY_FLAVOR} diff --git a/devel/py-ipydatawidgets/Makefile b/devel/py-ipydatawidgets/Makefile index b60819dbf19d..39d39599fea7 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 b64720e8d0e4..a1db8535a8e3 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-ipyparallel/Makefile b/devel/py-ipyparallel/Makefile index 733f9854e411..5e421311105e 100644 --- a/devel/py-ipyparallel/Makefile +++ b/devel/py-ipyparallel/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}tqdm>=0:misc/py-tqdm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traitlets>=5:devel/py-traitlets@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${PY_FLAVOR} diff --git a/devel/py-jaxtyping/Makefile b/devel/py-jaxtyping/Makefile index 21682c072b9b..3665156fb3ec 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 aafbca85b38c..a2e25faf406f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +NUMPY_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d5734c3a3e8c..ac6aafb1ef32 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 9e1dc430deea..b21d1f585d64 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}\ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 6e6472086626..c676353e19e5 100644 --- a/devel/py-jupyter-rfb/Makefile +++ b/devel/py-jupyter-rfb/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>0:devel/py-flit-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}anywidget>0:devel/py-anywidget@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipywidgets>=7.6.0:devel/py-ipywidgets@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}simplejpeg>0:graphics/py-simplejpeg@${PY_FLAVOR} diff --git a/devel/py-lap/Makefile b/devel/py-lap/Makefile index bd74c58a92e8..23964cd2a55e 100644 --- a/devel/py-lap/Makefile +++ b/devel/py-lap/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils optsuffix diff --git a/devel/py-mediapy/Makefile b/devel/py-mediapy/Makefile index d8354904f12c..644ec4103818 100644 --- a/devel/py-mediapy/Makefile +++ b/devel/py-mediapy/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.5<4:devel/py-flit-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} USES= python diff --git a/devel/py-monty/Makefile b/devel/py-monty/Makefile index 4c651d1fa7ef..21d2766e9c04 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-mystic/Makefile b/devel/py-mystic/Makefile index 970ad79566cf..c6d495db39be 100644 --- a/devel/py-mystic/Makefile +++ b/devel/py-mystic/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FL RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dill>=0.4.1:devel/py-dill@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}klepto>=0.2.8:devel/py-klepto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>=0.6.7:math/py-sympy@${PY_FLAVOR} USES= python diff --git a/devel/py-numba/Makefile b/devel/py-numba/Makefile index b5bffefa1742..20ab419a8441 100644 --- a/devel/py-numba/Makefile +++ b/devel/py-numba/Makefile @@ -17,12 +17,12 @@ BROKEN= requires OpenMP support that is missing on this architecture # numpy version is checked at runtime # https://github.com/numba/numba/blob/main/numba/__init__.py#L13 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22<2.5:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.22<2.5,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libtbb.so:devel/onetbb RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.46.0:devel/py-llvmlite@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22<2.5:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.22<2.5,1:math/py-numpy@${PY_FLAVOR} \ USES= compiler:c++11-lang python fortran localbase USE_PYTHON= pep517 concurrent autoplist unittest diff --git a/devel/py-orjson/Makefile b/devel/py-orjson/Makefile index d3f08e8507d2..25b2bf5330d8 100644 --- a/devel/py-orjson/Makefile +++ b/devel/py-orjson/Makefile @@ -19,7 +19,7 @@ LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>=1<2:devel/py-maturin@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pendulum>0:devel/py-pendulum@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ diff --git a/devel/py-ormsgpack/Makefile b/devel/py-ormsgpack/Makefile index 2b2ffc59c695..bc1270789f43 100644 --- a/devel/py-ormsgpack/Makefile +++ b/devel/py-ormsgpack/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>=1.0:devel/py-maturin@${PY_FLAVOR} gmake:devel/gmake TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mypy>0:devel/py-mypy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pendulum>0:devel/py-pendulum@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>0:devel/py-pydantic2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ diff --git a/devel/py-pint/Makefile b/devel/py-pint/Makefile index 45f95c7abd56..21da562ce7d0 100644 --- a/devel/py-pint/Makefile +++ b/devel/py-pint/Makefile @@ -28,7 +28,7 @@ OPTIONS_DEFINE= NUMPY UNCERTAINTIES NUMPY_DESC= Automatic conversion of units UNCERTAINTIES_DESC= Handle quantities with uncertainties -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.19.5:math/py-numpy1@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.19.5:math/py-numpy@${PY_FLAVOR} UNCERTAINTIES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}uncertainties>=3.1.6:math/py-uncertainties@${PY_FLAVOR} .include diff --git a/devel/py-pycocotools/Makefile b/devel/py-pycocotools/Makefile index cbcd979e9578..98aca96e6778 100644 --- a/devel/py-pycocotools/Makefile +++ b/devel/py-pycocotools/Makefile @@ -11,10 +11,10 @@ WWW= https://github.com/ppwwyyxx/cocoapi/tree/master/PythonAPI LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=43.0.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent cython pep517 diff --git a/devel/py-pycompilation/Makefile b/devel/py-pycompilation/Makefile index f132e87c173c..6a0799a117df 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} USES= python diff --git a/devel/py-pyina/Makefile b/devel/py-pyina/Makefile index 09191ecad3a4..8d46e3e9e99e 100644 --- a/devel/py-pyina/Makefile +++ b/devel/py-pyina/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FL ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dill>=0.4.1:devel/py-dill@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mpi4py>=1.3:net/py-mpi4py@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pathos>=0.3.5:devel/py-pathos@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pox>=0.3.7:devel/py-pox@${PY_FLAVOR} diff --git a/devel/py-pykdtree/Makefile b/devel/py-pykdtree/Makefile index ffdc72598257..7e8ee3823fde 100644 --- a/devel/py-pykdtree/Makefile +++ b/devel/py-pykdtree/Makefile @@ -12,10 +12,10 @@ WWW= https://github.com/storpipfugl/pykdtree LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent cython pep517 diff --git a/devel/py-pyopencl/Makefile b/devel/py-pyopencl/Makefile index 190733470f44..bf7448932b66 100644 --- a/devel/py-pyopencl/Makefile +++ b/devel/py-pyopencl/Makefile @@ -16,13 +16,13 @@ BUILD_DEPENDS= ${LOCALBASE}/include/CL/cl.h:devel/opencl \ ${PYTHON_PKGNAMEPREFIX}pybind11>=0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= ${PY_BOOST} \ libOpenCL.so:devel/ocl-icd RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>=0.3.6:textproc/py-mako@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytools>=2017.6:devel/py-pytools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} diff --git a/devel/py-pyquil/Makefile b/devel/py-pyquil/Makefile index 0527b2993611..d6951b1192c9 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a7e9f65a53da..ed2c09062792 100644 --- a/devel/py-pysimdjson/Makefile +++ b/devel/py-pysimdjson/Makefile @@ -11,7 +11,7 @@ WWW= https://pysimdjson.tkte.ch/ LICENSE= MIT -#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 92df124a5321..bd63d05f5dee 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=4.6:devel/py-pytest@${PY_FLAVOR} USES= python diff --git a/devel/py-pytest-lazy-fixture/Makefile b/devel/py-pytest-lazy-fixture/Makefile index d3441e93127e..52db4890deb6 100644 --- a/devel/py-pytest-lazy-fixture/Makefile +++ b/devel/py-pytest-lazy-fixture/Makefile @@ -15,7 +15,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= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.5:devel/py-pytest@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 pytest diff --git a/devel/py-pytest-regressions/Makefile b/devel/py-pytest-regressions/Makefile index 439cc9122661..d884ebcf338f 100644 --- a/devel/py-pytest-regressions/Makefile +++ b/devel/py-pytest-regressions/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=6.2.0,1:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-datadir>=1.2.0:devel/py-pytest-datadir@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} USES= python @@ -33,11 +33,11 @@ DATAFRAME_DESC= Pandas dataframe regression IMAGE_DESC= Image objects regression NUM_DESC= Numeric data regression -DATAFRAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +DATAFRAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} -IMAGE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +IMAGE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} -NUM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +NUM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} .include diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile index 3e900d60a5e6..339db938e6cd 100644 --- a/devel/py-pytest/Makefile +++ b/devel/py-pytest/Makefile @@ -30,7 +30,7 @@ TEST_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.56:devel/py-hypothesis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.7.2:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=2.1.0,1:devel/py-pytest-xdist@${PY_FLAVOR} \ diff --git a/devel/py-pythran/Makefile b/devel/py-pythran/Makefile index 224aff79a90d..0fb63e3853d8 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-pytools/Makefile b/devel/py-pytools/Makefile index eedca1040727..98e840319a9c 100644 --- a/devel/py-pytools/Makefile +++ b/devel/py-pytools/Makefile @@ -15,7 +15,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= ${PYTHON_PKGNAMEPREFIX}platformdirs>=2.2.0:devel/py-platformdirs@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.6.0:math/py-numpy1@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 pytest @@ -24,7 +24,7 @@ NO_ARCH= yes OPTIONS_DEFINE= NUMPY -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.6.0:math/py-numpy1@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.0:math/py-numpy@${PY_FLAVOR} .include diff --git a/devel/py-qcs-sdk-python/Makefile b/devel/py-qcs-sdk-python/Makefile index 6e8870e74681..7d17ed2ab5d5 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= cargo python USE_PYTHON= pep517 autoplist diff --git a/devel/py-qutip-qip/Makefile b/devel/py-qutip-qip/Makefile index fe7155ac956c..0ac2f9d6fcd6 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f7cf185518f0..2795270bf110 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1bd99f563cbf..33c7e0d8b7be 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 8199be90991b..ed329ae96a03 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-scikit-base/Makefile b/devel/py-scikit-base/Makefile index 2df6e841e4d5..63a6ec1b0115 100644 --- a/devel/py-scikit-base/Makefile +++ b/devel/py-scikit-base/Makefile @@ -27,7 +27,7 @@ NO_ARCH= yes OPTIONS_DEFINE= ALL ALL_DESC= All optional dependencies -ALL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +ALL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} .include diff --git a/devel/py-scikit-build-core/Makefile b/devel/py-scikit-build-core/Makefile index 06bcadbd9d4c..aa2108dde3b5 100644 --- a/devel/py-scikit-build-core/Makefile +++ b/devel/py-scikit-build-core/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${PY_EXCEPTIONGROUP} \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=0.8:devel/py-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cattrs>=22.2.0:devel/py-cattrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fastjsonschema>0:devel/py-fastjsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=23:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>=2.11:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-subprocess>=1.5:devel/py-pytest-subprocess@${PY_FLAVOR} \ diff --git a/devel/py-shapely/Makefile b/devel/py-shapely/Makefile index b82f1bda133f..c6103500cc11 100644 --- a/devel/py-shapely/Makefile +++ b/devel/py-shapely/Makefile @@ -14,11 +14,11 @@ WWW= https://shapely.readthedocs.io/en/stable/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.25<3:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.25<3,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libgeos_c.so:graphics/geos -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.21:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.21:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} USES= python diff --git a/devel/py-sparse/Makefile b/devel/py-sparse/Makefile index 615d832f0e5b..ccaacebd633c 100644 --- a/devel/py-sparse/Makefile +++ b/devel/py-sparse/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FL ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numba>=0.49:devel/py-numba@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.17:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.17:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/devel/py-spyder-kernels/Makefile b/devel/py-spyder-kernels/Makefile index 30b984938fa5..59fa552a3226 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 2c59faf2a392..2f25be1d3956 100644 --- a/devel/py-tables/Makefile +++ b/devel/py-tables/Makefile @@ -11,7 +11,7 @@ WWW= https://www.pytables.org/ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1ecf371a8ca9..e40f1cf1fb33 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-thinc/Makefile b/devel/py-thinc/Makefile index 5f54d02f0a42..ae4e00108498 100644 --- a/devel/py-thinc/Makefile +++ b/devel/py-thinc/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blis>=1.0.0<1.4.0:math/py-blis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cymem>=2.0.2<2.1.0:devel/py-cymem@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}murmurhash>=0.28.0<1.1.0:devel/py-murmurhash@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0<3.0.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0<3.0.0,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}preshed3>=3.0.2<3.1.0:devel/py-preshed3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} @@ -26,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blis>=1.0.0<1.4.0:math/py-blis@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}confection>=0.0.1<1.0.0:devel/py-confection@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cymem>=2.0.2<2.1.0:devel/py-cymem@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}murmurhash>=0.28.0<1.1.0:devel/py-murmurhash@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0<3.0.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0<3.0.0,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}preshed3>=3.0.2<3.1.0:devel/py-preshed3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>=1.7.4<3.0.0:devel/py-pydantic2@${PY_FLAVOR} \ diff --git a/devel/py-thinc8/Makefile b/devel/py-thinc8/Makefile index d91040fa6571..f405293a1984 100644 --- a/devel/py-thinc8/Makefile +++ b/devel/py-thinc8/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blis>=1.3.0<1.4.0:math/py-blis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cymem>=2.0.2<2.1.0:devel/py-cymem@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}murmurhash>=0.28.0<1.1.0:devel/py-murmurhash@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.19.0<3.0.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.19.0<3.0.0,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}preshed3>=3.0.2<3.1.0:devel/py-preshed3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} @@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blis>=1.3.0<1.4.0:math/py-blis@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}confection>=0.0.1<1.0.0:devel/py-confection@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cymem>=2.0.2<2.1.0:devel/py-cymem@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}murmurhash>=0.28.0<1.1.0:devel/py-murmurhash@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.19.0<3.0.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.19.0<3.0.0,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}preshed3>=3.0.2<3.1.0:devel/py-preshed3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>=2.0.0<3.0.0:devel/py-pydantic2@${PY_FLAVOR} \ diff --git a/devel/py-traits/Makefile b/devel/py-traits/Makefile index 487847306d00..7506f2aa0a8a 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/devel/py-uproot/Makefile b/devel/py-uproot/Makefile index e21ddc512e26..563577e4fef2 100644 --- a/devel/py-uproot/Makefile +++ b/devel/py-uproot/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-vcs>=0:devel/py-hatch-vcs@${PY_FLAVO RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}awkward>=2.8.2:math/py-awkward@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cramjam>=2.5.0:archivers/py-cramjam@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fsspec>=0:filesystems/py-fsspec@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xxhash>=0:devel/py-xxhash@${PY_FLAVOR} diff --git a/devel/py-websockify/Makefile b/devel/py-websockify/Makefile index 77a563a7d5c3..a758257850b7 100644 --- a/devel/py-websockify/Makefile +++ b/devel/py-websockify/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL3 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jwcrypto>=0:security/py-jwcrypto@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} diff --git a/devel/py-xarray-einstats/Makefile b/devel/py-xarray-einstats/Makefile index c7abae6ab835..2b70c63fbe70 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 03e123220acb..9474a4310a03 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-xarray/Makefile b/devel/py-xarray/Makefile index 97e8c1c18529..f6db9e266335 100644 --- a/devel/py-xarray/Makefile +++ b/devel/py-xarray/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=7:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.26:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=24.1:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2.2,1:math/py-pandas@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cartopy>=0.23:graphics/py-cartopy@${PY_FLAVOR} \ diff --git a/devel/py-zarr/Makefile b/devel/py-zarr/Makefile index 6795b1283f7f..26d0dab3af4e 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 07881baccf31..716c7c7a53cc 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PY_SETUPTOOLS} LIB_DEPENDS= libzfp.so:devel/zfp -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= cmake localbase:ldflags python USE_PYTHON= cython flavors pytest diff --git a/devel/root/Makefile b/devel/root/Makefile index 205ee279464c..4d6b318fef15 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +PYROOT_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} PYROOT_USES= python:build,run PYROOT_USES_OFF= python:build diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile index fde201400b37..579a1fedbdb8 100644 --- a/devel/shiboken6/Makefile +++ b/devel/shiboken6/Makefile @@ -46,9 +46,9 @@ DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} DOCS_ALL_TARGET= all doc DOCS_PORTDOCS= * -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" +NUMPY_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +NUMPY_CMAKE_ON= -DNUMPY_INCLUDE_DIR:PATH="${PYTHON_SITELIBDIR}/numpy/_core/include" post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/shiboken_tool.py diff --git a/devel/vitables/Makefile b/devel/vitables/Makefile index 2b2b67912b2a..00772730fbf8 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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/editors/setzer/Makefile b/editors/setzer/Makefile index 6e34f24d8ee7..6552a177975e 100644 --- a/editors/setzer/Makefile +++ b/editors/setzer/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libadwaita-1.so:x11-toolkits/libadwaita \ libportal.so:deskutils/libportal \ libwebkitgtk-6.0.so:www/webkit2-gtk@60 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bibtexparser>0:textproc/py-bibtexparser@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pdfminer.six>=0:textproc/py-pdfminer.six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyxdg>=0:devel/py-pyxdg@${PY_FLAVOR} \ diff --git a/filesystems/py-kerchunk/Makefile b/filesystems/py-kerchunk/Makefile index 8d2b37c05818..59347ca6870a 100644 --- a/filesystems/py-kerchunk/Makefile +++ b/filesystems/py-kerchunk/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FL ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fsspec>=0:filesystems/py-fsspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numcodecs>=0:misc/py-numcodecs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ujson>=0:devel/py-ujson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zarr>=0.1<3,1:devel/py-zarr@${PY_FLAVOR} diff --git a/finance/freqtrade/Makefile b/finance/freqtrade/Makefile index 1ccb8cfb8f27..3fb574b46d86 100644 --- a/finance/freqtrade/Makefile +++ b/finance/freqtrade/Makefile @@ -27,7 +27,7 @@ PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy20>=2.0.6:databases/py-sqlalchemy20 ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}joblib>=1.2.0:devel/py-joblib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}orjson>0:devel/py-orjson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas-ta>0:finance/py-pandas-ta@${PY_FLAVOR} \ diff --git a/finance/py-Nasdaq-Data-Link/Makefile b/finance/py-Nasdaq-Data-Link/Makefile index 68cf85b4248d..22a1e8531be9 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1d0e2ce208f3..f21a7d252fe5 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 0e7de08710b6..a114e919010d 100644 --- a/finance/py-ffn/Makefile +++ b/finance/py-ffn/Makefile @@ -13,12 +13,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 6513264f2ecf..3db49f7f6c09 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 180b7d43becc..67f4dad5434d 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-quantecon/Makefile b/finance/py-quantecon/Makefile index b6f57e8fc6bd..6ba891a986b3 100644 --- a/finance/py-quantecon/Makefile +++ b/finance/py-quantecon/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.5<4:devel/py-flit-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numba>=0.49.0:devel/py-numba@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.17.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.17.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.5.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>=0:math/py-sympy@${PY_FLAVOR} diff --git a/finance/py-ta-lib/Makefile b/finance/py-ta-lib/Makefile index e4c3bc26ad01..caa33fdf42f4 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libta_lib.so:devel/ta-lib -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}polars>0:misc/py-polars@${PY_FLAVOR} USES= python diff --git a/finance/py-yfinance/Makefile b/finance/py-yfinance/Makefile index 2fb739fd3c88..d8718fe0576b 100644 --- a/finance/py-yfinance/Makefile +++ b/finance/py-yfinance/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.11.1:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}frozendict>=2.3.4:devel/py-frozendict@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}multitasking>=0.0.7:devel/py-multitasking@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16.5:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.5:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.3.0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}peewee>=3.15.0:databases/py-peewee@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=2.0.0:devel/py-platformdirs@${PY_FLAVOR} \ diff --git a/french/aster/Makefile b/french/aster/Makefile index 05fe9a0ee54f..e9e5674a5e2a 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 109c211051e7..fd206f63cf76 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 9d3213dbe7e4..27cf9682ee9b 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 eb20d360361a..2ca2886a5850 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python:run tar:bzip2 NO_BUILD= yes diff --git a/games/openage/Makefile b/games/openage/Makefile index d30fb98a5279..d01eaf7cf304 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 e43feb7cd08b..770005efc627 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 432fa54aac15..ee44b4c66b53 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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/inkscape/Makefile b/graphics/inkscape/Makefile index f399ccda3783..f8a57d2e38b2 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -32,7 +32,7 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libenchant-2.so:textproc/enchant2 \ libepoxy.so:graphics/libepoxy \ lib2geom.so:math/lib2geom -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cachecontrol>0:www/py-cachecontrol@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \ diff --git a/graphics/mahotas/Makefile b/graphics/mahotas/Makefile index e75dcf8fc11c..e3769e8f0efa 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libfreeimage.so:graphics/freeimage USE_GCC= yes diff --git a/graphics/matplotlib-cpp/Makefile b/graphics/matplotlib-cpp/Makefile index 9aaa25c9b853..d3e45daa5a18 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= cmake:testing compiler:c++17-lang python diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile index 4e9a378778b8..8bcdf068cf26 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= compiler:c++11-lib desktop-file-utils gettext gnome localbase \ pkgconfig python tar:xz diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 82e876c6ee3e..d663ad710841 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -93,8 +93,8 @@ PROTOBUF_DESC= Enable protobuf support, builds dnn modules PROTOBUF_CMAKE_BOOL= WITH_PROTOBUF # by default the bundled protobuf is built PYTHON_DESC= Enable Python Support 3.6 or greater -PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} PYTHON_USES= python PYTHON_CMAKE_BOOL= BUILD_opencv_python3 PYTHON_CMAKE_ON= -DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR} diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile index 62f159a1cf8c..254b3b330893 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-accelerate/Makefile b/graphics/py-PyOpenGL-accelerate/Makefile index 2172a23a2371..59d7b439cd6e 100644 --- a/graphics/py-PyOpenGL-accelerate/Makefile +++ b/graphics/py-PyOpenGL-accelerate/Makefile @@ -12,10 +12,10 @@ WWW= https://pyopengl.sourceforge.net/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=42.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent cython0 pep517 diff --git a/graphics/py-PyOpenGL/Makefile b/graphics/py-PyOpenGL/Makefile index 44661f33ebfb..bacd26f2a527 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PY_PILLOW} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PY_PILLOW} NO_ARCH= yes diff --git a/graphics/py-agx-emulsion/Makefile b/graphics/py-agx-emulsion/Makefile index 12e5d5db5845..16e0fb4a5480 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 002ce465a24b..a29341259a4c 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 448267793e64..eee59b925092 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 0d24655e733f..7fc13a4b1787 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ gdk-pixbuf2>0:graphics/gdk-pixbuf2 diff --git a/graphics/py-cartopy/Makefile b/graphics/py-cartopy/Makefile index 88e45223f253..d4f54ba4236b 100644 --- a/graphics/py-cartopy/Makefile +++ b/graphics/py-cartopy/Makefile @@ -13,12 +13,12 @@ WWW= https://github.com/SciTools/cartopy LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=40.6.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=7.0.0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.21:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.21:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=3.1.0:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyshp>=2.1:devel/py-pyshp@${PY_FLAVOR} \ diff --git a/graphics/py-colour-science/Makefile b/graphics/py-colour-science/Makefile index 645dc9b51406..c2af1989944b 100644 --- a/graphics/py-colour-science/Makefile +++ b/graphics/py-colour-science/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}imageio>=2:graphics/py-imageio@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.24:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.24:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.10:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4:devel/py-typing-extensions@${PY_FLAVOR} diff --git a/graphics/py-easyocr/Makefile b/graphics/py-easyocr/Makefile index f91cc1fc8ee5..48eb5120bfe2 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-face_recognition/Makefile b/graphics/py-face_recognition/Makefile index e928ac5d0c6e..830233347dbd 100644 --- a/graphics/py-face_recognition/Makefile +++ b/graphics/py-face_recognition/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.0:devel/py-click@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}face_recognition_models>0:graphics/py-face_recognition_models@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dlib>=19.7:science/py-dlib@${PY_FLAVOR} \ ${PY_PILLOW} diff --git a/graphics/py-fury/Makefile b/graphics/py-fury/Makefile index c1d992f165fb..b1bfaa9ea22a 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-gdal/Makefile b/graphics/py-gdal/Makefile index 46be2d21ef05..6ab83e4f8191 100644 --- a/graphics/py-gdal/Makefile +++ b/graphics/py-gdal/Makefile @@ -24,10 +24,10 @@ OPTIONS_DEFINE= NUMPY OPTIONS_DEFAULT=NUMPY NUMPY_DESC= Enable array support via NumPy -NUMPY_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.0.0:math/py-numpy1@${PY_FLAVOR} +NUMPY_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.0.0:math/py-numpy@${PY_FLAVOR} NUMPY_MAKE_ENV= GDAL_PYTHON_BINDINGS_WITHOUT_NUMPY=no NUMPY_MAKE_ENV_OFF= GDAL_PYTHON_BINDINGS_WITHOUT_NUMPY=yes -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.0.0:math/py-numpy1@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.0.0:math/py-numpy@${PY_FLAVOR} NUMPY_USES= fortran post-install: diff --git a/graphics/py-geomdl/Makefile b/graphics/py-geomdl/Makefile index 8c940758f41b..4a1da97b084b 100644 --- a/graphics/py-geomdl/Makefile +++ b/graphics/py-geomdl/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.15.4:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.15.4:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.3:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR} diff --git a/graphics/py-geosnap/Makefile b/graphics/py-geosnap/Makefile index 657fa045dac8..f5fbdfaa4496 100644 --- a/graphics/py-geosnap/Makefile +++ b/graphics/py-geosnap/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}contextily>=0:graphics/py-contextily@${PY_FL ${PYTHON_PKGNAMEPREFIX}libpysal>=0:science/py-libpysal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mapclassify>=0:graphics/py-mapclassify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandarm>=0:graphics/py-pandarm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=0:devel/py-platformdirs@${PY_FLAVOR} \ diff --git a/graphics/py-gizeh/Makefile b/graphics/py-gizeh/Makefile index a853234d0077..fa4f90e0a31d 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/graphics/py-h3/Makefile b/graphics/py-h3/Makefile index 46ed36c36fbb..1938c5e039fe 100644 --- a/graphics/py-h3/Makefile +++ b/graphics/py-h3/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= h3>=3.7.2:graphics/h3 \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libh3.so:graphics/h3 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= cmake:indirect localbase:ldflags ninja:build python USE_PYTHON= autoplist concurrent cython pep517 pytest @@ -30,7 +30,7 @@ OPTIONS_DEFINE= NUMPY OPTIONS_DEFAULT=NUMPY NUMPY_DESC= NumPy support -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} post-patch: # Clean up bundled libraries diff --git a/graphics/py-imagecodecs/Makefile b/graphics/py-imagecodecs/Makefile index ce04e39f90fa..cf449d9d465b 100644 --- a/graphics/py-imagecodecs/Makefile +++ b/graphics/py-imagecodecs/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/cgohlke/imagecodecs LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libaec.so:science/libaec \ @@ -43,7 +43,7 @@ LIB_DEPENDS= libaec.so:science/libaec \ libzfp.so:devel/zfp \ libzopfli.so:archivers/zopfli \ libzstd.so:archivers/zstd -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= jpeg localbase python:3.11+ USE_PYTHON= autoplist concurrent cython pep517 diff --git a/graphics/py-imageio/Makefile b/graphics/py-imageio/Makefile index 28c0cf93eeed..79ffc2df7b5a 100644 --- a/graphics/py-imageio/Makefile +++ b/graphics/py-imageio/Makefile @@ -17,7 +17,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} LIB_DEPENDS= libfreeimage.so:graphics/freeimage -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=8.3.2:graphics/py-pillow@${PY_FLAVOR} TEST_DEPENDS= opencv>=0:graphics/opencv \ ${PYTHON_PKGNAMEPREFIX}astropy>=0:astro/py-astropy@${PY_FLAVOR} \ @@ -48,7 +48,7 @@ FFMPEG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0:graphics/py-imageio FITS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>=0,2:astro/py-astropy@${PY_FLAVOR} PILLOW_HEIF_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}pillow-heif>=0:graphics/py-pillow-heif@${PY_FLAVOR} PYAV_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}av>=0:multimedia/py-av@${PY_FLAVOR} -RAWPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +RAWPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rawpy>=0:graphics/py-rawpy@${PY_FLAVOR} TIFFFILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tifffile>=0:graphics/py-tifffile@${PY_FLAVOR} diff --git a/graphics/py-imutils/Makefile b/graphics/py-imutils/Makefile index 559e3de416cf..e3995b252f48 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 ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= opencv>0:graphics/opencv ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/graphics/py-mapclassify/Makefile b/graphics/py-mapclassify/Makefile index e2176525981a..c143f99a2774 100644 --- a/graphics/py-mapclassify/Makefile +++ b/graphics/py-mapclassify/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}networkx>=3.2,1:math/py-networkx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2.1,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.4:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.12,1:science/py-scipy@${PY_FLAVOR} diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile index 090c0f05edaf..81cdde42ade0 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PY_SPHINX} \ sphinx-build:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-mgwr/Makefile b/graphics/py-mgwr/Makefile index d96184409648..b65067875857 100644 --- a/graphics/py-mgwr/Makefile +++ b/graphics/py-mgwr/Makefile @@ -16,7 +16,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= ${PYTHON_PKGNAMEPREFIX}libpysal>=4.0.0:science/py-libpysal@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.3:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.3:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spglm>=1.0.6:math/py-spglm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spreg>=0:math/py-spreg@${PY_FLAVOR} diff --git a/graphics/py-moderngl-window/Makefile b/graphics/py-moderngl-window/Makefile index 3d2ac144f532..d65797d5ca72 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 bb5554e6d85a..c586a815ce41 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 2dbcfe6fec72..142ac78e9e06 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-opencv-python-headless/Makefile b/graphics/py-opencv-python-headless/Makefile index 22bd9e88e5cd..b368644a1bb5 100644 --- a/graphics/py-opencv-python-headless/Makefile +++ b/graphics/py-opencv-python-headless/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scikit-build>=0.14.0:devel/py-scikit-build@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ cmake:devel/cmake diff --git a/graphics/py-osmnet/Makefile b/graphics/py-osmnet/Makefile index 16441c57cfca..961500727909 100644 --- a/graphics/py-osmnet/Makefile +++ b/graphics/py-osmnet/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}geopandas>=0.11:graphics/py-geopandas@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.10:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.10:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.23,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}shapely>=1.8:devel/py-shapely@${PY_FLAVOR} diff --git a/graphics/py-pandana/Makefile b/graphics/py-pandana/Makefile index af923189092c..2d5ba7470df7 100644 --- a/graphics/py-pandana/Makefile +++ b/graphics/py-pandana/Makefile @@ -17,10 +17,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BROKEN= requires OpenMP support that is missing on this architecture .endif -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.8:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.8:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.17,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.18:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/graphics/py-pandarm/Makefile b/graphics/py-pandarm/Makefile index fb7f68daae45..5980a890f5c3 100644 --- a/graphics/py-pandarm/Makefile +++ b/graphics/py-pandarm/Makefile @@ -12,12 +12,12 @@ WWW= https://github.com/oturns/pandarm LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=40.8:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}geopandas>=0:graphics/py-geopandas@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.18:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tables>=3.1:devel/py-tables@${PY_FLAVOR} diff --git a/graphics/py-pointpats/Makefile b/graphics/py-pointpats/Makefile index e7badef5aaaa..1e26805d8672 100644 --- a/graphics/py-pointpats/Makefile +++ b/graphics/py-pointpats/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}geopandas>=0.12:graphics/py-geopandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libpysal>=4.8:science/py-libpysal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.6:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.24:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.24:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.4,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.10:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}shapely>=2:devel/py-shapely@${PY_FLAVOR} diff --git a/graphics/py-pycollada/Makefile b/graphics/py-pycollada/Makefile index d1e3cace682d..7678b4573893 100644 --- a/graphics/py-pycollada/Makefile +++ b/graphics/py-pycollada/Makefile @@ -11,7 +11,7 @@ WWW= https://pycollada.readthedocs.org/ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.0:devel/py-python-dateutil@${PY_FLAVOR} NO_ARCH= yes diff --git a/graphics/py-pygeos/Makefile b/graphics/py-pygeos/Makefile index 96a79d50460a..0fbda6a1562b 100644 --- a/graphics/py-pygeos/Makefile +++ b/graphics/py-pygeos/Makefile @@ -12,11 +12,11 @@ WWW= https://github.com/pygeos/pygeos LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.13:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.13:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libgeos.so:graphics/geos -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.13:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.13:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent cython0 pep517 diff --git a/graphics/py-pyogrio/Makefile b/graphics/py-pyogrio/Makefile index 46a6b7e4a9a2..b239314455c5 100644 --- a/graphics/py-pyogrio/Makefile +++ b/graphics/py-pyogrio/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libgdal.so:graphics/gdal RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} USES= python diff --git a/graphics/py-pyqtgraph/Makefile b/graphics/py-pyqtgraph/Makefile index 48c875d1404d..4078cd1371c3 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 b36aa9fc4298..7fbe3287f689 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 3bc1269bc506..b41c28ef4496 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c7d4bbb8a61d..6a5ee320f40f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 df4d439d2fd0..d4e499b4c641 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-rasterio/Makefile b/graphics/py-rasterio/Makefile index ef4f87e79de3..18f9b095b70e 100644 --- a/graphics/py-rasterio/Makefile +++ b/graphics/py-rasterio/Makefile @@ -13,7 +13,7 @@ WWW= https://rasterio.readthedocs.io/en/stable/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0<3:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0<3,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libgdal.so:graphics/gdal @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}affine>=0:math/py-affine@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=4.0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cligj>=0.5:devel/py-cligj@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} USES= compiler:c++11-lang python:3.11+ diff --git a/graphics/py-rasterstats/Makefile b/graphics/py-rasterstats/Makefile index d6043e97e0d8..54f96f0cd69e 100644 --- a/graphics/py-rasterstats/Makefile +++ b/graphics/py-rasterstats/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}affine>=0:math/py-affine@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=7.1:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cligj>=0.4:devel/py-cligj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fiona>=0:graphics/py-fiona@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.9:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.9:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rasterio>=1.0:graphics/py-rasterio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}shapely>=0:devel/py-shapely@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} diff --git a/graphics/py-rawpy/Makefile b/graphics/py-rawpy/Makefile index 40e593b6307a..4b896fe26c09 100644 --- a/graphics/py-rawpy/Makefile +++ b/graphics/py-rawpy/Makefile @@ -12,11 +12,11 @@ WWW= https://github.com/letmaik/rawpy LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libraw.so:graphics/libraw -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.0:math/py-numpy@${PY_FLAVOR} USES= pkgconfig python USE_PYTHON= autoplist concurrent cython pep517 diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile index e418b34742d6..b77215834569 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 dbeac4d54a59..e6f932bea5a3 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} USES= cmake:indirect python diff --git a/graphics/py-tifffile/Makefile b/graphics/py-tifffile/Makefile index 72a6a24c7a39..b507a07db442 100644 --- a/graphics/py-tifffile/Makefile +++ b/graphics/py-tifffile/Makefile @@ -15,7 +15,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= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= dos2unix python:3.11+ USE_PYTHON= autoplist concurrent pep517 diff --git a/graphics/py-toyplot/Makefile b/graphics/py-toyplot/Makefile index c88ab7cf6b29..a4018fe6d5ff 100644 --- a/graphics/py-toyplot/Makefile +++ b/graphics/py-toyplot/Makefile @@ -11,7 +11,7 @@ WWW= https://pypi.org/project/toyplot/ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.8:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:math/py-colormath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}png>=0.0.17:graphics/py-png@${PY_FLAVOR} \ diff --git a/graphics/py-urbanaccess/Makefile b/graphics/py-urbanaccess/Makefile index 880f2805a619..dd0bf1205224 100644 --- a/graphics/py-urbanaccess/Makefile +++ b/graphics/py-urbanaccess/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}geopy>=1.11.0:net/py-geopy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.11:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.11:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}osmnet>=0.1.4:graphics/py-osmnet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandana>=0.2.0:graphics/py-pandana@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.17.0,1:math/py-pandas@${PY_FLAVOR} \ diff --git a/graphics/py-urbansim/Makefile b/graphics/py-urbansim/Makefile index b45bfb09fbf9..f04837ae8771 100644 --- a/graphics/py-urbansim/Makefile +++ b/graphics/py-urbansim/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.8.0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}orca>=1.1:devel/py-orca@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.17.0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}patsy>=0.4.1:math/py-patsy@${PY_FLAVOR} \ diff --git a/graphics/py-vispy/Makefile b/graphics/py-vispy/Makefile index 18c3c44a00d1..44690ae737ca 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 b8dcd4f0c4c9..1acbabceb84f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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/py-zbar-py/Makefile b/graphics/py-zbar-py/Makefile index 898aae9c737c..90dbb6323671 100644 --- a/graphics/py-zbar-py/Makefile +++ b/graphics/py-zbar-py/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libzbar.so:graphics/zbar -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} USES= iconv:wchar_t python USE_PYTHON= autoplist distutils diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index 89fbfc95b4c1..b64653c0bc3e 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 5958d8e526d8..0da60efba59e 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -79,7 +79,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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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/qtqr/Makefile b/graphics/qtqr/Makefile index e374a898c48c..0c5be4b779d1 100644 --- a/graphics/qtqr/Makefile +++ b/graphics/qtqr/Makefile @@ -14,7 +14,7 @@ WWW= https://launchpad.net/qr-tools LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENCE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zbar-py>=1.0.4:graphics/py-zbar-py@${PY_FLAVOR} diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index 4b8ab35f14d8..3a04a559f63e 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 7a363a8be316..15cfb4411a91 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} PYTHON_LIB_DEPENDS= ${PY_BOOST} \ libboost_container.so:devel/boost-libs -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} PYTHON_USES= python PYTHON_CMAKE_BOOL= PYTHON diff --git a/math/gau2grid/Makefile b/math/gau2grid/Makefile index 79540a0b1bde..a56b995fd440 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: '=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f90e30951b74..9808ab1184b4 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 \ - ${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}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 93e87de09dee..944bf5022a67 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +full_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ swig:devel/swig full_LIB_DEPENDS= liboctave.so:math/octave -full_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +full_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 90c1d76cf27d..447a1d3c4a9a 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 ad8af6bac237..adb33904fa44 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PYTHON_PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 0088b6b9e703..a7b054613598 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 76bd7a25d81e..f33771a975f4 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 13b79080aaa6..6f1a1d453600 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d1bfde821b8e..c24db34ba98b 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 ddc548d73604..bebb2e41cf1b 100644 --- a/math/py-PySCIPOpt/Makefile +++ b/math/py-PySCIPOpt/Makefile @@ -11,9 +11,9 @@ WWW= https://github.com/SCIP-Interfaces/PySCIPOpt LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libscip.so:math/SCIP -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a3d5c1681905..003ab42ee295 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 3c7ac3a8d768..a112d6b2280c 100644 --- a/math/py-algopy/Makefile +++ b/math/py-algopy/Makefile @@ -11,7 +11,7 @@ WWW= https://pythonhosted.org/algopy/ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python zip USE_PYTHON= distutils autoplist diff --git a/math/py-ambit/Makefile b/math/py-ambit/Makefile index 4472f9ef2c75..543aa3ae375c 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f358fe841444..f61437688ac0 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 fdddfcb72a1b..6f868f790da1 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 fe64c69f2d58..1faf3171364a 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 05c8f34c4ef3..cc534d736844 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} USES= python diff --git a/math/py-awkward-cpp/Makefile b/math/py-awkward-cpp/Makefile index c308e0b017fd..557b69f62a37 100644 --- a/math/py-awkward-cpp/Makefile +++ b/math/py-awkward-cpp/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>=3:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0.11:devel/py-scikit-build-core@${PY_FLAVOR} \ rapidjson>=0:devel/rapidjson -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.21.3:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.21.3:math/py-numpy@${PY_FLAVOR} USES= cmake:indirect compiler:c++11-lang localbase python USE_PYTHON= autoplist concurrent pep517 diff --git a/math/py-awkward/Makefile b/math/py-awkward/Makefile index ed179d8289ed..05181d027187 100644 --- a/math/py-awkward/Makefile +++ b/math/py-awkward/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-fancy-pypi-readme>=0:devel/py-hatch- ${PYTHON_PKGNAMEPREFIX}hatchling>=1.10.0:devel/py-hatchling@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}awkward-cpp>=52<52_99:math/py-awkward-cpp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fsspec>=2022.11.0:filesystems/py-fsspec@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.21.3:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.21.3:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} USES= python diff --git a/math/py-baycomp/Makefile b/math/py-baycomp/Makefile index 2e2f59572e29..db6d8700313c 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-bayesian-optimization/Makefile b/math/py-bayesian-optimization/Makefile index 8241522d6e93..2bfc7e51496a 100644 --- a/math/py-bayesian-optimization/Makefile +++ b/math/py-bayesian-optimization/Makefile @@ -15,7 +15,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= ${PYTHON_PKGNAMEPREFIX}colorama>=0.4.6:devel/py-colorama@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.9.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.18.0:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.0.0:science/py-scipy@${PY_FLAVOR} diff --git a/math/py-benford_py/Makefile b/math/py-benford_py/Makefile index 6593cb6a3415..f869087619ea 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-blis/Makefile b/math/py-blis/Makefile index 409a2efea21d..d5d2bee508f3 100644 --- a/math/py-blis/Makefile +++ b/math/py-blis/Makefile @@ -13,10 +13,10 @@ WWW= https://github.com/explosion/cython-blis LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.19.3<3.0.0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.19.3<3.0.0,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.19.0<3.0.0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.19.0<3.0.0,1:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent cython pep517 diff --git a/math/py-bottleneck/Makefile b/math/py-bottleneck/Makefile index 60bfc1d84d03..b0efe92ce086 100644 --- a/math/py-bottleneck/Makefile +++ b/math/py-bottleneck/Makefile @@ -12,11 +12,11 @@ WWW= https://github.com/kwgoodman/bottleneck LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0<2.6:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0<2.6,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}versioneer>=0:devel/py-versioneer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent cython pep517 diff --git a/math/py-chaospy/Makefile b/math/py-chaospy/Makefile index df18b53b63c6..f495f681d67c 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c894f26617ae..db0288f7e884 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= cargo python diff --git a/math/py-cma/Makefile b/math/py-cma/Makefile index 6b81c246235a..d0cbd83942c3 100644 --- a/math/py-cma/Makefile +++ b/math/py-cma/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/cma/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/math/py-cmaes/Makefile b/math/py-cmaes/Makefile index 5d289cf8048e..702a0f73f67c 100644 --- a/math/py-cmaes/Makefile +++ b/math/py-cmaes/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/math/py-cmyt/Makefile b/math/py-cmyt/Makefile index dbdec3864c6f..6b1232435da7 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-colormath/Makefile b/math/py-colormath/Makefile index 6cc8f8edfdd2..1483f4d16a99 100644 --- a/math/py-colormath/Makefile +++ b/math/py-colormath/Makefile @@ -11,7 +11,7 @@ WWW= https://pypi.org/project/colormath/ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.9.2:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:math/py-networkx@${PY_FLAVOR} USES= python diff --git a/math/py-contourpy/Makefile b/math/py-contourpy/Makefile index 83fca0dec846..0fd139d2d81b 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 8c0e212326a8..9665f6276139 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 713a90d9c8e4..3a217096507b 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libblas.so:math/blas \ libipopt.so:math/ipopt \ liblapack.so:math/lapack -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 ffe0a2e87ec0..93c0b26be3f0 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/math/py-dgl/Makefile b/math/py-dgl/Makefile index ec2071bfd960..4b4b81baceff 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 692cd5efff55..8656b49ae81f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 32c0e97083b7..0d944c1e78ed 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= compiler:c++17-lang python diff --git a/math/py-ecos/Makefile b/math/py-ecos/Makefile index 48848e6428b5..bb74a84a4697 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c7088a1fcc02..b43f690eefb7 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 7b57daddc833..fb6f44e14567 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} BUILD_DEPENDS= swig:devel/swig \ ${PY_DEPENDS} diff --git a/math/py-fastcluster/Makefile b/math/py-fastcluster/Makefile index 48f317f198e2..8590745c021b 100644 --- a/math/py-fastcluster/Makefile +++ b/math/py-fastcluster/Makefile @@ -13,10 +13,10 @@ WWW= http://danifold.net/fastcluster.html \ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= compiler python USE_PYTHON= autoplist concurrent pep517 diff --git a/math/py-fenics-basix/Makefile b/math/py-fenics-basix/Makefile index f438eac96cb7..e7b33d938eb4 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-flax/Makefile b/math/py-flax/Makefile index 958fedcb453e..995b61dc0e5c 100644 --- a/math/py-flax/Makefile +++ b/math/py-flax/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jax>=0.4.2:math/py-jax@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.12:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.12:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rich>=11.1:textproc/py-rich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.1.1:devel/py-typing-extensions@${PY_FLAVOR} diff --git a/math/py-fpylll/Makefile b/math/py-fpylll/Makefile index 2440379c1f60..c08f6f04805f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 7ad997de3775..2c07d14b895d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-fvcore/Makefile b/math/py-fvcore/Makefile index 5aff0ff2a437..2735dc353036 100644 --- a/math/py-fvcore/Makefile +++ b/math/py-fvcore/Makefile @@ -12,7 +12,7 @@ WWW= https://github.com/facebookresearch/fvcore LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iopath>0:devel/py-iopath@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR} \ diff --git a/math/py-gau2grid/Makefile b/math/py-gau2grid/Makefile index f8bbdf7bf5d7..a4371ee07a93 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ cmake:devel/cmake-core -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 ba9cd5020c2c..89f9d3e84374 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} USES= python diff --git a/math/py-gym/Makefile b/math/py-gym/Makefile index 42f74989e2ca..35c123ca057d 100644 --- a/math/py-gym/Makefile +++ b/math/py-gym/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cloudpickle>=1.2.0:devel/py-cloudpickle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gym-notices>=0.0.4:math/py-gym-notices@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.18.0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.18.0:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} USES= python diff --git a/math/py-hdbscan/Makefile b/math/py-hdbscan/Makefile index 4c34ffc3b148..544607a6e306 100644 --- a/math/py-hdbscan/Makefile +++ b/math/py-hdbscan/Makefile @@ -13,11 +13,11 @@ WWW= https://hdbscan.readthedocs.io/en/latest/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}joblib>=1.0:devel/py-joblib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.20:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.20:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.20:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} diff --git a/math/py-hdmedians/Makefile b/math/py-hdmedians/Makefile index 5084264b6115..0a92bd93b1b7 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils cython autoplist diff --git a/math/py-hepstats/Makefile b/math/py-hepstats/Makefile index 21beade4aaab..02811d9da692 100644 --- a/math/py-hepstats/Makefile +++ b/math/py-hepstats/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FL ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asdf>=0:science/py-asdf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>=0:misc/py-tqdm@${PY_FLAVOR} \ diff --git a/math/py-highspy/Makefile b/math/py-highspy/Makefile index f1a5497a30e9..0fa3542e6df4 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c54a354b3935..dcd51359cfb7 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1998eae9b6c5..062bdc02510b 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-iohexperimenter/Makefile b/math/py-iohexperimenter/Makefile index edad708a4099..b44802bdec3f 100644 --- a/math/py-iohexperimenter/Makefile +++ b/math/py-iohexperimenter/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= compiler:c++14-lang dos2unix python USE_PYTHON= autoplist concurrent pep517 unittest diff --git a/math/py-ipyopt/Makefile b/math/py-ipyopt/Makefile index 46f78029c8f1..2554e632d746 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d9b36292db5f..b8602bc90336 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycairo>0:graphics/py-pycairo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ xdg-open:devel/xdg-utils USES= python diff --git a/math/py-jacobi/Makefile b/math/py-jacobi/Makefile index a105a34dab6d..af1efab72b99 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= pep517 autoplist pytest diff --git a/math/py-jax/Makefile b/math/py-jax/Makefile index 9081da815f31..d1d877d93a07 100644 --- a/math/py-jax/Makefile +++ b/math/py-jax/Makefile @@ -16,7 +16,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= ${PYTHON_PKGNAMEPREFIX}ml-dtypes>=0.2.0:math/py-ml-dtypes@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}opt-einsum>=0:math/py-opt-einsum@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.11.1:science/py-scipy@${PY_FLAVOR} diff --git a/math/py-jij-cimod/Makefile b/math/py-jij-cimod/Makefile index f7b1acfd717b..848a042a9ad8 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 baf98e0d75de..663f85fe1357 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 72a65b6eac16..e3fd453cca33 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d88d2baf72c0..31ad2d88b318 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= ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${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 3902a969a613..c1b5a651daae 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libblas.so:math/blas \ liblapack.so:math/lapack -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= pep517 cython autoplist pytest diff --git a/math/py-libceed/Makefile b/math/py-libceed/Makefile index 7bfc0c410aea..ce3ee807b391 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 9086cee45f2b..3ceab3bc3f9b 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c87bbd873ba7..17227b8fda7c 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c9bb45ebecf3..416e65e9b444 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d5ad0da47fa9..b9cd2aae770e 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/math/py-mathics/Makefile b/math/py-mathics/Makefile index ad7a94436b2a..5548b0032599 100644 --- a/math/py-mathics/Makefile +++ b/math/py-mathics/Makefile @@ -12,7 +12,7 @@ WWW= https://mathics.org/ LICENSE= GPLv3+ -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}pint>0:devel/py-pint@${PY_FLAVOR} \ @@ -29,7 +29,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} ${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c91ebd5998ac..883259e8ac49 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 ef83692a0737..ad8d372443d7 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-ml-dtypes/Makefile b/math/py-ml-dtypes/Makefile index 9bb7081254b5..c906508a2549 100644 --- a/math/py-ml-dtypes/Makefile +++ b/math/py-ml-dtypes/Makefile @@ -13,10 +13,10 @@ WWW= https://github.com/jax-ml/ml_dtypes LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/math/py-mnnpy/Makefile b/math/py-mnnpy/Makefile index c5b1504cf150..d3c41211e885 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-modin/Makefile b/math/py-modin/Makefile index dca87b42802c..cd64db9f9930 100644 --- a/math/py-modin/Makefile +++ b/math/py-modin/Makefile @@ -17,7 +17,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= ${PYTHON_PKGNAMEPREFIX}fsspec>=2022.11.0:filesystems/py-fsspec@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22.4:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.22.4:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=21.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2.2,1<2.4,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.8.0:sysutils/py-psutil@${PY_FLAVOR} \ diff --git a/math/py-ndindex/Makefile b/math/py-ndindex/Makefile index e7285f037855..bdb6c3d13584 100644 --- a/math/py-ndindex/Makefile +++ b/math/py-ndindex/Makefile @@ -23,7 +23,7 @@ USE_PYTHON= autoplist concurrent cython pep517 OPTIONS_DEFINE= ARRAYS ARRAYS_DESC= Array support -ARRAYS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +ARRAYS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/math/py-ndonnx/Makefile b/math/py-ndonnx/Makefile index ccb73e24a249..7c1a4276f087 100644 --- a/math/py-ndonnx/Makefile +++ b/math/py-ndonnx/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spox>=0.10:math/py-spox@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile index 925bf20dce05..6cff874edc2d 100644 --- a/math/py-networkx/Makefile +++ b/math/py-networkx/Makefile @@ -32,7 +32,7 @@ OPTIONS_GROUP_RENDER= MPL GRAPHVIZ OPTIONS_DEFAULT= NUMPY SCIPY MPL GDAL GRAPHVIZ LXML PANDAS PYDOT YAML NUMPY_DESC= Matrix representation of graphs -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.20.0:math/py-numpy1@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.20.0:math/py-numpy@${PY_FLAVOR} SCIPY_DESC= Sparse matrix representation of graphs SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=1.8:science/py-scipy@${PY_FLAVOR} \ diff --git a/math/py-nevergrad/Makefile b/math/py-nevergrad/Makefile index f80418b3c089..b27b9b872641 100644 --- a/math/py-nevergrad/Makefile +++ b/math/py-nevergrad/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bayesian-optimization>=1.2.0:math/py-bayesian-optimization@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cma>=2.6.0:math/py-cma@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.24.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.24.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.6:devel/py-typing-extensions@${PY_FLAVOR} diff --git a/math/py-nlopt/Makefile b/math/py-nlopt/Makefile index 57c441a0c8cd..ae8f7555d495 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 4946d0031319..3e92b5fd86cf 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-numexpr/Makefile b/math/py-numexpr/Makefile index aa225d632e02..34b0bfedf6be 100644 --- a/math/py-numexpr/Makefile +++ b/math/py-numexpr/Makefile @@ -13,10 +13,10 @@ WWW= https://github.com/pydata/numexpr LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.0:math/py-numpy@${PY_FLAVOR} USES= dos2unix python USE_PYTHON= autoplist concurrent pep517 diff --git a/math/py-numpoly/Makefile b/math/py-numpoly/Makefile index b496271b3d0b..6bb841f249f1 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/math/py-numpy-groupies/Makefile b/math/py-numpy-groupies/Makefile index 91f6d0832330..a760c5d7fba0 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 683f67b3b139..a5fea1e3df0d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 fd5946257544..6fd952411fec 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libfftw3.so:math/fftw3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c9a2ace21392..dfc3fcfc1e35 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d32e4e01b287..15b13e1d8b35 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-pandas/Makefile b/math/py-pandas/Makefile index 0268724d9667..fc33606d98e6 100644 --- a/math/py-pandas/Makefile +++ b/math/py-pandas/Makefile @@ -17,10 +17,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= meson>=1.2.1<2:devel/meson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}meson-python>=0.13.1:devel/meson-python@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}versioneer>=0:devel/py-versioneer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2020.1,1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ diff --git a/math/py-patsy/Makefile b/math/py-patsy/Makefile index f822567c87a6..8ab04ba50945 100644 --- a/math/py-patsy/Makefile +++ b/math/py-patsy/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.4:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.4:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/math/py-pdal/Makefile b/math/py-pdal/Makefile index cacfb72c3778..c09a9e259b44 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ cmake:devel/cmake-core LIB_DEPENDS= libpdalcpp.so:math/pdal RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 e6e7c1aa161d..205d9aaf137e 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libpetsc.so:science/PETSc -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 660c7e6fb534..6505a3f32b64 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 8a553cefe22d..b71e5bd19564 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 271e484b88a0..83f0a4dab887 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 65d330c602d5..8bb040a8ca32 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f9c03efb1451..773a8e0b56dd 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-pygsl/Makefile b/math/py-pygsl/Makefile index 7cf69cd58d77..b395596c5eb5 100644 --- a/math/py-pygsl/Makefile +++ b/math/py-pygsl/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meson-python>=0:devel/meson-python@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ swig:devel/swig LIB_DEPENDS= libgsl.so:math/gsl -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= pkgconfig python USE_PYTHON= autoplist concurrent pep517 diff --git a/math/py-pygslodeiv2/Makefile b/math/py-pygslodeiv2/Makefile index 23581d722854..a62c741f7861 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libgsl.so:math/gsl -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 6fb9a466edd9..726e43de6113 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/math/py-pymc3/Makefile b/math/py-pymc3/Makefile index 616496cfa617..7cdbdcb25e84 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 fd5984e4114b..1929ba73a87e 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 09fbc781559e..08a25b7eecf5 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= fortran python USE_PYTHON= distutils autoplist diff --git a/math/py-pynndescent/Makefile b/math/py-pynndescent/Makefile index a0ea1c5acac4..8c50146dbcf6 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 5ad4de32069a..5746993f1711 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${LOCALBASE}/include/boost/config.hpp:devel/boost-libs -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 314ee06fcddd..39301888234e 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-pyreadstat/Makefile b/math/py-pyreadstat/Makefile index 51626238f5ef..2fcbbfaca01f 100644 --- a/math/py-pyreadstat/Makefile +++ b/math/py-pyreadstat/Makefile @@ -16,7 +16,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= ${PYTHON_PKGNAMEPREFIX}narwhals>=2.10.1:math/py-narwhals@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent cython pep517 diff --git a/math/py-pyrr/Makefile b/math/py-pyrr/Makefile index 40fb4130070e..922f8b4fd659 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/math/py-pysym/Makefile b/math/py-pysym/Makefile index 011fb729a51c..237ddf33bbca 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/math/py-pytensor/Makefile b/math/py-pytensor/Makefile index 9431f27f1fb2..1a4e293604ef 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 24cab36d095b..c2e9524b1356 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 463e460a2eed..297beee91631 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 35676849e892..90c1e40140a9 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 90b418b74a01..aba1d0857205 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}meson-python>=0.16:devel/meson-python@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist cython pep517 diff --git a/math/py-qats/Makefile b/math/py-qats/Makefile index 88eaf16378bb..0ad59b40c50d 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 0e602206b356..ad933ad4fed3 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-quadprog/Makefile b/math/py-quadprog/Makefile index f9bdd0029aeb..b6e15c400d03 100644 --- a/math/py-quadprog/Makefile +++ b/math/py-quadprog/Makefile @@ -11,7 +11,7 @@ WWW= https://pypi.org/project/quadprog/ LICENSE= GPLv2+ -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.2:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist cython diff --git a/math/py-resample/Makefile b/math/py-resample/Makefile index d5eda4a50071..31614ed1be87 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-rpy2/Makefile b/math/py-rpy2/Makefile index ca8581dc639e..209423ff079b 100644 --- a/math/py-rpy2/Makefile +++ b/math/py-rpy2/Makefile @@ -33,8 +33,8 @@ OPTIONS_DEFAULT=NUMPY PANDAS NUMPY__DESC= Numpy support PANDAS_DESC= Pandas support -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26:math/py-numpy1@${PY_FLAVOR} -PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26:math/py-numpy1@${PY_FLAVOR} \ +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.26:math/py-numpy@${PY_FLAVOR} +PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.26:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.3.5,1:math/py-pandas@${PY_FLAVOR} post-install: diff --git a/math/py-rustworkx/Makefile b/math/py-rustworkx/Makefile index 3b74406a4667..0884e9134557 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-rvlib/Makefile b/math/py-rvlib/Makefile index bb9af4aa6f38..44fa218e43ba 100644 --- a/math/py-rvlib/Makefile +++ b/math/py-rvlib/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>=0.49:devel/py-numba@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} USES= python diff --git a/math/py-scikit-fem/Makefile b/math/py-scikit-fem/Makefile index 39bd41abefc8..cc4246957a27 100644 --- a/math/py-scikit-fem/Makefile +++ b/math/py-scikit-fem/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.2<4:devel/py-flit-core@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/math/py-scikit-umfpack/Makefile b/math/py-scikit-umfpack/Makefile index 9fbd67ad65ce..fdd740485c7f 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 bced5719061c..624487e3780e 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libopenblas.so:math/openblas -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-seaborn/Makefile b/math/py-seaborn/Makefile index 16d48ac3692b..83b8147ff928 100644 --- a/math/py-seaborn/Makefile +++ b/math/py-seaborn/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.2<4:devel/py-flit-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.20:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.20:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.7:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}statsmodels>=0.12:math/py-statsmodels@${PY_FLAVOR} diff --git a/math/py-seriate/Makefile b/math/py-seriate/Makefile index eff6650d65e1..08bf0db6597d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 4164cb0a6bf4..659934fb7bd7 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= fortran python USE_PYTHON= autoplist cython distutils pytest diff --git a/math/py-snuggs/Makefile b/math/py-snuggs/Makefile index 28491ac4ad66..49f452b1ae7a 100644 --- a/math/py-snuggs/Makefile +++ b/math/py-snuggs/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= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.6:devel/py-pyparsing@${PY_FLAVOR} USES= python diff --git a/math/py-spectral/Makefile b/math/py-spectral/Makefile index 5eb4c1d73c31..41ee5a2a1b51 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/math/py-spglm/Makefile b/math/py-spglm/Makefile index 525c9a6a2dfe..db290cb2b794 100644 --- a/math/py-spglm/Makefile +++ b/math/py-spglm/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpysal>=4.0.0:science/py-libpysal@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.3:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.3:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spreg>=1.0.4:math/py-spreg@${PY_FLAVOR} diff --git a/math/py-spint/Makefile b/math/py-spint/Makefile index 652bfb0b86e5..28d447823643 100644 --- a/math/py-spint/Makefile +++ b/math/py-spint/Makefile @@ -15,7 +15,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= ${PYTHON_PKGNAMEPREFIX}libpysal>=4.0.0:science/py-libpysal@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.3:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.3:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spglm>=1.0.6:math/py-spglm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spreg>=0:math/py-spreg@${PY_FLAVOR} diff --git a/math/py-splot/Makefile b/math/py-splot/Makefile index 20d4d7d44b77..9f0e3dce5ebe 100644 --- a/math/py-splot/Makefile +++ b/math/py-splot/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}esda>=0:science/py-esda@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libpysal>=0:science/py-libpysal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mapclassify>=0:graphics/py-mapclassify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.3:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}seaborn>=0.11.0:math/py-seaborn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spreg>=0:math/py-spreg@${PY_FLAVOR} diff --git a/math/py-spopt/Makefile b/math/py-spopt/Makefile index 8f09e852e1f0..e255494a2fcb 100644 --- a/math/py-spopt/Makefile +++ b/math/py-spopt/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}geopandas>=0.14.0:graphics/py-geopandas@${PY ${PYTHON_PKGNAMEPREFIX}libpysal>=4.10.0:science/py-libpysal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mapclassify>=2.7.0:graphics/py-mapclassify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=3.2,1:math/py-networkx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2.1.0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pointpats>=2.4.0:graphics/py-pointpats@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PuLP>=2.8:math/py-PuLP@${PY_FLAVOR} \ diff --git a/math/py-spox/Makefile b/math/py-spox/Makefile index a6fafec4aa1f..b88a6c7e7c25 100644 --- a/math/py-spox/Makefile +++ b/math/py-spox/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}onnx>=1.13:misc/py-onnx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} diff --git a/math/py-spreg/Makefile b/math/py-spreg/Makefile index 68bf248862a4..dbfb21afdd73 100644 --- a/math/py-spreg/Makefile +++ b/math/py-spreg/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpysal>=4.0.0:science/py-libpysal@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.23:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.23:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.22:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR} diff --git a/math/py-ssm/Makefile b/math/py-ssm/Makefile index 025ea3683f73..e94760008cd6 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-statsmodels/Makefile b/math/py-statsmodels/Makefile index bac685ca2c17..884ba3d08d36 100644 --- a/math/py-statsmodels/Makefile +++ b/math/py-statsmodels/Makefile @@ -13,12 +13,12 @@ WWW= https://www.statsmodels.org/stable/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22.3<3:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.22.3<3,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.13,1<2,1:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=63.1.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8<10:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22.3<3:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.22.3<3,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.4,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}patsy>=0.5.6:math/py-patsy@${PY_FLAVOR} \ diff --git a/math/py-sym/Makefile b/math/py-sym/Makefile index f66641803a11..3ce075dd5750 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist pytest diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile index 6aecbcfea736..de7e1047c1f5 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 999c839efb5a..dc8b50ac7ce3 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 63af3da0e4e5..d1da22563ca2 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a8df41a0ab3c..e40934fdc306 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a619574ec077..88639b757dbc 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 3bf079be1770..84f6e6159e91 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-vector/Makefile b/math/py-vector/Makefile index bb08b4784e17..f47e49f5ed2f 100644 --- a/math/py-vector/Makefile +++ b/math/py-vector/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}numpy1>=1.19.3:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.19.3:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20:devel/py-packaging@${PY_FLAVOR} USES= python diff --git a/math/py-yt/Makefile b/math/py-yt/Makefile index de044ff2c252..fed73c485086 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ewah-bool-utils>=1.0.2:devel/py-ewah-bool-utils@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 2277906f38a9..8d3db550d8a8 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 4117580f6129..af5c9c16a1ec 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 47ca4550638d..4fcfa54c879c 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 651755a7a0ad..b335f8d83c97 100644 --- a/misc/caffe/Makefile +++ b/misc/caffe/Makefile @@ -16,7 +16,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bash:shells/bash \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 b69d500a7d2e..974a7b7de1c6 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 678077fc347b..0be15ed3cd00 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a8ef54191420..de9d59bf4f3c 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 987c082cc119..5831dc4a1dd1 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= pep517 autoplist pytest diff --git a/misc/py-SQImFil/Makefile b/misc/py-SQImFil/Makefile index 57ea2a99ccc1..980a4449272f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c1517827534c..8eaaad461a2d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c5538e0656f9..2329bd8054a7 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 4edcbef5570b..a430d41263f3 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-aider-chat/Makefile b/misc/py-aider-chat/Makefile index 6ae1445f389e..c0ede8cc5312 100644 --- a/misc/py-aider-chat/Makefile +++ b/misc/py-aider-chat/Makefile @@ -38,7 +38,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=1.3:devel/py-arrow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}litellm>=1.44.7:misc/py-litellm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mixpanel>=4.10:misc/py-mixpanel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=3.3:math/py-networkx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1<2.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy<2.0,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openai>=1.43.1:misc/py-openai@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslex>=0.1.3:devel/py-oslex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=24.1:devel/py-packaging@${PY_FLAVOR} \ diff --git a/misc/py-apache-beam/Makefile b/misc/py-apache-beam/Makefile index 6f6abfe925e7..d1950aff0133 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 05537e51f7aa..e8f5c240ed30 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 84bbf3c4381a..e8a9936b349a 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 5b90ee51046a..39891680c440 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 88565661cf28..2c28d81762eb 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 774f71a63205..bc7a5fb26edd 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 cb8c343e01b3..8ed890ad5731 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/misc/py-diffusers/Makefile b/misc/py-diffusers/Makefile index 2de2a5470b05..292991b95d18 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 6da9ffc8323e..19ef8aaa57fa 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f9b1a69f8000..814d273c5b9b 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c246d5c5bd3e..6ecd5e9cdcaa 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d38521cc5c34..fac230ef4091 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/misc/py-fastscapelib/Makefile b/misc/py-fastscapelib/Makefile index bd0e436added..ee663962f5a2 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= pep517 autoplist pytest diff --git a/misc/py-gguf/Makefile b/misc/py-gguf/Makefile index d0262db0c69a..32b6c964c013 100644 --- a/misc/py-gguf/Makefile +++ b/misc/py-gguf/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a4324e195a93..2fe16391191d 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-haystack_ai/Makefile b/misc/py-haystack_ai/Makefile index 1b1fba1c910c..5c08290f0efe 100644 --- a/misc/py-haystack_ai/Makefile +++ b/misc/py-haystack_ai/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}filetype>0:devel/py-filetype@${PY_FLAVOR} diff --git a/misc/py-hist/Makefile b/misc/py-hist/Makefile index ed2a8254a3f4..120946feabf5 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 60c3d0707e04..8946341954bf 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 686dbba808a3..9020a62606f9 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 ed3c10c00362..1376fccfff0a 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 0c616b0edb0d..8bde972b58d9 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 5fe927248f4d..0fc02d68fa75 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 5c4f97c12feb..584b2f3100b3 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 7d954694ed23..71338133aeef 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 131b2792a9fe..436008c85672 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c863a8e18e20..6cdaade343e8 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 4e6f3573f767..fee572545217 100644 --- a/misc/py-llama-cpp-python/Makefile +++ b/misc/py-llama-cpp-python/Makefile @@ -17,7 +17,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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1fc2664388b5..928f3e9dbc2b 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.2:devel/py-pytz@${PY_FLAVOR} USES= python diff --git a/misc/py-mistral-common/Makefile b/misc/py-mistral-common/Makefile index 7ffb4eb92b42..048244c56829 100644 --- a/misc/py-mistral-common/Makefile +++ b/misc/py-mistral-common/Makefile @@ -15,7 +15,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.21.1:devel/py-jsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.25:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.25:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=10.3.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>=2.7<3.0:devel/py-pydantic2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic-extra-types>=2:devel/py-pydantic-extra-types@${PY_FLAVOR} \ diff --git a/misc/py-mmcv/Makefile b/misc/py-mmcv/Makefile index 12082096079e..cd3b0eff3d3e 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 da3a0511512e..070b542924ad 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 bbeb6080557d..7259485bcc95 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 4bd488798403..22370197c838 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-svg/Makefile b/misc/py-napari-svg/Makefile index 8a96a49fbd8a..056c74e7fc75 100644 --- a/misc/py-napari-svg/Makefile +++ b/misc/py-napari-svg/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}imageio>=2.5.0:graphics/py-imageio@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}vispy>=0.6.4:graphics/py-vispy@${PY_FLAVOR} USES= python diff --git a/misc/py-napari/Makefile b/misc/py-napari/Makefile index 04b51f99f334..97a050240717 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 864faa459aba..62e667590cf0 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c598fec888b6..0f8bcc103625 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a897e7137ddb..ab28f65da82b 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f69c9215a337..a34e49f526bb 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-onnxconverter-common/Makefile b/misc/py-onnxconverter-common/Makefile index d5689c1372fc..223d8cd7e155 100644 --- a/misc/py-onnxconverter-common/Makefile +++ b/misc/py-onnxconverter-common/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}onnx>0:misc/py-onnx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.20.2:devel/py-protobuf@${PY_FLAVOR} diff --git a/misc/py-openai-whisper/Makefile b/misc/py-openai-whisper/Makefile index f494362ac723..cc9188adca62 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a47476e0370c..3d3386d26ec1 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+= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 44508b295d75..5aa53cf15947 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ libopenvdb.so:misc/openvdb \ libtbb.so:devel/onetbb -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1184fedef286..25b87b98d66e 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 63507f40f150..fb88b874ae43 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 6bde32ce05ab..f251aa96d9b4 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/misc/py-pyEDFlib/Makefile b/misc/py-pyEDFlib/Makefile index 9fe1517cb1c7..b6eb875de571 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= fortran python USE_PYTHON= distutils cython autoplist diff --git a/misc/py-pymatreader/Makefile b/misc/py-pymatreader/Makefile index 67fe45df036b..ca1aa09afbeb 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 db571d6781f2..d57806883923 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 79784241e790..8e350209a969 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 e51be986f66d..c1a7044b7ee8 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 05599159d7d9..be76dc894726 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 80f42741689d..a1cc1cffa551 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 ed5d8c6adc48..d78556a09ab4 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f8a96d8fecfd..59c7dbcc3e56 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 94413b1e559b..b4dbc4074935 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 24b890c5f423..003e2db68407 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f41e873d877a..9741fb23a270 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 e8f216da15d7..10db0409438a 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 75bf37f2dbf5..aa3bde17c40f 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= pep517 autoplist pytest diff --git a/misc/py-thermocouples_reference/Makefile b/misc/py-thermocouples_reference/Makefile index 1876ce0b0d6e..c57389182b1d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1ecf3fee59a2..2b4536923168 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 884b5cbe0a7a..3753391488a3 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 81b83a47dc2e..6cd793eda701 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 4dd83ff01504..68a7c02af7c3 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 93d289fae796..37b2a7f1c937 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 83ac66a07693..ccf8446ef8a9 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 07c3e820366b..4f7d74ba6a96 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 8d3373a5ff9b..c988731e030e 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 e264d77e5a07..6c55cf872d67 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-vllm/Makefile b/misc/py-vllm/Makefile index 1a56e18195a9..37a1965ae201 100644 --- a/misc/py-vllm/Makefile +++ b/misc/py-vllm/Makefile @@ -48,7 +48,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.13.3:www/py-aiohttp@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}model-hosting-container-standards>=0.1.13:misc/py-model-hosting-container-standards@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgspec>0:devel/py-msgspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ninja>=1.13:devel/py-ninja@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.25:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.25:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openai>=2.0.0:misc/py-openai@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openai-harmony>=0.0.3:misc/py-openai-harmony@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}opentelemetry-api>=1.27.0:devel/py-opentelemetry-api@${PY_FLAVOR} \ diff --git a/misc/py-wurlitzer/Makefile b/misc/py-wurlitzer/Makefile index 545b427581a9..742fe2da5e21 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 b482f6fcb53a..43a7697d6440 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d7b1aca7fa80..09e237e3cb39 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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/py-xgrammar/Makefile b/misc/py-xgrammar/Makefile index 5bb4182f3db0..a5cddbc334d8 100644 --- a/misc/py-xgrammar/Makefile +++ b/misc/py-xgrammar/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0.10.0:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nanobind>=2.5.0:devel/py-nanobind@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>0:devel/py-pydantic2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>=1.10.0:misc/py-pytorch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}transformers>=4.38.0:misc/py-transformers@${PY_FLAVOR} \ diff --git a/misc/pytorch/Makefile b/misc/pytorch/Makefile index d7c5294e40ac..7eebae35abd6 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PYTHON_PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 36f19eca5fe7..7051c10e3efb 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 957e26f4703c..87d1d06bf664 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-moviepy/Makefile b/multimedia/py-moviepy/Makefile index d491585f1240..1a3018c4bf6d 100644 --- a/multimedia/py-moviepy/Makefile +++ b/multimedia/py-moviepy/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \ ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.2<6.0:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imageio>=2.5<3.0:graphics/py-imageio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0.2.0:graphics/py-imageio-ffmpeg@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.25.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.25.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}proglog>=0<1.0.0_99:devel/py-proglog@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=9.2.0<12.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dotenv>=0.10:www/py-python-dotenv@${PY_FLAVOR} diff --git a/multimedia/py-pretty_midi/Makefile b/multimedia/py-pretty_midi/Makefile index 5d34a3590344..978bab220d68 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 07ec02dea49c..5afb8b4c2c06 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 fc040225f6cd..e6f8e03fbd57 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= cmake:indirect compiler:c++17-lang python USE_PYTHON= pep517 autoplist pytest diff --git a/net-p2p/bazarr/Makefile b/net-p2p/bazarr/Makefile index 294efcdb1996..135f7c1d83ac 100644 --- a/net-p2p/bazarr/Makefile +++ b/net-p2p/bazarr/Makefile @@ -13,7 +13,7 @@ WWW= https://www.bazarr.media LICENSE= GPLv3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.3.0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>1.12.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>1.12.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=9.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webrtcvad>=2.0.10:audio/py-webrtcvad@${PY_FLAVOR} \ diff --git a/net/py-smart-open/Makefile b/net/py-smart-open/Makefile index 72051078dcec..bc0d6139b2f8 100644 --- a/net/py-smart-open/Makefile +++ b/net/py-smart-open/Makefile @@ -22,7 +22,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}awscli>=0:devel/py-awscli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-storage-blob>=0:devel/py-azure-storage-blob@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}boto3>=0:www/py-boto3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}google-cloud-storage>=2.6.0:www/py-google-cloud-storage@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyopenssl>=0,1:security/py-pyopenssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-benchmark>=0:devel/py-pytest-benchmark@${PY_FLAVOR} \ diff --git a/print/py-glyphtools/Makefile b/print/py-glyphtools/Makefile index 0dd50775c6bb..6c0706ea2aa2 100644 --- a/print/py-glyphtools/Makefile +++ b/print/py-glyphtools/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beziers>=0:graphics/py-beziers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}glyphsLib>=0:x11-fonts/py-glyphsLib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/science/abinit/Makefile b/science/abinit/Makefile index 099a63b63abf..b105df469596 100644 --- a/science/abinit/Makefile +++ b/science/abinit/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le BUILD_DEPENDS= gm4:devel/m4 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} @@ -30,7 +30,7 @@ LIB_DEPENDS= libelpa.so:math/elpa \ libnetcdff.so:science/netcdf-fortran RUN_DEPENDS= atompaw:science/atompaw TEST_DEPENDS= bash:shells/bash \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 de3828ee8c16..88c145424cf6 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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/bout++/Makefile b/science/bout++/Makefile index ee71768dcf59..d38ce26dcb94 100644 --- a/science/bout++/Makefile +++ b/science/bout++/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.2.1: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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.22.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.4.1:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>=1.5.1:math/py-sympy@${PY_FLAVOR} diff --git a/science/cantera/Makefile b/science/cantera/Makefile index 25d8b159eced..a9d580636a2a 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 e7978e954d5e..097128dc0208 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 53e21c08c2a8..ae736330a28e 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 7556cf970ab9..88e29c5b51f5 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 5e5323afe874..57f0ab152c9a 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 4582fd80ce4c..0c402e2fa9eb 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= blaslapack:openblas cmake:testing fortran python:test USE_LDCONFIG= yes diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 6334e82f4c6e..be55b9592d8f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 9be0a68d871e..219657b9ee1f 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= cmake blaslapack:openblas fortran pkgconfig python diff --git a/science/precice/Makefile b/science/precice/Makefile index 041b46bbcb69..64e9e88703da 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libmpicxx.so:net/mpich -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f2d8f3ce0a22..f02780809737 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1d54637749cd..f6184f454cd2 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-HofstadterTools/Makefile b/science/py-HofstadterTools/Makefile index 5f04ee03342a..f904fa307ce6 100644 --- a/science/py-HofstadterTools/Makefile +++ b/science/py-HofstadterTools/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} diff --git a/science/py-MDAnalysis/Makefile b/science/py-MDAnalysis/Makefile index fc5924e5d5ee..10b67c8d6d3f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=2.0:devel/py-packaging@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d29cf5c94e6e..90859afd57b6 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 0d7ae09cd963..797419095141 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 dbf2725f8f09..e10ede593c8e 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 0d649294863d..a74d034f8e0f 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 2cf5df597910..f869d14abb11 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 ffaaedbdf45f..aac69eb9de0d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/science/py-abipy/Makefile b/science/py-abipy/Makefile index 15ef1d3eb84e..3aaae4386a61 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-access/Makefile b/science/py-access/Makefile index 68ae2e52d65d..cecbfd18c919 100644 --- a/science/py-access/Makefile +++ b/science/py-access/Makefile @@ -16,7 +16,7 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}geopandas>=0:graphics/py-geopandas@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.3:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.3:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.23.4,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests@${PY_FLAVOR} diff --git a/science/py-arbor/Makefile b/science/py-arbor/Makefile index 5fead274bc14..6252f7d92d25 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c289667d6823..76907cf24902 100644 --- a/science/py-arch/Makefile +++ b/science/py-arch/Makefile @@ -14,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meson-python>0:devel/meson-python@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.4.0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}property-cached>=1.6.4:devel/py-property-cached@${PY_FLAVOR} \ diff --git a/science/py-asap3/Makefile b/science/py-asap3/Makefile index b5e6bb08430f..d735423cd009 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libmpich.so:net/mpich # not sure if this is used -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ase>=3.24.0:science/py-ase@${PY_FLAVOR} USES= localbase python diff --git a/science/py-asdf/Makefile b/science/py-asdf/Makefile index 19a032e787e6..6ec0b77fdd03 100644 --- a/science/py-asdf/Makefile +++ b/science/py-asdf/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asdf-standard>=1.1.0:science/py-asdf-standar ${PYTHON_PKGNAMEPREFIX}asdf-transform-schemas>=0.3:science/py-asdf-transform-schemas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}attrs>=22.2.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jmespath>=0.6.2:devel/py-jmespath@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.22:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=19:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}semantic-version>=2.8:devel/py-semantic-version@${PY_FLAVOR} diff --git a/science/py-ase/Makefile b/science/py-ase/Makefile index afe8d7f8862e..46271c812b1b 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 0dd6091dff6a..6f49a64314e7 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 ed92e7b9c2b6..6a8fa5bc9924 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1d9a06a7b614..9465ee3b031d 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-cfgrib/Makefile b/science/py-cfgrib/Makefile index 4b687a499f28..520f439ea7bc 100644 --- a/science/py-cfgrib/Makefile +++ b/science/py-cfgrib/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FL RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.2:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}eccodes>=0.9.8:science/py-eccodes@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dask>=0:devel/py-dask@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ diff --git a/science/py-chainer-chemistry/Makefile b/science/py-chainer-chemistry/Makefile index 957c2833e11e..68f1bb9ae350 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 bb0543f92a37..ceb9bd1928d9 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 fbc8d0044061..96beab2b6eae 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 9d4d4b1d5bab..092ac4182f12 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 68a23b74f487..fc49a5accf74 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= pkgconfig python USE_PYTHON= pep517 autoplist diff --git a/science/py-dimod/Makefile b/science/py-dimod/Makefile index e9f00b9033f4..04eb59e1c79e 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 e3a2e42de280..f0f55bf52a76 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 bae9a6edf3b3..bdcb5f7a39d0 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 cf73e25010ce..0481e7ac5d26 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 25a856d7d08f..b97bf6ddb7a6 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 415edaed89ff..bb567ccd2a02 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c8c9a57e069a..5f4319b03995 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f8426d108b2d..ae5c6a18b87f 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}meson-python>=0.18.0:devel/meson-python@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 8e22e440f4da..7fae682751c6 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 665b57950646..09b23bc5d1af 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 53b4bbaecc2e..9e3eb515932a 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c766f7dc2f41..9ea971c087a4 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-eccodes/Makefile b/science/py-eccodes/Makefile index e4f7c81bea0e..54bb819180b4 100644 --- a/science/py-eccodes/Makefile +++ b/science/py-eccodes/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libeccodes.so:science/eccodes RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}findlibs>=0:devel/py-findlibs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-flakes>=0:devel/py-pytest-flakes@${PY_FLAVOR} \ diff --git a/science/py-esda/Makefile b/science/py-esda/Makefile index f3986b7bf942..c1da2f9d780b 100644 --- a/science/py-esda/Makefile +++ b/science/py-esda/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}geopandas>=0.14:graphics/py-geopandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libpysal>=4.12:science/py-libpysal@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2.1,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.4:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.12,1:science/py-scipy@${PY_FLAVOR} \ diff --git a/science/py-geometer/Makefile b/science/py-geometer/Makefile index bfa8bde1fd51..c65412a56f9b 100644 --- a/science/py-geometer/Makefile +++ b/science/py-geometer/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.6.1<5.0.0:devel/py-typing-extensions@${PY_FLAVOR} USES= python diff --git a/science/py-geometric/Makefile b/science/py-geometric/Makefile index 93ea9ad24dcd..3890f2c3b993 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f8d58c601c46..69425c6a6adf 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a0abe8bc947a..3af05cfbbbfc 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils cython autoplist pytest diff --git a/science/py-h5json/Makefile b/science/py-h5json/Makefile index 7bdc69fe977c..514f9e6746a7 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} USES= python diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile index 440b33ddcad2..4cbc8d78b189 100644 --- a/science/py-h5py/Makefile +++ b/science/py-h5py/Makefile @@ -13,12 +13,12 @@ WWW= https://www.h5py.org/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/licenses/license.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.25.0<3:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.25.0<3,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pkgconfig>=1.5.5,1:devel/py-pkgconfig@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libhdf5.so:science/hdf5 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.21.2:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.21.2:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py>=3.1.2:net/py-mpi4py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tables>=3.4.4:devel/py-tables@${PY_FLAVOR} diff --git a/science/py-h5pyd/Makefile b/science/py-h5pyd/Makefile index 0099da2681d9..36dfd02f88b9 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f5094d2a1f9a..5a97732e485b 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1abea2acfeba..d61a44dc7d19 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-inequality/Makefile b/science/py-inequality/Makefile index 4f0737a72a51..f47595e7a0e3 100644 --- a/science/py-inequality/Makefile +++ b/science/py-inequality/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpysal>=4.12:science/py-libpysal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.8:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2.1,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.12:science/py-scipy@${PY_FLAVOR} diff --git a/science/py-ipygany/Makefile b/science/py-ipygany/Makefile index b3bfd46af451..15c8da1307d5 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 b8d987a3c764..74604f38a42e 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-kinematics/Makefile b/science/py-kinematics/Makefile index ee9301f08a0f..c1c98d8ab9fe 100644 --- a/science/py-kinematics/Makefile +++ b/science/py-kinematics/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} diff --git a/science/py-kliff/Makefile b/science/py-kliff/Makefile index 07070c7dfd0a..48b81ca41df2 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 3893da4c01bf..0539c41558e3 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}breathe>0:devel/py-breathe@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/science/py-libpysal/Makefile b/science/py-libpysal/Makefile index 8f95d4ae2823..be5aeb5df1c4 100644 --- a/science/py-libpysal/Makefile +++ b/science/py-libpysal/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.13.0:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}geopandas>=0.14.0:graphics/py-geopandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=23.2:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2.1.0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=3.11.0:devel/py-platformdirs@${PY_FLAVOR} \ diff --git a/science/py-lifelines/Makefile b/science/py-lifelines/Makefile index 472e75259c5c..d7e0aa1c7dba 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 acdec4f94038..48b14a326cac 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/science/py-meshio/Makefile b/science/py-meshio/Makefile index e58f25326083..3f5e64eed472 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 7c17c9b0b561..a6a6c62d7485 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/science/py-mne/Makefile b/science/py-mne/Makefile index 9245741a9520..3b12997d5f5c 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 b175972ecf83..f1c18f8d6dfb 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 5b4dae6a8652..e9f295f397b7 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 be6245c36fe2..6030ecca015d 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 b2436fddb58d..4091b174d837 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \ cmake:devel/cmake-core -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= pep517 concurrent autoplist diff --git a/science/py-neo/Makefile b/science/py-neo/Makefile index 10bc0ca202b9..185238e42993 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d9fdb0bec74a..69222746992b 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libhdf5.so:science/hdf5 \ libnetcdf.so:science/netcdf -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 785407947a69..dd82df4fff29 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 4b324568088d..b7f00ea47b4d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 08237a25d430..d53764c225bb 100644 --- a/science/py-obspy/Makefile +++ b/science/py-obspy/Makefile @@ -10,7 +10,7 @@ WWW= https://www.obspy.org/ LICENSE= LGPL3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 9a9a3a7412a1..f0ea51dd56b3 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a26bc0dadeba..13a57e33be3b 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 dcae07ab8245..b2c5dfe536f2 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 17d1ad2d5d2c..9202f010f721 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 962646a4c65a..110cdab01f91 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 3c8521b6c7ff..acf0b8b3d29d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 c15072cb915e..c2eaac425647 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 566821844f21..81c51a0002ba 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-pnetcdf/Makefile b/science/py-pnetcdf/Makefile index 8641f17e3e62..11f17d725348 100644 --- a/science/py-pnetcdf/Makefile +++ b/science/py-pnetcdf/Makefile @@ -12,13 +12,13 @@ WWW= https://github.com/Parallel-NetCDF/PnetCDF-Python LICENSE= MIT BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py-mpich>=3.1.4:net/py-mpi4py-mpich@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=23.1:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libpnetcdf.so:science/pnetcdf@mpich RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py-mpich>=3.1.4:net/py-mpi4py-mpich@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= localbase mpi:mpich python USE_PYTHON= autoplist concurrent cython cython_run pep517 diff --git a/science/py-pupynere/Makefile b/science/py-pupynere/Makefile index c9321166afd6..cdecd6895dd3 100644 --- a/science/py-pupynere/Makefile +++ b/science/py-pupynere/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/science/py-pyberny/Makefile b/science/py-pyberny/Makefile index 94bc48c73071..9473e6531ead 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 6803d0a1226f..67001795e8a6 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 3a0bdc49ac32..88212a7e30f0 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 131b538fd7a2..6a792c91a2b9 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f9239adffe0b..e41386e7d63d 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 b798992b3df8..fcb224407d68 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 e2bb2e2cd856..1807fb903d10 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 5d4d79883e36..9da31b27055a 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-pysal/Makefile b/science/py-pysal/Makefile index 7f3de6b4bf38..d95133c49819 100644 --- a/science/py-pysal/Makefile +++ b/science/py-pysal/Makefile @@ -26,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}access>=1.1.9:science/py-access@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}mapclassify>=2.10.0:graphics/py-mapclassify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mgwr>=2.2.1:graphics/py-mgwr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}momepy>=0.10.0:graphics/py-momepy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.22:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=22:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.4:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=2.0.2:devel/py-platformdirs@${PY_FLAVOR} \ diff --git a/science/py-pyscf/Makefile b/science/py-pyscf/Makefile index 3642b355c884..20653377b427 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-pyteomics/Makefile b/science/py-pyteomics/Makefile index b1444318f195..fb0ec5768e47 100644 --- a/science/py-pyteomics/Makefile +++ b/science/py-pyteomics/Makefile @@ -30,10 +30,10 @@ XML_DESC= XML support DF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=0.17,1:math/py-pandas@${PY_FLAVOR} GRAPHICS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} -TDA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} +TDA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} UNIMOD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=0:databases/py-sqlalchemy14@${PY_FLAVOR} XML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} .include diff --git a/science/py-qcelemental/Makefile b/science/py-qcelemental/Makefile index 663e0c4ee492..ecb2a9c3aa7a 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1dbb8a659526..96c54db933e1 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 42b10e6e9eb5..666d32da61c5 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 3dedb215ec6e..9c96b6b7160e 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 9dac8b5b3162..97e57ae037d2 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= python diff --git a/science/py-sarpy/Makefile b/science/py-sarpy/Makefile index b570e6aaa51a..f19ab8076557 100644 --- a/science/py-sarpy/Makefile +++ b/science/py-sarpy/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}deprecated>=0:devel/py-deprecated@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}h5py>=0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=4.1.1:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.19.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.19.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} diff --git a/science/py-scikit-fuzzy/Makefile b/science/py-scikit-fuzzy/Makefile index f73ad18c4ada..f15133da7ef5 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 9c07669673f5..fda9e6509055 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-optimize/Makefile b/science/py-scikit-optimize/Makefile index 4921bc731b44..016f07a304d7 100644 --- a/science/py-scikit-optimize/Makefile +++ b/science/py-scikit-optimize/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.2:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}joblib>=0.11:devel/py-joblib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.20.3:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.20.3:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyaml>=16.9:textproc/py-pyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.0.0:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/science/py-scikit-sparse/Makefile b/science/py-scikit-sparse/Makefile index 3912e67fc906..ec85ddd1d67e 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.19:science/py-scipy@${PY_FLAVOR} USES= fortran python diff --git a/science/py-scimath/Makefile b/science/py-scimath/Makefile index d04b813275af..3836354ed405 100644 --- a/science/py-scimath/Makefile +++ b/science/py-scimath/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LGPL3 LICENSE_COMB= dual BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=0:devel/py-traits@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile index 12c32344888a..d20b54eddc3f 100644 --- a/science/py-scipy/Makefile +++ b/science/py-scipy/Makefile @@ -22,10 +22,10 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meson-python>=0.15.0:devel/meson-python@${ ${PYTHON_PKGNAMEPREFIX}pybind11>=2.13.2:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pythran>=0.14.0:devel/py-pythran@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.4:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.4:math/py-numpy@${PY_FLAVOR} \ boost-libs>=1.89.0:devel/boost-libs LIB_DEPENDS= libqhull_r.so:math/qhull -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.4:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.4:math/py-numpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ diff --git a/science/py-scoria/Makefile b/science/py-scoria/Makefile index 4352ed8e61c2..a49353896bfb 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 1874d7edfd05..5cfd7df75069 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 d6ebac531bff..6aca6f3d8649 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spglib>=1.14.1:science/py-spglib@${PY_FLAVOR} USES= python diff --git a/science/py-segregation/Makefile b/science/py-segregation/Makefile index 80ff2ce11520..3b863be9e795 100644 --- a/science/py-segregation/Makefile +++ b/science/py-segregation/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}deprecation>=0:devel/py-deprecation@${PY_FLA ${PYTHON_PKGNAMEPREFIX}mapclassify>=0:graphics/py-mapclassify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numba>=0:devel/py-numba@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=3:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.21.3:science/py-scikit-learn@${PY_FLAVOR} \ diff --git a/science/py-segyio/Makefile b/science/py-segyio/Makefile index eede8cd65602..b022576588ed 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= compiler:c++11-lang python USE_PYTHON= distutils autoplist pytest diff --git a/science/py-sklearn-pandas/Makefile b/science/py-sklearn-pandas/Makefile index 6405e10d90e4..b07e90d4d5ec 100644 --- a/science/py-sklearn-pandas/Makefile +++ b/science/py-sklearn-pandas/Makefile @@ -15,7 +15,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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.18.1:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.18.1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.1.4,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.23.0:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.5.1:science/py-scipy@${PY_FLAVOR} diff --git a/science/py-skrebate/Makefile b/science/py-skrebate/Makefile index 62e74301a741..d5af96e880d5 100644 --- a/science/py-skrebate/Makefile +++ b/science/py-skrebate/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= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} diff --git a/science/py-spaghetti/Makefile b/science/py-spaghetti/Makefile index 1325018c6333..9a66933839a3 100644 --- a/science/py-spaghetti/Makefile +++ b/science/py-spaghetti/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}esda>=2.1:science/py-esda@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}geopandas>=0.12:graphics/py-geopandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libpysal>=4.6:science/py-libpysal@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.22:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.4,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rtree>=1.0:devel/py-rtree@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.8:science/py-scipy@${PY_FLAVOR} \ diff --git a/science/py-spglib/Makefile b/science/py-spglib/Makefile index 0b6ceb55c477..928230be8d32 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PY_SETUPTOOLS} LIB_DEPENDS= libsymspg.so:science/spglib -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 47d139ffec58..c6be25f53efa 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-tensorflow/Makefile b/science/py-tensorflow/Makefile index fe9c1cae5867..3217b51810c2 100644 --- a/science/py-tensorflow/Makefile +++ b/science/py-tensorflow/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grpcio-tools>=1.22.0:devel/py-grpcio-tools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.22.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ bash:shells/bash \ bazel:devel/bazel7 \ @@ -45,7 +45,7 @@ RUN_DEPENDS= pybind11>=2.6.2:devel/pybind11 \ ${PYTHON_PKGNAMEPREFIX}gast>=0.2.1:devel/py-gast@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}google-pasta>=0.1.1:devel/py-google-pasta@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h5py>=2.9.0:science/py-h5py@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.22.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.22.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.20.3:devel/py-protobuf@${PY_FLAVOR} \ diff --git a/science/py-thewalrus/Makefile b/science/py-thewalrus/Makefile index bed094fb332a..17ef42ea8794 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-tobler/Makefile b/science/py-tobler/Makefile index a66aa7313f3d..01a4410f43ca 100644 --- a/science/py-tobler/Makefile +++ b/science/py-tobler/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}geopandas>=1.0:graphics/py-geopandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}joblib>=1.4:devel/py-joblib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libpysal>=4.10:science/py-libpysal@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2.2,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rasterio>=1.4:graphics/py-rasterio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rasterstats>=0.20:graphics/py-rasterstats@${PY_FLAVOR} \ diff --git a/science/py-trainstation/Makefile b/science/py-trainstation/Makefile index b7d64b57fc64..4589f89bdd9b 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +xBUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 abac4bdcec1a..611e42bb6744 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 6e487091b1f9..c51f9d685af8 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 6813eaa3b099..70211289c6fc 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 bdbef78a14ea..a8fc299d87ea 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/science/qmcpack/Makefile b/science/qmcpack/Makefile index bfd7c9141a50..94875ad209b8 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +NEXUS_PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 62246de7dc79..9e32b1c39b57 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} PYTHON_LIB_DEPENDS= ${PY_BOOST} -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 68465035eac5..1a227cc15325 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 6c36778ceaad..f18e9a7f19a4 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PYTHON_PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 a564917f61c0..8386e38a0204 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 beaf3e6389bb..ae12f94cdd6e 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= ${PY_BOOST} \ libboost_thread.so:devel/boost-libs RUN_DEPENDS= gnuplot:math/gnuplot \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= cmake compiler:c++0x fortran localbase python diff --git a/science/tfel/Makefile b/science/tfel/Makefile index 6570b3866487..4ac953c8cbf2 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} PYTHON_LIB_DEPENDS= ${PY_BOOST} \ libboost_thread.so:devel/boost-libs -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 494f20183ea0..917b2d3c088b 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 61fef2b9bb1a..3cc5bc5985a6 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f45195c8e860..c64bfa9f0b09 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 818ec2f3855d..7d54ec9c467c 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfltk.so:x11-toolkits/fltk \ libnetcdf.so:science/netcdf -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 00c6a4de33b1..1fa63b2b85d5 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 78837d0f7e0c..2dde2a69324a 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 19a7f8e064e8..966aa870362c 100644 --- a/science/yoda/Makefile +++ b/science/yoda/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= bash:shells/bash \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} USES= compiler:c++11-lang gettext-runtime gmake libtool shebangfix diff --git a/security/caldera/Makefile b/security/caldera/Makefile index dff32d85d0bc..132dfac25c03 100644 --- a/security/caldera/Makefile +++ b/security/caldera/Makefile @@ -45,7 +45,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webdriver_manager>0:www/py-webdriver_manager@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}croniter2>0:sysutils/py-croniter2@${PY_FLAVOR} \ upx>0:archivers/upx \ base64>0:converters/base64 \ diff --git a/security/howdy/Makefile b/security/howdy/Makefile index a5fde52de877..904bd330c6ef 100644 --- a/security/howdy/Makefile +++ b/security/howdy/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= opencv>0:graphics/opencv \ ${PYTHON_PKGNAMEPREFIX}python-pam>0:security/py-python-pam@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dlib>0:science/py-dlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${LOCALBASE}/share/dlib-models/shape_predictor_5_face_landmarks.dat:misc/dlib-models USES= python:run shebangfix diff --git a/textproc/py-elasticsearch6/Makefile b/textproc/py-elasticsearch6/Makefile index c3bc92bed5a6..aeb87103532a 100644 --- a/textproc/py-elasticsearch6/Makefile +++ b/textproc/py-elasticsearch6/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1,1:net/py-urllib3@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} diff --git a/textproc/py-gensim/Makefile b/textproc/py-gensim/Makefile index 18be9e023d90..9435b4204cf5 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 f6893cec77dd..165561937f82 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= saffsd diff --git a/textproc/py-llguidance/Makefile b/textproc/py-llguidance/Makefile index 3cdff1ecd099..1e34089f1345 100644 --- a/textproc/py-llguidance/Makefile +++ b/textproc/py-llguidance/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>=1.0:devel/py-maturin@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}transformers>0:misc/py-transformers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tiktoken>0:textproc/py-tiktoken@${PY_FLAVOR} \ diff --git a/textproc/py-pdf2docx/Makefile b/textproc/py-pdf2docx/Makefile index 5e33dac0793a..14592e9b2b92 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-petl/Makefile b/textproc/py-petl/Makefile index dad18f7a17a2..5593a96f91d9 100644 --- a/textproc/py-petl/Makefile +++ b/textproc/py-petl/Makefile @@ -41,13 +41,13 @@ WHOOSH_DESC= Whoosh support AVRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fastavro>=0.24.0:textproc/py-fastavro@${PY_FLAVOR} DB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.6<2.0:databases/py-sqlalchemy14@${PY_FLAVOR} HDF5_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.6.9:math/py-numexpr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16.4:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.4:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tables>=3.5.2:devel/py-tables@${PY_FLAVOR} HDF5_USE_PYTHON= cython_run HTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.6.2:www/py-aiohttp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} INTERVAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}intervaltree>=3.0.2:devel/py-intervaltree@${PY_FLAVOR} -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16.4:math/py-numpy1@${PY_FLAVOR} +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.4:math/py-numpy@${PY_FLAVOR} PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2,1:math/py-pandas@${PY_FLAVOR} REMOTE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fsspec>=0.7.4:filesystems/py-fsspec@${PY_FLAVOR} SMB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}smbprotocol>=1.0.1:net/py-smbprotocol@${PY_FLAVOR} diff --git a/textproc/py-python-lsp-server/Makefile b/textproc/py-python-lsp-server/Makefile index 1ac4df951938..7d2a977aa48f 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 04345fefff6d..138730d5a844 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} USES= python diff --git a/textproc/py-sense2vec/Makefile b/textproc/py-sense2vec/Makefile index 8e3605ef4d2f..6d978240a99a 100644 --- a/textproc/py-sense2vec/Makefile +++ b/textproc/py-sense2vec/Makefile @@ -15,7 +15,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= ${PYTHON_PKGNAMEPREFIX}catalogue>=2.0.1<2.1.0:devel/py-catalogue@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.15.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.15.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spacy>=3.0.0<4.0.0:textproc/py-spacy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}srsly>=2.4.0<3.0.0:devel/py-srsly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wasabi>=0.8.1<1.2.0:textproc/py-wasabi@${PY_FLAVOR} diff --git a/textproc/py-spacy/Makefile b/textproc/py-spacy/Makefile index 8f08dac5916e..b4adf3d9eabc 100644 --- a/textproc/py-spacy/Makefile +++ b/textproc/py-spacy/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cymem>=2.0.2<2.1.0:devel/py-cymem@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}murmurhash>=0.28.0<1.1.0:devel/py-murmurhash@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.19.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.19.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}preshed3>=3.0.2<3.1.0:devel/py-preshed3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}thinc8>=8.3.4<8.4.0:devel/py-thinc8@${PY_FLAVOR} \ @@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}catalogue>=2.0.6<2.1.0:devel/py-catalogue@${ ${PYTHON_PKGNAMEPREFIX}cymem>=2.0.2<2.1.0:devel/py-cymem@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}murmurhash>=0.28.0<1.1.0:devel/py-murmurhash@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.19.0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.19.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}preshed3>=3.0.2<3.1.0:devel/py-preshed3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>=1.7.4<3.0.0:devel/py-pydantic2@${PY_FLAVOR} \ diff --git a/textproc/py-textdistance/Makefile b/textproc/py-textdistance/Makefile index 6d37bf5e0016..ade3e0adafd1 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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-textual-fastdatatable/Makefile b/textproc/py-textual-fastdatatable/Makefile index 3a8718922502..48096eef7ded 100644 --- a/textproc/py-textual-fastdatatable/Makefile +++ b/textproc/py-textual-fastdatatable/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=1.28.0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.26.4:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.26.4:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=2.3.3,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyarrow>=21.0.0:databases/py-pyarrow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}textual>=0.89.1:textproc/py-textual@${PY_FLAVOR} \ diff --git a/textproc/py-tokenizers/Makefile b/textproc/py-tokenizers/Makefile index 348f19cf3e3e..4e592144d79a 100644 --- a/textproc/py-tokenizers/Makefile +++ b/textproc/py-tokenizers/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>=1.0<2.0:devel/py-maturin@${PY_FLA LIB_DEPENDS= libonig.so:devel/oniguruma RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}huggingface-hub>=0.16.4<2.0:misc/py-huggingface-hub@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}datasets>0:misc/py-datasets@${PY_FLAVOR} USES= cargo python diff --git a/textproc/py-wordcloud/Makefile b/textproc/py-wordcloud/Makefile index a3bff40986e9..2fa3ea192aea 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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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 cfc98e756c26..1b7d46e6120a 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} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${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/www/py-folium/Makefile b/www/py-folium/Makefile index 66389b63eced..9206eb7291e9 100644 --- a/www/py-folium/Makefile +++ b/www/py-folium/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=41.2:devel/py-setuptools@${PY_ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}branca>=0.6.0:www/py-branca@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xyzservices>=0:www/py-xyzservices@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} diff --git a/www/py-quilt3/Makefile b/www/py-quilt3/Makefile index a24f98bda7d7..d4b212c95b87 100644 --- a/www/py-quilt3/Makefile +++ b/www/py-quilt3/Makefile @@ -35,7 +35,7 @@ ANNDATA_DESC= Annotated data support PYARROW_DESC= Apache Arrow support ANNDATA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}anndata>=0.8.0:devel/py-anndata@${PY_FLAVOR} -PYARROW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=1.14.0:math/py-numpy1@${PY_FLAVOR} \ +PYARROW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.14.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.19.2,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyarrow>=0.14.1:databases/py-pyarrow@${PY_FLAVOR} diff --git a/www/py-sentinelhub/Makefile b/www/py-sentinelhub/Makefile index 14e9aefb3a8d..cddcb63be6ba 100644 --- a/www/py-sentinelhub/Makefile +++ b/www/py-sentinelhub/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVO RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aenum>=2.1.4:devel/py-aenum@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dataclasses-json>=0:devel/py-dataclasses-json@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oauthlib>=0:security/py-oauthlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=9.2.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.2.0:graphics/py-pyproj@${PY_FLAVOR} \ diff --git a/www/py-streamlit/Makefile b/www/py-streamlit/Makefile index fda9b5c9f20d..db1f7ab829f2 100644 --- a/www/py-streamlit/Makefile +++ b/www/py-streamlit/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altair>0:graphics/py-altair@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cachetools>0:devel/py-cachetools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ diff --git a/x11-toolkits/py-magicgui/Makefile b/x11-toolkits/py-magicgui/Makefile index 53efa093b7c8..0fd21e146c39 100644 --- a/x11-toolkits/py-magicgui/Makefile +++ b/x11-toolkits/py-magicgui/Makefile @@ -30,7 +30,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}annotated-types>0:devel/py-annotated-types@ ${PYTHON_PKGNAMEPREFIX}ipykernel>0:devel/py-ipykernel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>0:math/py-numpy1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=4.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pint>=0.13.0:devel/py-pint@${PY_FLAVOR} \ diff --git a/x11-toolkits/py-wxpython/Makefile b/x11-toolkits/py-wxpython/Makefile index de09e9ca32c5..4f89abb707de 100644 --- a/x11-toolkits/py-wxpython/Makefile +++ b/x11-toolkits/py-wxpython/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.26.0:www/py-requests@${PY_FLAV ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ ${PY_TYPING_EXTENSIONS} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ ${PY_TYPING_EXTENSIONS} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.26.0:www/py-requests@${PY_FLAVOR} \ @@ -31,7 +31,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jquery>=0:textproc/py-sphinxcontrib-jquery@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR} \ ${PY_TYPING_EXTENSIONS} \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=0:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} USES= compiler:c++11-lib localbase pkgconfig pyqt:6 python USE_WX= 3.2 diff --git a/x11/py-xdot/Makefile b/x11/py-xdot/Makefile index 7568297b2073..70637c502971 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 \ - ${PYTHON_PKGNAMEPREFIX}numpy1>=1.16:math/py-numpy1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} USES= gnome python USE_GNOME= cairo gtk30 pygobject3