summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2022-12-15 22:30:36 -0500
committerJason R. Coombs <jaraco@jaraco.com>2022-12-15 22:30:36 -0500
commite12f73cad1f9040264355832cdfc38d0ab28bfe2 (patch)
tree9dc8d63b0afe9c0fc780bdfeba7a456bfb239873
parent6f7dd7c12ceffa2aefe28c2fbafbad2273980b2b (diff)
parentc68ac3b7a3001502f681722dc55dff70a3169276 (diff)
downloadpython-setuptools-git-e12f73cad1f9040264355832cdfc38d0ab28bfe2.tar.gz
Merge https://github.com/jaraco/skeleton
-rw-r--r--.github/workflows/main.yml15
-rw-r--r--docs/conf.py2
-rw-r--r--pytest.ini3
-rw-r--r--setup.cfg4
4 files changed, 18 insertions, 6 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7413fa7d..61e81781 100644
--- 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
index 64c2625f..a52569c9 100644
--- 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
index 9d326e54..12007ade 100644
--- 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
index 99c1bece..404193b0 100644
--- 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; \