Merge branch 'main' into tkp/autogen

Author: timkpaine

.github/actions/setup-caches/action.yml

@@ -40,7 +40,7 @@ runs:
         path: |
           /home/runner/vcpkg_cache
           /home/runner/vcpkg_download_cache
-        key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json') }}
+        key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json', 'vcpkg/versions/baseline.json') }}
         restore-keys: vcpkg-${{ runner.os }}-${{ runner.arch }}-
       if: ${{ runner.os == 'Linux' && inputs.vcpkg == 'true' }}
 
@@ -59,7 +59,7 @@ runs:
         path: |
           /Users/runner/vcpkg_cache
           /Users/runner/vcpkg_download_cache
-        key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json') }}
+        key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json', 'vcpkg/versions/baseline.json') }}
         restore-keys: vcpkg-${{ runner.os }}-${{ runner.arch }}-
       if: ${{ runner.os == 'macOS' && inputs.vcpkg == 'true'}}
 
@@ -78,6 +78,6 @@ runs:
         path: |
           C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_cache
           C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_download_cache
-        key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json') }}
+        key: vcpkg-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('vcpkg.json', 'vcpkg/versions/baseline.json') }}
         restore-keys: vcpkg-${{ runner.os }}-${{ runner.arch }}-
       if: ${{ runner.os == 'Windows' && inputs.vcpkg == 'true'}}

.github/actions/setup-dependencies/action.yml

@@ -6,12 +6,12 @@ inputs:
     type: choice
     description: "cibuildwheel run"
     options:
-      - 'cp38'
       - 'cp39'
       - 'cp310'
       - 'cp311'
       - 'cp312'
-    default: 'cp39'
+      - 'cp313'
+    default: 'cp311'
 
 runs:
   using: 'composite'
@@ -25,10 +25,6 @@ runs:
 
     ################
     # Linux # NOTE: skip for manylinux image
-    # - name: Linux init steps
-    #   shell: bash
-    #   run: make dependencies-vcpkg
-    #   if: ${{ runner.os == 'Linux' }} # skip
 
     ################
     # Mac
@@ -37,16 +33,6 @@ runs:
       run: make dependencies-mac
       if: ${{ runner.os == 'macOS' }}
 
-    # - name: Setup vcpkg cache in shell
-    #   shell: bash
-    #   run: |
-    #     which -a gcc-12
-    #     echo "CC=/usr/local/bin/gcc-12" >> $GITHUB_ENV
-    #     echo "CMAKE_C_COMPILER=/usr/local/bin/gcc-12" >> $GITHUB_ENV
-    #     echo "CXX=/usr/local/bin/g++-12" >> $GITHUB_ENV
-    #     echo "CMAKE_CXX_COMPILER=/usr/local/bin/g++-12" >> $GITHUB_ENV
-    #   if: ${{ runner.os == 'macOS' }}
-
     ################
     # Windows
     - name: Windows init steps (vc143)

.github/actions/setup-python/action.yml

@@ -10,7 +10,12 @@ inputs:
       - '3.10'
       - '3.11'
       - '3.12'
-    default: '3.9'
+      - '3.13'
+    default: '3.11'
+  cibuildwheel:
+    type: boolean
+    description: "Whether to install cibuildwheel and twine"
+    default: 'true'
 
 runs:
   using: 'composite'
@@ -33,4 +38,5 @@ runs:
 
     - name: Install cibuildwheel and twine
       shell: bash
-      run: pip install cibuildwheel==2.16.5 twine
+      run: pip install cibuildwheel==3.2 twine
+      if: ${{ inputs.cibuildwheel == 'true' }}