Merge branch 'main' into asarray-copy

Author: asmeurer

.github/workflows/docs-build.yml

@@ -0,0 +1,22 @@
+name: Docs Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+      - name: Install Dependencies
+        run: |
+          python -m pip install -r docs/requirements.txt
+      - name: Build Docs
+        run: |
+          cd docs
+          make html
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs-build
+          path: docs/_build/html

.github/workflows/docs.yml renamed to .github/workflows/docs-deploy.yml

@@ -1,30 +1,29 @@
-name: Docs
-on: [push, pull_request]
+name: Docs Deploy
+
+on:
+  push:
+    branches:
+      - main
+
 jobs:
-  docs:
+  deploy:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     environment:
-      name: docs-build-and-deploy
+      name: docs-deploy
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-      - name: Install Dependencies
-        run: |
-          python -m pip install -r docs/requirements.txt
-
-      - name: Build Docs
-        run: |
-          cd docs
-          make html
+      - name: Download Artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: docs-build.yml
+          name: docs-build
+          path: docs/_build/html
 
       # Note, the gh-pages deployment requires setting up a SSH deploy key.
       # See
       # https://github.com/JamesIves/github-pages-deploy-action/tree/dev#using-an-ssh-deploy-key-
       - name: Deploy
         uses: JamesIves/github-pages-deploy-action@v4
-        if: ${{ github.ref == 'refs/heads/main' }}
         with:
           folder: docs/_build/html
           ssh-key: ${{ secrets.DEPLOY_KEY }}

docs/changelog.md

@@ -5,7 +5,7 @@
 ## Minor Changes
 
 - Add [HTML documentation](https://data-apis.org/array-api-compat/). Includes
-  new documentation on the [module scope](scope) and new [developer
+  new documentation on the [scope of the package](scope) and new [developer
   documentation](dev/index.md).
 
 - Fix `array_api_compat.numpy.asarray(torch.Tensor)` to return a NumPy array.