Update build system to support latest upstream spt3g

.github/dependabot.yml

@@ -0,0 +1,9 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/official-docker-images.yml → .github/workflows/deploy_docker.yml

@@ -1,4 +1,4 @@
-name: Build Official Docker Images
+name: Deploy Official Docker Images
 
 on:
   push:
@@ -12,14 +12,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       # Fetch all history for all tags and branches
       with:
         fetch-depth: 0
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
 
     # Build
     - name: Build docker images

.github/workflows/deploy.yml → .github/workflows/deploy_wheels.yml

@@ -1,6 +1,6 @@
 # Deploy tagged releases.
 
-name:  Deploy Release
+name: Deploy Release Wheels
 
 on:
   push:
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   build_wheels:
-    name: Build wheel for cp${{ matrix.python }}-${{ matrix.builder }}_${{ matrix.arch }}
+    name: Deploy for cp${{ matrix.python }}-${{ matrix.builder }}_${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
     strategy:
       # Ensure that a wheel builder finishes even if another fails.  Useful for
@@ -26,10 +26,6 @@ jobs:
       matrix:
         include:
           # Linux 64 bit manylinux
-          - os: ubuntu-latest
-            arch: x86_64
-            python: 38
-            builder: manylinux
           - os: ubuntu-latest
             arch: x86_64
             python: 39
@@ -42,6 +38,10 @@ jobs:
             arch: x86_64
             python: 311
             builder: manylinux
+          - os: ubuntu-latest
+            arch: x86_64
+            python: 312
+            builder: manylinux
 
           # MacOS x86_64.  The macos-13 runner is the last
           # Intel-based runner version.  At some point we'll
@@ -50,28 +50,66 @@ jobs:
             arch: x86_64
             python: 39
             builder: macosx
+            deploy: 13.0
           - os: macos-13
             arch: x86_64
             python: 310
             builder: macosx
+            deploy: 13.0
           - os: macos-13
             arch: x86_64
             python: 311
             builder: macosx
+            deploy: 13.0
+          - os: macos-13
+            arch: x86_64
+            python: 312
+            builder: macosx
+            deploy: 13.0
+
+          # MacOS arm64
+          - os: macos-latest
+            arch: arm64
+            python: 310
+            builder: macosx
+            deploy: 14.0
+          - os: macos-latest
+            arch: arm64
+            python: 311
+            builder: macosx
+            deploy: 14.0
+          - os: macos-latest
+            arch: arm64
+            python: 312
+            builder: macosx
+            deploy: 14.0
     env:
       CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.builder }}_${{ matrix.arch }}
       CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.builder }}2014
       CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.builder }}2014
-      CIBW_TEST_SKIP: "*-macosx_arm64"
       CIBW_BUILD_VERBOSITY: 3
-      CIBW_ENVIRONMENT_LINUX: "CC=gcc CXX=g++ CFLAGS='-O3 -fPIC' CXXFLAGS='-O3 -fPIC -std=c++14' BOOST_ROOT=/usr/local"
-      CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=13.0 CC=gcc-14 CXX=g++-14 CFLAGS='-O3 -fPIC' CXXFLAGS='-O3 -fPIC -std=c++14' BOOST_ROOT=/usr/local FLAC_ROOT=/usr/local BLAS_LIBRARIES=/usr/local/lib/libscipy_openblas.dylib"
+      CIBW_ENVIRONMENT_LINUX: >
+        CC=gcc
+        CXX=g++
+        CFLAGS='-O3 -fPIC'
+        CXXFLAGS='-O3 -fPIC -std=c++17'
+        BOOST_ROOT=/usr/local
+        BLAS_LIBRARIES='-L/usr/local/lib -lopenblas -fopenmp -lm -lgfortran'
+      CIBW_ENVIRONMENT_MACOS: >
+        MACOSX_DEPLOYMENT_TARGET=${{ matrix.deploy }}
+        CC=clang
+        CXX=clang++
+        CFLAGS='-O3 -fPIC'
+        CXXFLAGS='-O3 -fPIC -std=c++17 -stdlib=libc++'
+        BOOST_ROOT=/usr/local
+        FLAC_ROOT=/usr/local
+        BLAS_LIBRARIES='/usr/local/lib/libopenblas.dylib'
       CIBW_BEFORE_BUILD_LINUX: ./wheels/install_deps_linux.sh
-      CIBW_BEFORE_BUILD_MACOS: ./wheels/install_deps_osx.sh ${{ matrix.builder }}_${{ matrix.arch }}
+      CIBW_BEFORE_BUILD_MACOS: ./wheels/install_deps_osx.sh
       CIBW_REPAIR_WHEEL_COMMAND_LINUX: ./wheels/repair_wheel_linux.sh {dest_dir} {wheel}
       CIBW_REPAIR_WHEEL_COMMAND_MACOS: ./wheels/repair_wheel_macos.sh {dest_dir} {wheel} {delocate_archs}
       CIBW_BEFORE_TEST: export OMP_NUM_THREADS=2
-      CIBW_TEST_REQUIRES: pytest
+      CIBW_TEST_REQUIRES: pytest pixell
       CIBW_TEST_COMMAND: >
         python -c 'import so3g.smurf.reader; from spt3g import core' &&
         python -m pytest {package}/test
@@ -82,16 +120,16 @@ jobs:
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: '3.10'
+          python-version: '3.12'
 
       - name: Install cibuildwheel
         run: |
-          python -m pip install twine cibuildwheel==2.20.0
+          python -m pip install twine cibuildwheel==2.22.0
 
       - name: Build wheel
         run: |
           python -m cibuildwheel --output-dir wheelhouse
 
       - name: Upload to PyPI
         run: |
-          python -m twine upload wheelhouse/so3g*cp${{ matrix.python }}-${{ matrix.builder }}*.whl
+          python -m twine upload wheelhouse/so3g*cp${{ matrix.python }}-${{ matrix.builder }}*${{ matrix.arch }}*.whl

.github/workflows/test_conda.yml

@@ -0,0 +1,95 @@
+# In general, we try to run on:
+# - The oldest supported python
+# - The latest stable python that is the common default on most systems and conda
+# - (During transitions) The newly released bleeding edge python
+
+name:  Run Tests with Conda
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: Python-${{ matrix.python }} on ${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash -l {0}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            python: "3.9"
+            arch: Linux-x86_64
+          - os: ubuntu-latest
+            python: "3.11"
+            arch: Linux-x86_64
+          - os: ubuntu-latest
+            python: "3.12"
+            arch: Linux-x86_64
+          - os: macos-latest
+            python: "3.10"
+            arch: MacOSX-x86_64
+          - os: macos-latest
+            python: "3.12"
+            arch: MacOSX-x86_64
+          - os: macos-latest
+            python: "3.10"
+            arch: MacOSX-arm64
+          - os: macos-latest
+            python: "3.12"
+            arch: MacOSX-arm64
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Conda Base
+        run: |
+          sudo rm -rf /usr/share/miniconda \
+            && sudo rm -rf /usr/local/miniconda \
+            && curl -SL -o miniforge.sh https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-${{ matrix.arch }}.sh \
+            && bash miniforge.sh -b -f -p ~/conda \
+            && source ~/conda/etc/profile.d/conda.sh \
+            && conda activate base \
+            && conda update -n base --yes conda
+
+      - name: Check Conda Config
+        run: |
+          source ~/conda/etc/profile.d/conda.sh \
+            && conda activate base \
+            && conda info \
+            && conda list \
+            && conda config --show-sources \
+            && conda config --show
+
+      - name: Install Dependencies
+        run: |
+          source ~/conda/etc/profile.d/conda.sh \
+            && conda create --yes -n test python=${{ matrix.python }} \
+            && conda activate test \
+            && conda install --yes --file conda_dev_requirements.txt \
+            && pip install -r test-requirements.txt
+
+      - name: Install
+        run: |
+          source ~/conda/etc/profile.d/conda.sh \
+            && conda activate test \
+            && python3 -m pip install .
+
+      - name: Run Tests
+        run: |
+          source ~/conda/etc/profile.d/conda.sh \
+            && conda activate test \
+            && export OMP_NUM_THREADS=2 \
+            && pytest ./test

.github/workflows/pytest.yml → .github/workflows/test_docker.yml

@@ -1,9 +1,13 @@
-name: Run Tests
+name: Run Tests with Docker
 
+# on: workflow_dispatch
 on:
   push:
-    branches-ignore: [ master ]
-  pull_request:
+    branches:
+      - master
+  # pull_request:
+  #   branches:
+  #     - master
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,11 +19,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
+      uses: actions/checkout@v4
 
     - name: Build docker images
       run: |