From d356c8e442b3901f61bfd5a8184e592733e921b6 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Sun, 6 Oct 2024 19:29:41 +0200
Subject: [PATCH] Build wheels for Python 2.7 again (#263)

---
 .github/workflows/build-and-test.yml |  4 +--
 .github/workflows/github-deploy.yml  | 41 ++++++++++++++++++++++++----
 ephem/__init__.py                    |  2 +-
 ephem/doc/CHANGELOG.rst              |  9 ++++++
 4 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index b9fddb8..653d068 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -25,11 +25,11 @@ jobs:
           CIBW_TEST_REQUIRES: tzdata
 
   build_wheels_python2:
-    name: Build wheels on ${{ matrix.os }}
+    name: Build wheels on ${{ matrix.os }} (Python 2.7)
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, macos-13]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/github-deploy.yml b/.github/workflows/github-deploy.yml
index ecd955f..9de3156 100644
--- a/.github/workflows/github-deploy.yml
+++ b/.github/workflows/github-deploy.yml
@@ -52,11 +52,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v5
-        name: Install Python
-        with:
-          python-version: '3.8'
-
       - name: Generate build name for artifact upload
         id: build-name
         run: |
@@ -91,6 +86,40 @@ jobs:
           path: ./wheelhouse/*.whl
           overwrite: true
 
+  build_wheels_python2:
+    name: Build wheels on ${{ matrix.os }} (Python 2.7)
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-13]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      # https://cibuildwheel.readthedocs.io/en/stable/faq/#emulation
+      # offers this stanza plus “CIBW_ARCHS_LINUX” below:
+      - name: Set up QEMU
+        if: runner.os == 'Linux'
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v1.12.0
+        env:
+          CIBW_ARCHS_LINUX: auto aarch64 s390x
+          CIBW_BUILD: cp27-*
+          CIBW_SKIP: pp*
+          CIBW_TEST_COMMAND: python -m unittest discover ephem
+          CIBW_TEST_REQUIRES: tzdata
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: wheels-2.7-${{ matrix.os }}
+          path: ./wheelhouse/*.whl
+          overwrite: true
+
   build_sdist:
     name: Build source distribution
     runs-on: ubuntu-latest
@@ -112,7 +141,7 @@ jobs:
           overwrite: true
 
   upload_pypi:
-    needs: [build_wheels, build_sdist]
+    needs: [build_wheels, build_wheels_python2, build_sdist]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v4
diff --git a/ephem/__init__.py b/ephem/__init__.py
index 765bcc1..bfac92c 100644
--- a/ephem/__init__.py
+++ b/ephem/__init__.py
@@ -10,7 +10,7 @@
 from math import acos, cos, isnan, pi, sin
 from time import localtime as _localtime
 
-__version__ = '4.1.5'
+__version__ = '4.1.6'
 
 # As a favor, compile a regular expression that our C library would
 # really rather not compile for itself.
diff --git a/ephem/doc/CHANGELOG.rst b/ephem/doc/CHANGELOG.rst
index 17f938f..7d8e3ad 100644
--- a/ephem/doc/CHANGELOG.rst
+++ b/ephem/doc/CHANGELOG.rst
@@ -2,6 +2,15 @@
 PyEphem CHANGELOG
 =================
 
+Version 4.1.6 (2024 October 6)
+------------------------------
+
+- Add support for Python 3.13.
+  `#278 <https://github.com/brandon-rhodes/pyephem/pull/278>`_
+
+- Build wheels for Python 2.7 again.
+  `#263 <https://github.com/brandon-rhodes/pyephem/pull/263>`_
+
 Version 4.1.5 (2023 October 8)
 ------------------------------