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

pypa · Dec 16, 2022 · e12f73c · e12f73c
2 parents 6f7dd7c + c68ac3b
commit e12f73c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,8 +14,10 @@ env:
   # Request colored output from CLI tools supporting it. Different tools
   # interpret the value differently. For some, just being set is sufficient.
   # For others, it must be a non-zero integer. For yet others, being set
-  # to a non-empty value is sufficient.
-  FORCE_COLOR: -106
+  # to a non-empty value is sufficient. For tox, it must be one of
+  # <blank>, 0, 1, false, no, off, on, true, yes. The only enabling value
+  # in common is "1".
+  FORCE_COLOR: 1
   # MyPy's color enforcement (must be a non-zero number)
   MYPY_FORCE_COLOR: -42
   # Recognized by the `py` package, dependency of `pytest` (must be "1")
@@ -47,9 +49,9 @@ jobs:
         - local
         python:
         - "3.7"
-        - "3.10"
         # disabled due to #3365
         # - "3.11"
+        # - "3.12"
         # Workaround for actions/setup-python#508
         dev:
         - -dev
@@ -58,12 +60,19 @@ jobs:
         - macos-latest
         - windows-latest
         include:
+        - python: "3.8"
+          platform: ubuntu-latest
+        - python: "3.9"
+          platform: ubuntu-latest
+        - python: "3.10"
+          platform: ubuntu-latest
         - python: pypy3.9
           platform: ubuntu-latest
         - platform: ubuntu-latest
           python: "3.10"
           distutils: stdlib
     runs-on: ${{ matrix.platform }}
+    continue-on-error: ${{ matrix.python == '3.12' }}
     env:
       SETUPTOOLS_USE_DISTUTILS: ${{ matrix.distutils }}
     timeout-minutes: 75

diff --git a/docs/conf.py b/docs/conf.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 extensions = [
     'sphinx.ext.autodoc',
     'jaraco.packaging.sphinx',

diff --git a/pytest.ini b/pytest.ini
@@ -10,6 +10,9 @@ filterwarnings=
 	error
 
 	## upstream
+	# Ensure ResourceWarnings are emitted
+	default::ResourceWarning
+
 	# Suppress deprecation warning in flake8
 	ignore:SelectableGroups dict interface is deprecated::flake8
 

diff --git a/setup.cfg b/setup.cfg
@@ -43,7 +43,9 @@ testing =
 	# upstream
 	pytest >= 6
 	pytest-checkdocs >= 2.4
-	pytest-flake8
+	pytest-flake8; \
+		# workaround for tholo/pytest-flake8#87
+		python_version < "3.12"
 	# workaround for tholo/pytest-flake8#87
 	flake8 < 5
 	pytest-black >= 0.3.7; \