Skip to content

Commit 8cef624

Browse files
committed
2 parents 9b58da5 + 34ba6b2 commit 8cef624

File tree

5 files changed

+21
-9
lines changed

5 files changed

+21
-9
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ on:
44
merge_group:
55
push:
66
branches-ignore:
7-
# disabled for jaraco/skeleton#103
8-
# - gh-readonly-queue/** # Temporary merge queue-related GH-made branches
7+
# temporary GH branches relating to merge queues (jaraco/skeleton#93)
8+
- gh-readonly-queue/**
9+
tags:
10+
# required if branches-ignore is supplied (jaraco/skeleton#103)
11+
- '**'
912
pull_request:
1013

1114
concurrency:
@@ -34,10 +37,10 @@ env:
3437
jobs:
3538
test:
3639
strategy:
40+
# https://blog.jaraco.com/efficient-use-of-ci-resources/
3741
matrix:
3842
python:
3943
- "3.8"
40-
- "3.11"
4144
- "3.12"
4245
platform:
4346
- ubuntu-latest
@@ -48,6 +51,8 @@ jobs:
4851
platform: ubuntu-latest
4952
- python: "3.10"
5053
platform: ubuntu-latest
54+
- python: "3.11"
55+
platform: ubuntu-latest
5156
- python: pypy3.10
5257
platform: ubuntu-latest
5358
runs-on: ${{ matrix.platform }}

.readthedocs.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ build:
1010
os: ubuntu-lts-latest
1111
tools:
1212
python: latest
13+
# post-checkout job to ensure the clone isn't shallow jaraco/skeleton#114
14+
jobs:
15+
post_checkout:
16+
- git fetch --unshallow || true

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ requires = ["setuptools>=56", "setuptools_scm[toml]>=3.4.1"]
33
build-backend = "setuptools.build_meta"
44

55
[tool.setuptools_scm]
6+
7+
[tool.pytest-enabler.mypy]
8+
# disabled

pytest.ini

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
[pytest]
22
norecursedirs=dist build .tox .eggs
3-
addopts=--doctest-modules
3+
addopts=
4+
--doctest-modules
5+
--import-mode importlib
6+
consider_namespace_packages=true
47
filterwarnings=
58
## upstream
69

setup.cfg

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@ install_requires =
2020
[options.extras_require]
2121
testing =
2222
# upstream
23-
pytest >= 6
23+
pytest >= 6, != 8.1.1
2424
pytest-checkdocs >= 2.4
2525
pytest-cov
26-
# disabled
27-
#pytest-mypy; \
28-
# # workaround for jaraco/skeleton#22
29-
# python_implementation != "PyPy"
26+
pytest-mypy
3027
pytest-enabler >= 2.2
3128
pytest-ruff >= 0.2.1
3229

0 commit comments

Comments
 (0)