Merge https://github.com/jaraco/skeleton

# Conflicts: # pyproject.toml
jaraco · Apr 24, 2024 · 0fe1cf1 · 0fe1cf1
2 parents 2d276c2 + bcf8f07
commit 0fe1cf1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -50,7 +50,7 @@ jobs:
         - python: pypy3.10
           platform: ubuntu-latest
     runs-on: ${{ matrix.platform }}
-    continue-on-error: ${{ matrix.python == '3.13' }}
+    continue-on-error: ${{ matrix.python == '3.13' || (matrix.python == '3.8' || matrix.python == '3.9') && matrix.platform == 'macos-latest' }}
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python

diff --git a/pyproject.toml b/pyproject.toml
@@ -28,7 +28,7 @@ Homepage = "https://github.com/jaraco/jaraco.functools"
 [project.optional-dependencies]
 testing = [
 	# upstream
-	"pytest >= 6",
+	"pytest >= 6, != 8.1.*",
 	"pytest-checkdocs >= 2.4",
 	"pytest-cov",
 	"pytest-mypy",