Merge branch 'develop' into publish-gh-pages

.github/workflows/phono3py-pytest-macos.yml

@@ -0,0 +1,23 @@
+name: Pytest on macOS
+
+on:
+  push:
+    branches:
+    - macos
+
+jobs:
+  build-macos:
+    runs-on: macos-latest
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install phono3py
+      run: |
+        pip install -e . -v
+    - name: Run pytest
+      run: |
+        pip install pytest
+        pytest -v test

.github/workflows/phono3py-pytest-windows.yml

@@ -0,0 +1,26 @@
+name: Pytest on windows
+
+on:
+  push:
+    branches:
+    - windows
+
+jobs:
+  build-windows:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install phonopy
+      run: |
+        pip install git+https://github.com/phonopy/phonopy@develop
+    - name: Install phono3py
+      run: |
+        pip install -e . -v
+    - name: Run pytest
+      run: |
+        pip install pytest
+        pytest -v test

.github/workflows/wheels.yml

@@ -1,20 +1,19 @@
 name: wheel-build-and-deploy
 
 on:
-    push:
-      branches:
-      - make-wheel
-      - make-wheel-test
+  push:
+    branches:
+    - make-wheel
+    - make-wheel-test
 
 jobs:
   build_wheels:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest,]
-        # os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
-
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest]
+        # os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-latest]
 
     steps:
     - uses: actions/checkout@v4
@@ -25,17 +24,37 @@ jobs:
     - name: Install cibuildwheel
       run: python -m pip install cibuildwheel==2.22.0
 
-    - name: Build wheels
+    - name: Build wheels on ubuntu
+      if: ${{ startsWith(matrix.os, 'ubuntu') }}
       run: |
         git tag v`grep __version__ phono3py/version.py|awk -F'"' '{print($2)}'`
         python -m cibuildwheel --output-dir wheelhouse
       env:
         CIBW_SKIP: "cp39-* pp* *_i686 *musllinux*"
         CIBW_BUILD_VERBOSITY: 1
 
-      # to supply options, put them in 'env', like:
-      # env:
-      #   CIBW_SOME_OPTION: value
+    - name: Build wheels on macos
+      if: ${{ startsWith(matrix.os, 'macos') }}
+      run: |
+        git tag v`grep __version__ phono3py/version.py|awk -F'"' '{print($2)}'`
+        python -m cibuildwheel --output-dir wheelhouse
+      env:
+        CIBW_SKIP: "cp39-* pp*"
+        # CIBW_ARCHS_MACOS: "x86_64 arm64"
+        CIBW_BUILD_VERBOSITY: 1
+
+    - name: Build wheels on windows
+      if: ${{ startsWith(matrix.os, 'windows') }}
+      run: |
+        $version = Select-String -Path "phono3py\version.py" -Pattern '__version__' | ForEach-Object {
+            ($_ -split '"')[1]
+        }
+        git tag "v$version"
+        Write-Output "The value of version is: $version"
+        python -m cibuildwheel --output-dir wheelhouse
+      env:
+        CIBW_SKIP: "cp39-* pp*"
+        CIBW_BUILD_VERBOSITY: 1
 
     - uses: actions/upload-artifact@v4
       with:
@@ -44,12 +63,9 @@ jobs:
 
   upload_pypi_test:
     name: Upload to PyPI (test)
-    strategy:
-      matrix:
-        os: [ubuntu-latest,]
     needs: [build_wheels,]
-    runs-on: ${{ matrix.os }}
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/make-wheel-test')
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/make-wheel-test' }}
     steps:
     - uses: actions/download-artifact@v4
       with:
@@ -60,17 +76,14 @@ jobs:
       with:
         user: __token__
         password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-        repository_url: https://test.pypi.org/legacy/
+        repository-url: https://test.pypi.org/legacy/
         skip-existing: true
 
   upload_pypi:
     name: Upload to PyPI
-    strategy:
-      matrix:
-        os: [ubuntu-latest,]
     needs: [build_wheels,]
-    runs-on: ${{ matrix.os }}
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/make-wheel')
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/make-wheel' }}
     steps:
     - uses: actions/download-artifact@v4
       with:

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
     exclude: ^example/AlN-LDA/
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.1
+  rev: v0.9.2
   hooks:
   - id: ruff
     args: [ "--fix", "--show-fixes" ]