CVS commit: pkgsrc/math/py-astropy

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Jun 25 15:13:07 UTC 2024

Modified Files:
        pkgsrc/math/py-astropy: distinfo
Added Files:
        pkgsrc/math/py-astropy/patches: patch-astropy_wcs_setup__package.py

Log Message:
py-astropy: fix builds with py-setuptools >= 70


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/py-astropy/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/py-astropy/patches/patch-astropy_wcs_setup__package.py

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

Modified files:

Index: pkgsrc/math/py-astropy/distinfo
diff -u pkgsrc/math/py-astropy/distinfo:1.7 pkgsrc/math/py-astropy/distinfo:1.8
--- pkgsrc/math/py-astropy/distinfo:1.7 Fri Oct 20 14:16:35 2023
+++ pkgsrc/math/py-astropy/distinfo     Tue Jun 25 15:13:07 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2023/10/20 14:16:35 adam Exp $
+$NetBSD: distinfo,v 1.8 2024/06/25 15:13:07 gutteridge Exp $
 
 BLAKE2s (astropy-5.3.4.tar.gz) = 2cac6c3496848cafb28408cad365d174463783a782bd334b447e9f303f96b307
 SHA512 (astropy-5.3.4.tar.gz) = eede24edeb04603ef92c48e040223fe05e12c510873022a2683bb08793b406d95ccbf284f3a46479658144b3f8cbfc6a32ac1bcb6ac5870449630069cfe67842
 Size (astropy-5.3.4.tar.gz) = 7811582 bytes
+SHA1 (patch-astropy_wcs_setup__package.py) = c9f00d41cb8a27845ba0aa6c7964ece9c485f325

Added files:

Index: pkgsrc/math/py-astropy/patches/patch-astropy_wcs_setup__package.py
diff -u /dev/null pkgsrc/math/py-astropy/patches/patch-astropy_wcs_setup__package.py:1.1
--- /dev/null   Tue Jun 25 15:13:07 2024
+++ pkgsrc/math/py-astropy/patches/patch-astropy_wcs_setup__package.py  Tue Jun 25 15:13:07 2024
@@ -0,0 +1,34 @@
+$NetBSD: patch-astropy_wcs_setup__package.py,v 1.1 2024/06/25 15:13:07 gutteridge Exp $
+
+Fix builds with py-setuptools >= 70.
+Borrowed from upstream commits
+https://github.com/astropy/astropy/commit/f9483152a6f7a20512392ed6c8d272a297c070d6
+https://github.com/astropy/astropy/commit/5dc050cda25006b4b45af54aead62a8bf760498e
+
+--- astropy/wcs/setup_package.py.orig  2023-10-04 16:45:13.000000000 +0000
++++ astropy/wcs/setup_package.py
+@@ -7,10 +7,10 @@ import shutil
+ import sys
+ from collections import defaultdict
+ from os.path import join
++from pathlib import Path
+ 
+ import numpy
+ from setuptools import Extension
+-from setuptools.dep_util import newer_group
+ 
+ from extension_helpers import get_compiler, import_file, pkg_config, write_if_different
+ 
+@@ -342,9 +342,9 @@ def get_extensions():
+         or int(os.environ.get("ASTROPY_USE_SYSTEM_ALL", 0))
+     ):
+         for header in wcslib_headers:
+-            source = join("cextern", "wcslib", "C", header)
+-            dest = join("astropy", "wcs", "include", "wcslib", header)
+-            if newer_group([source], dest, "newer"):
++            source = Path("cextern", "wcslib", "C", header)
++            dest = Path("astropy", "wcs", "include", "wcslib", header)
++            if not dest.is_file() or source.stat().st_mtime > dest.stat().st_mtime:
+                 shutil.copy(source, dest)
+ 
+     return [Extension("astropy.wcs._wcs", **cfg)]