Attachment 235012 Details for Bug 264837 – Update to 1.23.0(fix 2 ports broken)

Update to 1.23.0(fix 2 ports broken)

numpy-1.23.0-p3.diff.txt (text/plain), 3.99 KB, created by Wen Heping on 2022-07-01 07:30:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wen Heping

Created: 2022-07-01 07:30:40 UTC

Size: 3.99 KB

patch

obsolete

>diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
>index 5c75f4c86f..9465a89bd7 100644
>--- a/Mk/Uses/python.mk
>+++ b/Mk/Uses/python.mk
>@@ -712,7 +712,7 @@ CMAKE_ARGS+=	-DPython_ADDITIONAL_VERSIONS=${PYTHON_VER}
> 
> # Python 3rd-party modules
> PYGAME=		${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}
>-PYNUMPY=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.23,1:math/py-numpy@${PY_FLAVOR}
>+PYNUMPY=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.24,1:math/py-numpy@${PY_FLAVOR}
> 
> # Common Python modules that can be needed but only for some versions of Python.
> .  if ${PYTHON_REL} < 30500
>diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
>index 25ee166e1c..3db875fc33 100644
>--- a/astro/astrometry/Makefile
>+++ b/astro/astrometry/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	astrometry
> PORTVERSION=	0.89
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	astro
> MASTER_SITES=	http://astrometry.net/downloads/
> DISTNAME=	${PORTNAME}.net-${PORTVERSION}
>diff --git a/astro/astrometry/pkg-plist b/astro/astrometry/pkg-plist
>index f0a1c6e9e2..55ec604c22 100644
>--- a/astro/astrometry/pkg-plist
>+++ b/astro/astrometry/pkg-plist
>@@ -220,7 +220,6 @@ lib/python/astrometry/sdss/yanny.py
> lib/python/astrometry/solver/__init__.py
> lib/python/astrometry/util/EXIF.py
> lib/python/astrometry/util/__init__.py
>-lib/python/astrometry/util/_util%%PYTHON_EXT_SUFFIX%%.so
> lib/python/astrometry/util/addpath.py
> lib/python/astrometry/util/file.py
> lib/python/astrometry/util/filetype.py
>diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
>index ea44004169..64ab4daf77 100644
>--- a/math/py-numpy/Makefile
>+++ b/math/py-numpy/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Tony Maher
> 
> PORTNAME=	numpy
>-PORTVERSION=	1.22.4
>-PORTREVISION=	1
>+PORTVERSION=	1.23.0
> PORTEPOCH=	1
> CATEGORIES=	math python
> MASTER_SITES=	CHEESESHOP \
>@@ -21,9 +20,9 @@ LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=6.2.5:devel/py-pytest@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}hypothesis>=6.24.1:devel/py-hypothesis@${PY_FLAVOR}
>-
>-USES=		compiler:c11 cpe fortran python:3.8-3.10 zip
>+		${PYTHON_PKGNAMEPREFIX}hypothesis>=6.24.1:devel/py-hypothesis@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.2.0:devel/py-typing-extensions@${PY_FLAVOR}
>+USES=		compiler:c11 cpe fortran python:3.8-3.10
> USE_PYTHON=	allflavors autoplist concurrent cython distutils
> 
> GCCLIBDIR_CMDS=	${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.so//
>diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
>index dd62754a09..2f184cb881 100644
>--- a/math/py-numpy/distinfo
>+++ b/math/py-numpy/distinfo
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1653520879
>-SHA256 (numpy-1.22/numpy-1.22.4.zip) = 425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af
>-SIZE (numpy-1.22/numpy-1.22.4.zip) = 11458830
>-SHA256 (numpy-1.22/numpy-ref.pdf) = f77c8595798c000ef648155347c2f76fd1a89e87e76ccbb01298aecda4e8c99e
>-SIZE (numpy-1.22/numpy-ref.pdf) = 7537545
>-SHA256 (numpy-1.22/numpy-user.pdf) = 0ad5c0ed5bf8a7320ae560a87b89cf43d3a44f0d003ae3fe1bb8a5721cdf0e90
>-SIZE (numpy-1.22/numpy-user.pdf) = 3993043
>+TIMESTAMP = 1656608077
>+SHA256 (numpy-1.23/numpy-1.23.0.tar.gz) = bd3fa4fe2e38533d5336e1272fc4e765cabbbde144309ccee8675509d5cd7b05
>+SIZE (numpy-1.23/numpy-1.23.0.tar.gz) = 10714532
>+SHA256 (numpy-1.23/numpy-ref.pdf) = f493c1cae879a4e0038bec400d349fc34aafa164e1462118bdf18b25a3a07daf
>+SIZE (numpy-1.23/numpy-ref.pdf) = 7715485
>+SHA256 (numpy-1.23/numpy-user.pdf) = 3978da15c6a1b00f2737c75458db0cc0fe636ae90b72723a8ff609d40e9b7599
>+SIZE (numpy-1.23/numpy-user.pdf) = 4123384
>diff --git a/science/py-geometer/Makefile b/science/py-geometer/Makefile
>index f456bf05ce..9b46bba777 100644
>--- a/science/py-geometer/Makefile
>+++ b/science/py-geometer/Makefile
>@@ -12,7 +12,7 @@ COMMENT=	Python geometry package based on projective geometry and numpy
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.15,1<1.23,1:math/py-numpy@${PY_FLAVOR}
>+RUN_DEPENDS=	${PYNUMPY}
> 
> USES=		python:3.7+
> USE_PYTHON=	autoplist concurrent distutils

Actions: View

Attachments on bug 264837: 234877 | 234923 | 234924 | 235012