Fix Github actions CI issues

- Leave HasBoxDomain specializations undocumented to workaround jbms/sphinx-immaterial#396. These specializations don't need separate documentation anyway. - Wrap built documentation in a zip file for storage as a github actions artifact to avoid case insensitivity issues. While sphinx-immaterial has an option for generating page names that are compatible with case-insensitive filesystems, the case-sensitive naming avoids an ugly hash in the name and is preferable for documentation URLs. - Disable building wheels for Python 3.13 until the Python dependencies are updated to support it. PiperOrigin-RevId: 692221563 Change-Id: I374d30b6799908e419e17c1c48c5de16eda00505
google · Nov 1, 2024 · e3ae99a · e3ae99a
1 parent b46a7b0
commit e3ae99a
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 56 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,11 +51,11 @@ jobs:
         shell: bash
         run: |
           echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: pip-${{ runner.os }}-buildwheel-${{ hashFiles('tools/ci/*_requirements.txt', 'third_party/pypa/*_requirements_frozen.txt') }}
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/cibuildwheel_bazel_cache/cache/repos

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -7,45 +7,46 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - '3.9'
+          - "3.12"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-      with:
-        # Need full history to determine version number.
-        fetch-depth: 0
-    - name: 'Set up Python ${{ matrix.python-version }}'
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: 'Configure bazel remote cache write credentials'
-      env:
-        BAZEL_CACHE_SERVICE_ACCOUNT_KEY: ${{ secrets.BAZEL_CACHE_SERVICE_ACCOUNT_KEY }}
-      run: python ./tools/ci/configure_bazel_remote_cache.py --bazelrc ~/ci_bazelrc docs
-      shell: bash
-    - name: Get pip cache dir
-      id: pip-cache
-      shell: bash
-      run: |
-        echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
-    - uses: actions/cache@v2
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: pip-${{ runner.os }}-docs-${{ matrix.python-version }}-${{ hashFiles('third_party/pypa/workspace.bzl') }}
-    - uses: actions/cache@v2
-      with:
-        path: |
-          ~/.cache/bazel/_bazel_*/cache/repos
-          ~/.cache/bazelisk
-        key: bazel-docs-${{ hashFiles('.bazelversion', 'WORKSPACE', 'external.bzl', 'third_party/**') }}
-    - name: Build documentation
-      run: CC=gcc-10 python -u bazelisk.py --bazelrc ~/ci_bazelrc run --announce_rc --show_timestamps --keep_going --color=yes --verbose_failures //docs:build_docs -- --output docs_output
-      shell: bash
-    - name: Upload docs as artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: docs
-        path: docs_output
+      - uses: actions/checkout@v4
+        with:
+          # Need full history to determine version number.
+          fetch-depth: 0
+      - name: "Set up Python ${{ matrix.python-version }}"
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: "Configure bazel remote cache write credentials"
+        env:
+          BAZEL_CACHE_SERVICE_ACCOUNT_KEY: ${{ secrets.BAZEL_CACHE_SERVICE_ACCOUNT_KEY }}
+        run: python ./tools/ci/configure_bazel_remote_cache.py --bazelrc ~/ci_bazelrc docs
+        shell: bash
+      - name: Get pip cache dir
+        id: pip-cache
+        shell: bash
+        run: |
+          echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
+      - uses: actions/cache@v4
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key: pip-${{ runner.os }}-docs-${{ matrix.python-version }}-${{ hashFiles('third_party/pypa/workspace.bzl') }}
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/bazel/_bazel_*/cache/repos
+            ~/.cache/bazelisk
+          key: bazel-docs-${{ hashFiles('.bazelversion', 'WORKSPACE', 'external.bzl', 'third_party/**') }}
+      - name: Build documentation
+        run: CC=gcc-10 python -u bazelisk.py --bazelrc ~/ci_bazelrc run --announce_rc --show_timestamps --keep_going --color=yes --verbose_failures //docs:build_docs -- --output docs_output
+        shell: bash
+      - run: zip -r docs_output.zip docs_output
+      - name: Upload docs as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs
+          path: docs_output.zip
 
   publish-docs:
     # Only publish package on push to tag or default branch.
@@ -54,12 +55,12 @@ jobs:
     needs:
       - build-docs
     steps:
-    - uses: actions/download-artifact@v4
-      with:
-        name: docs
-        path: docs_output
-    - name: Publish to gh-pages
-      uses: peaceiris/actions-gh-pages@bbdfb200618d235585ad98e965f4aafc39b4c501 # v3.7.3 (2020-10-20)
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./docs_output
+      - uses: actions/download-artifact@v4
+        with:
+          name: docs
+      - run: unzip docs_output.zip
+      - name: Publish to gh-pages
+        uses: peaceiris/actions-gh-pages@bbdfb200618d235585ad98e965f4aafc39b4c501 # v3.7.3 (2020-10-20)
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs_output
diff --git a/tensorstore/index_space/index_domain.h b/tensorstore/index_space/index_domain.h
@@ -525,9 +525,7 @@ explicit IndexDomain(const BoxType& box)
 
 explicit IndexDomain() -> IndexDomain<>;
 
-/// Specializes the HasBoxDomain metafunction for IndexTransform.
-///
-/// \relates IndexDomain
+// Specializes the HasBoxDomain metafunction for IndexTransform.
 template <DimensionIndex Rank, ContainerKind CKind>
 constexpr inline bool HasBoxDomain<IndexDomain<Rank, CKind>> = true;
 

diff --git a/tensorstore/index_space/index_transform.h b/tensorstore/index_space/index_transform.h
@@ -572,9 +572,9 @@ class IndexTransform {
   Ptr rep_{};
 };
 
-/// Specializes the HasBoxDomain metafunction for `IndexTransform`.
-///
-/// \relates IndexTransform
+// Specializes the HasBoxDomain metafunction for `IndexTransform`.
+//
+// \relates IndexTransform
 template <DimensionIndex InputRank, DimensionIndex OutputRank,
           ContainerKind CKind>
 constexpr inline bool

diff --git a/third_party/python/python_configure.bzl b/third_party/python/python_configure.bzl
@@ -205,7 +205,8 @@ def _get_python_include(repository_ctx, python_bin):
             "import importlib; " +
             "import importlib.util; " +
             "print(importlib.import_module('distutils.sysconfig').get_python_inc() " +
-            "if importlib.util.find_spec('distutils.sysconfig') " +
+            "if (importlib.util.find_spec('distutils') and " +
+            "    importlib.util.find_spec('distutils.sysconfig')) " +
             "else importlib.import_module('sysconfig').get_path('include'))",
         ],
         error_msg = "Problem getting python include path.",

diff --git a/tools/ci/cibuildwheel.py b/tools/ci/cibuildwheel.py
@@ -96,7 +96,8 @@ def run(args, extra_args):
 
   env["CIBW_ARCHS_MACOS"] = "x86_64 arm64"
   env["CIBW_SKIP"] = (
-      "cp27-*  cp35-* cp36-* cp37-* cp38-* pp* *_i686 *-win32 *-musllinux*"
+      "cp27-* cp35-* cp36-* cp37-* cp38-* cp313-* pp* *_i686 *-win32"
+      " *-musllinux*"
   )
   env["CIBW_TEST_COMMAND"] = (
       "python -m pytest {project}/python/tensorstore/tests -vv -s"