Test CI for Python 3.13

.github/workflows/coverage.yml

@@ -24,7 +24,7 @@ on:
 env:
   PY_MIN_VERSION: '3.8'
   PY_MID_VERSION: '3.10'
-  PY_MAX_VERSION: '3.12'
+  PY_MAX_VERSION: '3.13'
 
 jobs:
   coverage:
@@ -58,10 +58,10 @@ jobs:
         run: |
           python3 -m venv music-venv
           source music-venv/bin/activate
-          python3 -m pip install 'mpi4py<4' cython numpy setuptools
+          python3 -m pip install mpi4py cython numpy setuptools
           sudo mkdir -p $MUSIC_INSTALL_DIR
           sudo chown -R $USER $MUSIC_INSTALL_DIR
-          curl -L -o MUSIC.zip https://github.com/INCF/MUSIC/archive/refs/tags/${MUSIC_VERSION}.zip
+          curl -L -o MUSIC.zip https://github.com/JCGoran/MUSIC/archive/refs/heads/fix_mpi4py.zip
           unzip MUSIC.zip && mv MUSIC-* MUSIC && cd MUSIC
           ./autogen.sh
           ./configure --with-python-sys-prefix --prefix=$MUSIC_INSTALL_DIR --disable-anysource

.github/workflows/neuron-ci.yml

@@ -39,13 +39,13 @@ jobs:
       DESIRED_CMAKE_VERSION: 3.17
       DYNAMIC_PYTHON_CMAKE_VERSION: 3.18
       PY_MIN_VERSION: ${{ matrix.config.python_min_version || '3.8' }}
-      PY_MAX_VERSION: ${{ matrix.config.python_max_version || '3.12' }}
+      PY_MAX_VERSION: ${{ matrix.config.python_max_version || '3.13' }}
       MUSIC_INSTALL_DIR: /opt/MUSIC
       MUSIC_VERSION: 1.2.1
 
     strategy:
       matrix:
-        os: [ macOS-12, ubuntu-20.04]
+        os: [macOS-13, ubuntu-20.04]
         config:
           - { matrix_eval : "CC=gcc-9 CXX=g++-9",   build_mode: "setuptools"}
           - { matrix_eval : "CC=gcc-10 CXX=g++-10", build_mode: "cmake", music: ON}
@@ -207,10 +207,10 @@ jobs:
         run: |
           python3 -m venv music-venv
           source music-venv/bin/activate
-          python3 -m pip install 'mpi4py<4' cython numpy setuptools
+          python3 -m pip install mpi4py cython numpy setuptools
           sudo mkdir -p $MUSIC_INSTALL_DIR
           sudo chown -R $USER $MUSIC_INSTALL_DIR
-          curl -L -o MUSIC.zip https://github.com/INCF/MUSIC/archive/refs/tags/${MUSIC_VERSION}.zip
+          curl -L -o MUSIC.zip https://github.com/JCGoran/MUSIC/archive/refs/heads/fix_mpi4py.zip
           unzip MUSIC.zip && mv MUSIC-* MUSIC && cd MUSIC
           ./autogen.sh
           # on some systems MPI library detection fails, provide exact flags/compilers

azure-pipelines.yml

@@ -44,6 +44,9 @@ stages:
             python.version: '3.11'
           Python312:
             python.version: '3.12'
+          Python313:
+            python.version: '3.13'
+
       steps:
 
       # Secure files documentation:
@@ -85,34 +88,38 @@ stages:
     - job: 'MacOSWheels'
       timeoutInMinutes: 60
       pool:
-        vmImage: 'macOS-12'
+        vmImage: 'macOS-13'
       strategy:
         matrix:
           Python38:
             python.version: '3.8'
             python.org.version: '3.8.9'
-            python.installer.name: 'macosx10.9.pkg'
+            python.installer.name: '3.8.9-macosx10.9.pkg'
           Python39:
             python.version: '3.9'
             python.org.version: '3.9.13'
-            python.installer.name: 'macos11.pkg'
+            python.installer.name: '3.9.13-macos11.pkg'
           Python310:
             python.version: '3.10'
             python.org.version: '3.10.11'
-            python.installer.name: 'macos11.pkg'
+            python.installer.name: '3.10.11-macos11.pkg'
           Python311:
             python.version: '3.11'
             python.org.version: '3.11.7'
-            python.installer.name: 'macos11.pkg'
+            python.installer.name: '3.11.7-macos11.pkg'
           Python312:
             python.version: '3.12'
             python.org.version: '3.12.0'
-            python.installer.name: 'macos11.pkg'
+            python.installer.name: '3.12.0-macos11.pkg'
+          Python313:
+            python.version: '3.13'
+            python.org.version: '3.13.0'
+            python.installer.name: '3.13.0rc3-macos11.pkg'
 
       steps:
 
       - script: |
-          installer=python-$(python.org.version)-$(python.installer.name)
+          installer=python-$(python.installer.name)
           url=https://www.python.org/ftp/python/$(python.org.version)/$installer
           curl $url -o $installer
           sudo installer -pkg $installer -target /

nrn_requirements.txt

@@ -8,6 +8,6 @@ cython
 packaging
 pytest<=8.1.1 # potential bug from 8.2.0 due to parallelism?
 pytest-cov
-mpi4py<4 # MUSIC not compatible with MPI 4
+mpi4py
 numpy
 find_libpython

setup.py

@@ -96,7 +96,7 @@ class Components:
     Components.MUSIC = True
     sys.argv.remove("--enable-music")
 
-if Components.RX3D:
+if Components.RX3D or Components.MUSIC:
     try:
         from Cython.Distutils import Extension as CyExtension
         from Cython.Distutils import build_ext