CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Apr 15 11:37:46 UTC 2022

Modified Files:
        pkgsrc/devel/py-h5py: Makefile
        pkgsrc/geography/py-gdal: Makefile
        pkgsrc/geography/qgis: Makefile
        pkgsrc/graphics/py-OpenGL: Makefile
        pkgsrc/graphics/py-OpenGL-accelerate: Makefile
        pkgsrc/math/py-Keras-Applications: Makefile
        pkgsrc/math/py-netCDF4: Makefile
        pkgsrc/time/py-cftime: Makefile

Log Message:
*: Mark various packages incompatible with Python 3.7 due to numpy


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-h5py/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/geography/py-gdal/Makefile
cvs rdiff -u -r1.141 -r1.142 pkgsrc/geography/qgis/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/graphics/py-OpenGL/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/py-OpenGL-accelerate/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-Keras-Applications/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/math/py-netCDF4/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/time/py-cftime/Makefile

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

Modified files:

Index: pkgsrc/devel/py-h5py/Makefile
diff -u pkgsrc/devel/py-h5py/Makefile:1.12 pkgsrc/devel/py-h5py/Makefile:1.13
--- pkgsrc/devel/py-h5py/Makefile:1.12  Tue Jan  4 20:53:09 2022
+++ pkgsrc/devel/py-h5py/Makefile       Fri Apr 15 11:37:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:53:09 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/04/15 11:37:46 nia Exp $
 
 DISTNAME=      h5py-3.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=     ${PYPKGPREFIX}-six-[0-9]*:../.
 
 MAKE_ENV=      HDF5_DIR=${PREFIX}
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  27 37 # numpy
 
 BUILDLINK_API_DEPENDS.hdf5+=   hdf5>=1.10
 .include "../../devel/hdf5/buildlink3.mk"

Index: pkgsrc/geography/py-gdal/Makefile
diff -u pkgsrc/geography/py-gdal/Makefile:1.45 pkgsrc/geography/py-gdal/Makefile:1.46
--- pkgsrc/geography/py-gdal/Makefile:1.45      Mon Mar 14 15:10:16 2022
+++ pkgsrc/geography/py-gdal/Makefile   Fri Apr 15 11:37:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2022/03/14 15:10:16 gdt Exp $
+# $NetBSD: Makefile,v 1.46 2022/04/15 11:37:46 nia Exp $
 
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ BUILD_DIRS=   swig/python
 
 MAKE_FILE=     GNUmakefile
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  27 37
 
 REPLACE_PYTHON+=       swig/python/scripts/*py
 

Index: pkgsrc/geography/qgis/Makefile
diff -u pkgsrc/geography/qgis/Makefile:1.141 pkgsrc/geography/qgis/Makefile:1.142
--- pkgsrc/geography/qgis/Makefile:1.141        Sun Apr  3 18:50:18 2022
+++ pkgsrc/geography/qgis/Makefile      Fri Apr 15 11:37:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2022/04/03 18:50:18 adam Exp $
+# $NetBSD: Makefile,v 1.142 2022/04/15 11:37:46 nia Exp $
 
 # This is intentionally 3.22 Long Term Release.  Please do not update
 # to later branches, and instead discuss whether/how we want multiple
@@ -63,7 +63,7 @@ CMAKE_ARGS+=          -DSIP_BINARY_PATH:PATH=${B
 CMAKE_ARGS+=           -DWITH_INTERNAL_MARKUPSAFE=FALSE
 
 .include "../../lang/python/application.mk"
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  27 37 # py-gdal
 
 DEPENDS+=      ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2

Index: pkgsrc/graphics/py-OpenGL/Makefile
diff -u pkgsrc/graphics/py-OpenGL/Makefile:1.36 pkgsrc/graphics/py-OpenGL/Makefile:1.37
--- pkgsrc/graphics/py-OpenGL/Makefile:1.36     Tue Jan  4 20:54:03 2022
+++ pkgsrc/graphics/py-OpenGL/Makefile  Fri Apr 15 11:37:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2022/01/04 20:54:03 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2022/04/15 11:37:46 nia Exp $
 
 DISTNAME=      PyOpenGL-3.1.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^Py//}
@@ -20,7 +20,7 @@ USE_LANGUAGES=        # none
 
 REPLACE_PYTHON+=       OpenGL/arrays/buffers.py
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=  27 37 # py-numpy
 
 do-test:
        cd ${WRKSRC} && ${PYTHONBIN} tests/test_core.py

Index: pkgsrc/graphics/py-OpenGL-accelerate/Makefile
diff -u pkgsrc/graphics/py-OpenGL-accelerate/Makefile:1.7 pkgsrc/graphics/py-OpenGL-accelerate/Makefile:1.8
--- pkgsrc/graphics/py-OpenGL-accelerate/Makefile:1.7   Thu Jan 27 08:35:28 2022
+++ pkgsrc/graphics/py-OpenGL-accelerate/Makefile       Fri Apr 15 11:37:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/01/27 08:35:28 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/04/15 11:37:46 nia Exp $
 
 DISTNAME=      PyOpenGL-accelerate-3.1.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^Py//}
@@ -12,7 +12,7 @@ COMMENT=      Acceleration code for PyOpenGL
 # There are many similar licenses, see license.txt
 LICENSE=       modified-bsd AND mit
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=  27 37 # py-numpy
 
 pre-build:
        cd ${WRKSRC}/src && for i in *.pyx; do cython-${PYVERSSUFFIX} $$i; done

Index: pkgsrc/math/py-Keras-Applications/Makefile
diff -u pkgsrc/math/py-Keras-Applications/Makefile:1.4 pkgsrc/math/py-Keras-Applications/Makefile:1.5
--- pkgsrc/math/py-Keras-Applications/Makefile:1.4      Tue Jan  4 20:54:11 2022
+++ pkgsrc/math/py-Keras-Applications/Makefile  Fri Apr 15 11:37:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:11 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/04/15 11:37:46 nia Exp $
 
 DISTNAME=      Keras_Applications-1.0.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -16,7 +16,7 @@ DEPENDS+=     ${PYPKGPREFIX}-numpy>=1.9.1:..
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-h5py
+PYTHON_VERSIONS_INCOMPATIBLE=  27 37 # py-h5py
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/py-netCDF4/Makefile
diff -u pkgsrc/math/py-netCDF4/Makefile:1.19 pkgsrc/math/py-netCDF4/Makefile:1.20
--- pkgsrc/math/py-netCDF4/Makefile:1.19        Wed Jan  5 15:41:14 2022
+++ pkgsrc/math/py-netCDF4/Makefile     Fri Apr 15 11:37:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/01/05 15:41:14 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/04/15 11:37:46 nia Exp $
 
 DISTNAME=      netCDF4-1.5.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -21,7 +21,7 @@ SUBST_SED.paths+=     -e 's,/usr/local,${PRE
 SUBST_FILES.paths+=    setup.py
 SUBST_MESSAGE.paths=   Fixing header search paths.
 
-PYTHON_VERSIONS_INCOMPATIBLE+= 27 # py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE+= 27 37 # py-numpy
 
 USE_PKG_RESOURCES=     yes
 

Index: pkgsrc/time/py-cftime/Makefile
diff -u pkgsrc/time/py-cftime/Makefile:1.8 pkgsrc/time/py-cftime/Makefile:1.9
--- pkgsrc/time/py-cftime/Makefile:1.8  Tue Jan  4 20:55:11 2022
+++ pkgsrc/time/py-cftime/Makefile      Fri Apr 15 11:37:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:55:11 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/04/15 11:37:46 nia Exp $
 
 DISTNAME=      cftime-1.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ LICENSE=      gnu-gpl-v3
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-numpy
+PYTHON_VERSIONS_INCOMPATIBLE=  27 37 # py-numpy
 
 TEST_ENV+=     PYTHONPATH=build/lib
 do-test: