Merge pull request #2 from GalSim-developers/merge-main

test: merge main into tests

Author: beckermr

.github/workflows/ci.yml

@@ -84,7 +84,7 @@ jobs:
 
                 # Easier if eigen is installed with apt-get, but on at least one system, check that
                 # it gets downloaded and installed properly if it isn't installed.
-                if ${{ matrix.py != 3.7 }}; then sudo -H apt install -y libeigen3-dev; fi
+                if ${{ matrix.py != 3.12 }}; then sudo -H apt install -y libeigen3-dev; fi
 
                 # Need this for the mpeg tests
                 sudo -H apt install -y ffmpeg
@@ -125,7 +125,7 @@ jobs:
 
                 # Do these three first to clarify potential conflicts
                 pip install -U numpy
-                pip install -U "setuptools<72"
+                pip install -U setuptools
                 pip install -U wheel
 
                 # Standard dependencies
@@ -137,13 +137,15 @@ jobs:
 
                 pip install -U matplotlib
 
-            - name: Install astroplan
-              # astroplan isn't yet numpy 2.0 compatible.  So don't install that on 3.9+.
-              # I'm also getting errors with starlink, which I think may be related to
-              # numpy 2.0.
-              if: (matrix.py == 3.8) || (matrix.py == 3.9)
-              run: |
                 pip install -U astroplan
+
+            # Starlink doesn't seem to work anymore.  Even with numpy 1.x, I'm getting
+            # "ModuleNotFoundError: No module named 'numpy'" when building the wheel.
+            # This after already installing numpy, so it should be there.
+            # Revisit from time to time to see if they fix it.
+            - name: Install starlink
+              if: 0
+              run: |
                 pip install -U starlink-pyast
 
             - name: Install CPython-only dependencies
@@ -166,7 +168,7 @@ jobs:
                 FFTW_DIR=$FFTW_DIR pip install -vvv .
 
             - name: Check download_cosmos only if it changed. (And only on 1 runner)
-              if: matrix.py == 3.7 && github.base_ref != ''
+              if: matrix.py == 3.12 && github.base_ref != ''
               run: |
                 git status
                 git --no-pager log --graph --pretty=oneline --abbrev-commit | head -50
@@ -183,27 +185,20 @@ jobs:
                        # Less confusing to include it explicitly.
 
             - name: Check shared library
-              if: matrix.py == 3.8
+              if: matrix.py == 3.12
               run: |
-                # On a few systems (arbitrarily py3.8, where we also check mac and clang),
+                # On a few systems (arbitrarily py3.12, where we also check mac and clang),
                 # check the shared library creation and link.
-                GALSIM_BUILD_SHARED=1 python setup.py install
+                GALSIM_BUILD_SHARED=1 python setup.py build
 
                 # These directories/files should now exist.
                 echo "Look for the shared library:"
                 test -d build/shared_clib
                 ls build/shared_clib
                 ls build/shared_clib/libgalsim.*
 
-                # For now, use `python setup.py test` to test linking to the shared library.
-                # We run some C++ tests there, and we use the shared library for linking.
-                # Caveats:
-                #  1. The C++ tests are not very comprehensive, so it won't catch all errors.
-                #  2. Apparently setup.py test is deprecated.  I'm getting warnings when I run
-                #     it that indicate it may go away at some point.  So whenever that happens,
-                #     we'll have to revisit this test to find another way to build and run
-                #     the C++ tests.
-                GALSIM_TEST_PY=0 python setup.py test
+                # Build and run the C++ test suite
+                GALSIM_RUN_TEST=1 python setup.py build
 
             - name: Upload coverage to codecov
               if: matrix.py != 'pypy-3.7'

.github/workflows/wheels.yml

@@ -16,11 +16,11 @@ jobs:
       - uses: actions/setup-python@v5
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.1
+        uses: pypa/cibuildwheel@v3.3.1
         env:
           CIBW_BUILD: "*manylinux*"
           CIBW_ARCHS: auto64
-          CIBW_SKIP: cp36* cp37* pp*
+          CIBW_SKIP: cp36* cp37* cp38* pp*
           # I think yum might always work here.  But leave all options available.
           CIBW_BEFORE_ALL: yum install -y fftw-devel || apt-get install libfftw3-dev || apk add --upgrade fftw-dev
 
@@ -38,11 +38,11 @@ jobs:
       - uses: actions/setup-python@v5
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.1
+        uses: pypa/cibuildwheel@v3.3.1
         env:
           CIBW_BUILD: "*musllinux*"
           CIBW_ARCHS: auto64
-          CIBW_SKIP: cp36* cp37* pp*
+          CIBW_SKIP: cp36* cp37* cp38* pp*
           # I think musl always uses apk, but keep all options available.
           CIBW_BEFORE_ALL: apk add --upgrade fftw-dev || apt-get install libfftw3-dev || yum install -y fftw-devel
 
@@ -53,21 +53,21 @@ jobs:
 
   build_macosx_intel_wheels:
     name: Build wheels on MacOS Intel
-    runs-on: macos-13
+    runs-on: macos-15-intel
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v5
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.1
+        uses: pypa/cibuildwheel@v3.3.1
         env:
           CIBW_BUILD: "*macosx*"
           CIBW_ARCHS: auto64
-          CIBW_SKIP: cp36* cp37* pp*
+          CIBW_SKIP: cp36* cp37* cp38* pp*
           CIBW_BEFORE_ALL: brew install fftw || true
           CIBW_ENVIRONMENT: >-
-            MACOSX_DEPLOYMENT_TARGET=13.0
+            MACOSX_DEPLOYMENT_TARGET=14.0
 
       - uses: actions/upload-artifact@v4
         with:
@@ -76,27 +76,22 @@ jobs:
 
   build_macosx_arm_wheels:
     name: Build wheels on MacOS ARM
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v5
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.1
+        uses: pypa/cibuildwheel@v3.3.1
         env:
           CIBW_BUILD: "*macosx*"
           CIBW_ARCHS: arm64
-          CIBW_SKIP: cp36* cp37* pp*
-          CIBW_BEFORE_ALL: brew install llvm libomp fftw eigen
+          CIBW_SKIP: cp36* cp37* cp38* pp*
+          CIBW_BEFORE_ALL: brew install fftw eigen
           CIBW_ENVIRONMENT: >-
-            CC=/opt/homebrew/opt/llvm/bin/clang
-            CXX=/opt/homebrew/opt/llvm/bin/clang++
-            LDFLAGS="-L/opt/homebrew/opt/llvm/lib -Wl,-rpath,/opt/homebrew/opt/llvm/lib"
-            CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
-            PATH="/opt/homebrew/opt/llvm/bin:$PATH"
             FFTW_DIR="/opt/homebrew/lib"
-            MACOSX_DEPLOYMENT_TARGET=14.7
+            MACOSX_DEPLOYMENT_TARGET=14.0
 
       - uses: actions/upload-artifact@v4
         with:
@@ -128,7 +123,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U pip
-          pip install -U numpy "setuptools<72"
+          pip install -U numpy setuptools
           pip install -U -r requirements.txt
 
       - name: Download wheels

.gitignore

@@ -31,3 +31,9 @@ pytest_session.txt
 downloaded_eigen
 .vscode
 .ipynb_checkpoints
+*.pstats
+tests.log
+output
+output_psf
+output_fits
+AGENTS.md

CHANGELOG.rst

@@ -1,11 +1,11 @@
-Changes from v2.5 to v2.6
+Changes from v2.7 to v2.8
 =========================
 
-We currently support Python 3.7 through 3.12.
+We currently support Python 3.9 through 3.14.
 
 A complete list of all new features and changes is given below.
 `Relevant PRs and Issues,
-<https://github.com/GalSim-developers/GalSim/milestone/24?closed=1>`_
+<https://github.com/GalSim-developers/GalSim/milestone/25?closed=1>`_
 whose issue numbers are listed below for the relevant items.
 
 Dependency Changes

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2023 by the GalSim developers team on GitHub
+Copyright (c) 2012-2026 by the GalSim developers team on GitHub
 https://github.com/GalSim-developers
 
 Redistribution and use in source and binary forms, with or without

conda_requirements.txt

@@ -1,6 +1,6 @@
 # The requirements packages that can be installed with
 #    conda install -y -c conda-forge --file conda_requirements.txt
-setuptools>=38,<72
+setuptools>=38
 numpy>=1.17
 astropy>=2.0
 pybind11>=2.2

devel/.gitignore

@@ -2,3 +2,4 @@ oldcr
 newcr
 *.png
 *.fits
+Image_comparison_images

devel/GalSim_License_statement.txt

@@ -2,7 +2,7 @@ All GalSim source files should contain the following copyright statement (Python
 commented versions follow below):
 
 
-Copyright (c) 2012-2023 by the GalSim developers team on GitHub
+Copyright (c) 2012-2026 by the GalSim developers team on GitHub
 https://github.com/GalSim-developers
 
 This file is part of GalSim: The modular galaxy image simulation toolkit.
@@ -20,7 +20,7 @@ conditions are met:
    and/or other materials provided with the distribution.
 
 
-# Copyright (c) 2012-2023 by the GalSim developers team on GitHub
+# Copyright (c) 2012-2026 by the GalSim developers team on GitHub
 # https://github.com/GalSim-developers
 #
 # This file is part of GalSim: The modular galaxy image simulation toolkit.
@@ -39,7 +39,7 @@ conditions are met:
 
 
 /* -*- c++ -*-
- * Copyright (c) 2012-2023 by the GalSim developers team on GitHub
+ * Copyright (c) 2012-2026 by the GalSim developers team on GitHub
  * https://github.com/GalSim-developers
  *
  * This file is part of GalSim: The modular galaxy image simulation toolkit.

devel/brighter-fatter/bf_plots_07aug18.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2023 by the GalSim developers team on GitHub
+# Copyright (c) 2012-2026 by the GalSim developers team on GitHub
 # https://github.com/GalSim-developers
 #
 # This file is part of GalSim: The modular galaxy image simulation toolkit.

devel/brighter-fatter/bf_plots_20Oct17.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2023 by the GalSim developers team on GitHub
+# Copyright (c) 2012-2026 by the GalSim developers team on GitHub
 # https://github.com/GalSim-developers
 #
 # This file is part of GalSim: The modular galaxy image simulation toolkit.