From 4c87c0e6deda77919825498b1e2a1bf873ba6f30 Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Fri, 26 Jul 2024 13:50:57 +0200
Subject: [PATCH] Prepare release v1.11 (#234)

* Drop support for Python 3.7

* Update GitHub workflow
---
 .github/workflows/build_release.yml | 31 +++++++++++++++++++----------
 .github/workflows/ci.yml            |  4 ++--
 pyproject.toml                      |  5 ++---
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
index d760b84b..b94d4e48 100644
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -14,19 +14,30 @@ jobs:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: true
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-12]
+        toolchain:
+          - {compiler: gcc, version: 12}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          # Needed for `setuptools-scm`
+          fetch-depth: 0
 
-      - name: Setup GNU Fortran
-        uses: modflowpy/install-gfortran-action@v1
-        id: macos-setup-fortran
+      - name: Setup Fortran
+        uses: fortran-lang/setup-fortran@v1
+        id: setup-fortran
+        with:
+          compiler: ${{ matrix.toolchain.compiler }}
+          version: ${{ matrix.toolchain.version }}
         if: runner.os == 'macOS'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.12.3
+        uses: pypa/cibuildwheel@v2.19
+        env:
+          MACOSX_DEPLOYMENT_TARGET: "12.0"
 
       - name: Upload wheels
         uses: actions/upload-artifact@v3
@@ -37,7 +48,7 @@ jobs:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build sdist
         run: pipx run build --sdist
@@ -61,10 +72,10 @@ jobs:
           name: artifact
           path: dist
 
-      - uses: pypa/gh-action-pypi-publish@v1.5.0
+      - uses: pypa/gh-action-pypi-publish@v1.9.0
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}
-          # # To test:
-          # repository_url: https://test.pypi.org/legacy/
+          # To test:
+          # repository-url: https://test.pypi.org/legacy/
           # password: ${{ secrets.test_pypi_password }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae46871a..11659e0b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,8 +6,8 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: "3.10"
     - name: Apt install required packages
diff --git a/pyproject.toml b/pyproject.toml
index 2a8dbe0c..b9c5a545 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,7 +25,7 @@ name = "bdsf"
 dynamic = ["version"]
 description = "Blob Detection and Source Finder"
 readme = "README.rst"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 authors = [
     { name = "David Rafferty", email = "drafferty@hs.uni-hamburg.de" },
 ]
@@ -39,7 +39,6 @@ classifiers = [
     "Programming Language :: C++",
     "Programming Language :: Fortran",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -76,7 +75,7 @@ Documentation = "https://pybdsf.readthedocs.io"
 [tool.cibuildwheel]
 before-all = "cibuildwheel/before_all.sh"
 before-build = "cibuildwheel/before_build.sh"
-build = "cp3{7,8,9,10,11,12}-*_x86_64"
+build = "cp3{8,9,10,11,12}-*_x86_64"
 build-verbosity = 1
 environment = """ \
     BOOST_VERSION="1.81.0" \