Merge branch 'master' into pyproject.toml

Author: mgeier

.github/workflows/docs.yml

@@ -28,7 +28,7 @@ jobs:
         run: |
           python -m sphinx -W --keep-going --color -d _build/doctrees/ doc/ _build/linkcheck/ -b linkcheck
       - name: Upload linkcheck results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: ${{ success() || failure() }}
         with:
           name: linkcheck

.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
       run: |
         ./make_dist.sh
     - name: Store the distribution packages
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: dist
         path: dist
@@ -33,7 +33,7 @@ jobs:
       id-token: write
     steps:
     - name: Get the artifacts
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: dist
         path: dist

.github/workflows/sounddevice-data.yml

@@ -14,12 +14,14 @@ jobs:
             arch: 'x64'
           - os: windows-latest
             arch: 'x86'
+          - os: windows-11-arm
+            arch: 'arm64'
     runs-on: ${{ matrix.os }}
     steps:
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.10"
+          python-version: "3.13"
           architecture: ${{ matrix.arch }}
       - name: Double-check Python version
         run: |

make_dist.sh

@@ -22,5 +22,7 @@ make_wheel Windows 32bit
 
 make_wheel Windows 64bit
 
+make_wheel Windows arm64
+
 # This creates a "pure" wheel and an sdist without libraries:
 make_wheel Linux

setup.py

@@ -9,8 +9,9 @@
 
 # environment variables for cross-platform package creation
 system = os.environ.get('PYTHON_SOUNDDEVICE_PLATFORM', platform.system())
+machine = platform.machine().lower()
 architecture0 = os.environ.get('PYTHON_SOUNDDEVICE_ARCHITECTURE',
-                               platform.architecture()[0])
+    'arm64' if machine in ['arm64', 'aarch64'] else platform.architecture()[0])
 
 if system == 'Darwin':
     libname = 'libportaudio.dylib'
@@ -45,7 +46,9 @@ def get_tag(self):
             if system == 'Darwin':
                 oses = MACOSX_VERSIONS
             elif system == 'Windows':
-                if architecture0 == '32bit':
+                if architecture0 == 'arm64':
+                    oses = 'win_arm64'
+                elif architecture0 == '32bit':
                     oses = 'win32'
                 else:
                     oses = 'win_amd64'

src/_sounddevice_data/portaudio-binaries

@@ -74,10 +74,14 @@
     if _platform.system() == 'Darwin':
         _libname = 'libportaudio.dylib'
     elif _platform.system() == 'Windows':
+        if _platform.machine().lower() in ('arm64', 'aarch64'):
+            _platform_suffix = 'arm64'
+        else:
+            _platform_suffix = _platform.architecture()[0]
         if 'SD_ENABLE_ASIO' in _os.environ:
-            _libname = 'libportaudio' + _platform.architecture()[0] + '-asio.dll'
+            _libname = 'libportaudio' + _platform_suffix + '-asio.dll'
         else:
-            _libname = 'libportaudio' + _platform.architecture()[0] + '.dll'
+            _libname = 'libportaudio' + _platform_suffix + '.dll'
     else:
         raise
     import _sounddevice_data