Merge branch 'debug' into 4-write-a-basic-test-simulation-and-user-gu…

…ide-for-spherical-harmonics-use

.github/workflows/build_wheels.yml

@@ -1,41 +1,29 @@
 name: swiftest
 
-on: 
-  release:
-    types: [published]
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - master
 
 jobs:
   build_wheels:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-11, macos-12, macos-13]
-        cibw_archs: [x86_64]
-        include:
-          - os: ubuntu-latest
-            cibw_archs: "aarch64"
-    env:
-      SYSTEM_VERSION_COMPAT: 0
+        os: [ubuntu-latest, macos-11, macos-13, macos-13, macos-14]
 
     steps:
-      - name: Set up QEMU
-        if: matrix.cibw_archs == 'aarch64'
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64        
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.15.0
-        env:
-          CIBW_ARCHS: ${{ matrix.cibw_archs }}
-        with:
-          package-dir: .
-          output-dir: wheelhouse
-          config-file: "{package}/pyproject.toml"
+        uses: pypa/cibuildwheel@v2.16.5
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -47,6 +35,28 @@ jobs:
       - name: Build sdist
         run: pipx run build --sdist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-sdist
+          path: dist/*.tar.gz
+
+  upload_pypi:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    environment: 
+      name: pypi
+      url: https://pypi.org/p/swiftest
+    permissions:
+      id-token: write
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+
+      - uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          path: dist/*.tar.gz
+          skip-existing: true

.readthedocs.yaml

@@ -20,7 +20,6 @@ build:
   jobs:
     pre_build:
       - ford fortran_docs.md 
-      - pip install pyshtools
       - DOC_BUILD=1 pip install .
 python:
   install:

README.md

@@ -1,10 +1,9 @@
 # Swiftest 
 
 ---
-Swiftest is a software packaged designed to model the dynamical evolution of gravitational systems. Swiftest is a re-write of the
-`Swifter <https://www.boulder.swri.edu/swifter/>`__ software package 
-Swiftest is a software packaged designed to model the dynamical evolution of gravitational systems. Swiftest is a re-write of the [Swifter](https://www.boulder.swri.edu/swifter/) software package that incorporates modern programming techniques and performance
-improvements. 
+Swiftest is a software packaged designed to model the long-term dynamical dynamics of n-body systems with a dominant central body, 
+like the solar system. Swiftest is a re-write of the [Swifter](https://www.boulder.swri.edu/swifter/) software package that 
+incorporates modern programming techniques and performance improvements. 
 
 #### Installation
 

pyproject.toml

@@ -133,7 +133,7 @@ PATH="${HDF5_ROOT}/bin:${PATH}"
 CMAKE_INSTALL_LIBDIR="lib"
 
 [tool.cibuildwheel.linux]
-skip = "pp* -manylinux_i686* *-musllinux*"
+skip = "pp* *-manylinux_i686* *-musllinux*"
 before-all = [
     "yum install epel-release -y",
     "yum install doxygen libxml2-devel libcurl-devel fftw-static openblas-devel lapack-devel -y",

swiftest/shgrav.py

@@ -14,13 +14,20 @@
 # 
 
 from .constants import GC
+import os
 
-try:
-    import pyshtools as pysh
+PYSHTOOLS_AVAILABLE = False
+
+if 'READTHEDOCS' in os.environ:
+    # Assume pyshtools is available when building on ReadTheDocs
     PYSHTOOLS_AVAILABLE = True
-except ModuleNotFoundError:
-    PYSHTOOLS_AVAILABLE = False
-    print("pyshtools is not installed. Some features will be unavailable.")
+else:
+    try:
+        import pyshtools as pysh
+        PYSHTOOLS_AVAILABLE = True
+    except ModuleNotFoundError:
+        print("pyshtools is not installed. Some features will be unavailable.")
+
 
 if PYSHTOOLS_AVAILABLE: