Merge branch 'main' into Merge-typeshed-return-annotations

Avasam · Dec 23, 2024 · 5e17283 · 5e17283
2 parents 31b7fdc + cc43212
commit 5e17283
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -63,6 +63,9 @@ jobs:
         - platform: ubuntu-latest
           python: "3.10"
           distutils: stdlib
+        # TODO: Re-evaluate the need for the following workaround
+        exclude:
+        - {python: "3.9", platform: "macos-latest"}  # actions/setup-python#981
     runs-on: ${{ matrix.platform }}
     continue-on-error: ${{ matrix.python == '3.14' }}
     env:

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
@@ -199,7 +199,7 @@ Package discovery
 -----------------
 For projects that follow a simple directory structure, ``setuptools`` should be
 able to automatically detect all :term:`packages <package>` and
-:term:`namespaces <namespace>`. However, complex projects might include
+:term:`namespaces <namespace-package>`. However, complex projects might include
 additional folders and supporting files that not necessarily should be
 distributed (or that can confuse ``setuptools`` auto discovery algorithm).