Merge branch 'main' into tkp/repl

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>

Author: timkpaine

.bumpversion.cfg

@@ -2,18 +2,17 @@
 * @robambalu @AdamGlustein @svatasoiu @alexddobkin
 
 # Packaging code
-.bumpversion.cfg @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-conda @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-CMakeLists.txt @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-Makefile @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-MANIFEST.in @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-pyproject.toml @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-setup.py @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-vcpkg.json @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
+conda @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+CMakeLists.txt @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+Makefile @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+MANIFEST.in @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+pyproject.toml @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+setup.py @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+vcpkg.json @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
 
 # CI/CD
-.github @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
-ci @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807
+.github @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
+ci @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine
 
 # Administrative
 .github/CODEOWNERS @robambalu

.github/CODEOWNERS

@@ -2,16 +2,10 @@ name: Setup Caches
 description: 'Ensure various caches are setup like homebrew, vcpkg, ccache, etc'
 
 inputs:
-  cibuildwheel:
-    type: choice
-    description: "cibuildwheel run"
-    options:
-      - 'cp38'
-      - 'cp39'
-      - 'cp310'
-      - 'cp311'
-      - 'cp312'
-    default: 'cp39'
+  vcpkg:
+    type: boolean
+    description: "cache vcpkg assets"
+    default: true
 
 runs:
   using: 'composite'
@@ -38,17 +32,17 @@ runs:
         mkdir -p /home/runner/vcpkg_download_cache
         echo "VCPKG_DEFAULT_BINARY_CACHE=/home/runner/vcpkg_cache" >> $GITHUB_ENV
         echo "VCPKG_DOWNLOADS=/home/runner/vcpkg_download_cache" >> $GITHUB_ENV
-      if: ${{ runner.os == 'Linux' }}
+      if: ${{ runner.os == 'Linux' && inputs.vcpkg == 'true' }}
 
     - name: Setup vcpkg cache (Linux)
       uses: actions/cache@v4
       with:
         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' }}
+      if: ${{ runner.os == 'Linux' && inputs.vcpkg == 'true' }}
 
     - name: Setup vcpkg cache in shell (macOS)
       shell: bash
@@ -57,17 +51,17 @@ runs:
         mkdir -p /Users/runner/vcpkg_download_cache
         echo "VCPKG_DEFAULT_BINARY_CACHE=/Users/runner/vcpkg_cache" >> $GITHUB_ENV
         echo "VCPKG_DOWNLOADS=/Users/runner/vcpkg_download_cache" >> $GITHUB_ENV
-      if: ${{ runner.os == 'macOS' }}
+      if: ${{ runner.os == 'macOS' && inputs.vcpkg == 'true' }}
 
     - name: Setup vcpkg cache (macOS)
       uses: actions/cache@v4
       with:
         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' }}
+      if: ${{ runner.os == 'macOS' && inputs.vcpkg == 'true'}}
 
     - name: Setup vcpkg cache in shell (Windows)
       shell: bash
@@ -76,14 +70,14 @@ runs:
         mkdir C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_download_cache
         echo "VCPKG_DEFAULT_BINARY_CACHE=C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_cache" >> $GITHUB_ENV
         echo "VCPKG_DOWNLOADS=C:\\Users\\runneradmin\\AppData\\Local\\vcpkg_download_cache" >> $GITHUB_ENV
-      if: ${{ runner.os == 'Windows' }}
+      if: ${{ runner.os == 'Windows' && inputs.vcpkg == 'true'}}
 
     - name: Setup vcpkg cache (Windows)
       uses: actions/cache@v4
       with:
         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' }}
+      if: ${{ runner.os == 'Windows' && inputs.vcpkg == 'true'}}

.github/actions/setup-caches/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-dependencies/action.yml

@@ -6,12 +6,16 @@ inputs:
     type: choice
     description: "Version to install"
     options:
-      - '3.8'
       - '3.9'
       - '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'
@@ -34,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' }}

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

@@ -4,3 +4,13 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    labels:
+      - "part: github_actions"
+
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    labels:
+      - "lang: python"
+      - "part: dependencies"