Skip to content

Commit e12f73c

Browse files
committed
2 parents 6f7dd7c + c68ac3b commit e12f73c

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

.github/workflows/main.yml

+12-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ env:
1414
# Request colored output from CLI tools supporting it. Different tools
1515
# interpret the value differently. For some, just being set is sufficient.
1616
# For others, it must be a non-zero integer. For yet others, being set
17-
# to a non-empty value is sufficient.
18-
FORCE_COLOR: -106
17+
# to a non-empty value is sufficient. For tox, it must be one of
18+
# <blank>, 0, 1, false, no, off, on, true, yes. The only enabling value
19+
# in common is "1".
20+
FORCE_COLOR: 1
1921
# MyPy's color enforcement (must be a non-zero number)
2022
MYPY_FORCE_COLOR: -42
2123
# Recognized by the `py` package, dependency of `pytest` (must be "1")
@@ -47,9 +49,9 @@ jobs:
4749
- local
4850
python:
4951
- "3.7"
50-
- "3.10"
5152
# disabled due to #3365
5253
# - "3.11"
54+
# - "3.12"
5355
# Workaround for actions/setup-python#508
5456
dev:
5557
- -dev
@@ -58,12 +60,19 @@ jobs:
5860
- macos-latest
5961
- windows-latest
6062
include:
63+
- python: "3.8"
64+
platform: ubuntu-latest
65+
- python: "3.9"
66+
platform: ubuntu-latest
67+
- python: "3.10"
68+
platform: ubuntu-latest
6169
- python: pypy3.9
6270
platform: ubuntu-latest
6371
- platform: ubuntu-latest
6472
python: "3.10"
6573
distutils: stdlib
6674
runs-on: ${{ matrix.platform }}
75+
continue-on-error: ${{ matrix.python == '3.12' }}
6776
env:
6877
SETUPTOOLS_USE_DISTUTILS: ${{ matrix.distutils }}
6978
timeout-minutes: 75

docs/conf.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/usr/bin/env python3
2-
31
extensions = [
42
'sphinx.ext.autodoc',
53
'jaraco.packaging.sphinx',

pytest.ini

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ filterwarnings=
1010
error
1111

1212
## upstream
13+
# Ensure ResourceWarnings are emitted
14+
default::ResourceWarning
15+
1316
# Suppress deprecation warning in flake8
1417
ignore:SelectableGroups dict interface is deprecated::flake8
1518

setup.cfg

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ testing =
4343
# upstream
4444
pytest >= 6
4545
pytest-checkdocs >= 2.4
46-
pytest-flake8
46+
pytest-flake8; \
47+
# workaround for tholo/pytest-flake8#87
48+
python_version < "3.12"
4749
# workaround for tholo/pytest-flake8#87
4850
flake8 < 5
4951
pytest-black >= 0.3.7; \

0 commit comments

Comments
 (0)