Skip to content

Commit c98ada9

Browse files
ionelmcionelmc
committed
Update skel, and bump min python to 3.8, add 3.12 in the test grid. Closes #610.
1 parent eb83085 commit c98ada9

19 files changed

+318
-254
lines changed

‎.bumpversion.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ replace = version = release = '{new_version}'
2222
[bumpversion:file:src/pytest_cov/__init__.py]
2323
search = __version__ = '{current_version}'
2424
replace = __version__ = '{new_version}'
25+
26+
[bumpversion:file:.cookiecutterrc]
27+
search = version: {current_version}
28+
replace = version: {new_version}

‎.cookiecutterrc

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,47 @@
11
# Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
22

33
default_context:
4-
allow_tests_inside_package: no
5-
appveyor: no
4+
allow_tests_inside_package: 'no'
65
c_extension_function: '-'
76
c_extension_module: '-'
8-
c_extension_optional: no
9-
c_extension_support: no
10-
c_extension_test_pypi: no
11-
c_extension_test_pypi_username: '-'
12-
codacy: no
7+
c_extension_optional: 'no'
8+
c_extension_support: 'no'
9+
codacy: 'no'
1310
codacy_projectid: '[Get ID from https://app.codacy.com/app/ionelmc/pytest-cov/settings]'
14-
codeclimate: no
15-
codecov: no
16-
command_line_interface: no
11+
codeclimate: 'no'
12+
codecov: 'no'
13+
command_line_interface: 'no'
1714
command_line_interface_bin_name: '-'
18-
coveralls: no
15+
coveralls: 'no'
1916
distribution_name: pytest-cov
2017
email: [email protected]
18+
formatter_quote_style: single
2119
full_name: Ionel Cristian Mărieș
22-
github_actions: yes
23-
legacy_python: yes
20+
github_actions: 'yes'
21+
github_actions_osx: 'yes'
22+
github_actions_windows: 'yes'
2423
license: MIT license
25-
linter: flake8
2624
package_name: pytest_cov
27-
pre_commit: yes
25+
pre_commit: 'yes'
2826
project_name: pytest-cov
2927
project_short_description: This plugin produces coverage reports. It supports centralised testing and distributed testing in both load and each modes. It also supports coverage of subprocesses.
30-
pypi_badge: yes
31-
pypi_disable_upload: no
32-
release_date: '2021-10-04'
28+
pypi_badge: 'yes'
29+
pypi_disable_upload: 'no'
30+
release_date: '2023-05-24'
3331
repo_hosting: github.com
3432
repo_hosting_domain: github.com
3533
repo_main_branch: master
3634
repo_name: pytest-cov
3735
repo_username: pytest-dev
38-
requiresio: yes
39-
scrutinizer: no
40-
setup_py_uses_setuptools_scm: no
41-
setup_py_uses_test_runner: no
42-
sphinx_docs: yes
36+
scrutinizer: 'no'
37+
setup_py_uses_setuptools_scm: 'no'
38+
sphinx_docs: 'yes'
4339
sphinx_docs_hosting: https://pytest-cov.readthedocs.io/
44-
sphinx_doctest: no
40+
sphinx_doctest: 'no'
4541
sphinx_theme: sphinx-py3doc-enhanced-theme
46-
test_matrix_configurator: no
47-
test_matrix_separate_coverage: no
48-
test_runner: pytest
49-
travis: no
50-
travis_osx: no
51-
version: 3.0.0
42+
test_matrix_separate_coverage: 'no'
43+
version: 4.1.0
5244
version_manager: bump2version
5345
website: http://blog.ionelmc.ro
5446
year_from: '2010'
55-
year_to: '2022'
47+
year_to: '2024'

‎.github/workflows/test.yml

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -60,155 +60,155 @@ jobs:
6060
toxpython: 'python3.11'
6161
tox_env: 'docs'
6262
os: 'ubuntu-latest'
63-
- name: 'py37-pytest73-xdist330-coverage72 (ubuntu)'
64-
python: '3.7'
65-
toxpython: 'python3.7'
66-
python_arch: 'x64'
67-
tox_env: 'py37-pytest73-xdist330-coverage72'
68-
os: 'ubuntu-latest'
69-
- name: 'py37-pytest73-xdist330-coverage72 (windows)'
70-
python: '3.7'
71-
toxpython: 'python3.7'
72-
python_arch: 'x64'
73-
tox_env: 'py37-pytest73-xdist330-coverage72'
74-
os: 'windows-latest'
75-
- name: 'py37-pytest73-xdist330-coverage72 (macos)'
76-
python: '3.7'
77-
toxpython: 'python3.7'
78-
python_arch: 'x64'
79-
tox_env: 'py37-pytest73-xdist330-coverage72'
80-
os: 'macos-latest'
81-
- name: 'py38-pytest73-xdist330-coverage72 (ubuntu)'
63+
- name: 'py38-pytest81-xdist350-coverage74 (ubuntu)'
8264
python: '3.8'
8365
toxpython: 'python3.8'
8466
python_arch: 'x64'
85-
tox_env: 'py38-pytest73-xdist330-coverage72'
67+
tox_env: 'py38-pytest81-xdist350-coverage74'
8668
os: 'ubuntu-latest'
87-
- name: 'py38-pytest73-xdist330-coverage72 (windows)'
69+
- name: 'py38-pytest81-xdist350-coverage74 (windows)'
8870
python: '3.8'
8971
toxpython: 'python3.8'
9072
python_arch: 'x64'
91-
tox_env: 'py38-pytest73-xdist330-coverage72'
73+
tox_env: 'py38-pytest81-xdist350-coverage74'
9274
os: 'windows-latest'
93-
- name: 'py38-pytest73-xdist330-coverage72 (macos)'
75+
- name: 'py38-pytest81-xdist350-coverage74 (macos)'
9476
python: '3.8'
9577
toxpython: 'python3.8'
9678
python_arch: 'x64'
97-
tox_env: 'py38-pytest73-xdist330-coverage72'
79+
tox_env: 'py38-pytest81-xdist350-coverage74'
9880
os: 'macos-latest'
99-
- name: 'py39-pytest73-xdist330-coverage72 (ubuntu)'
81+
- name: 'py39-pytest81-xdist350-coverage74 (ubuntu)'
10082
python: '3.9'
10183
toxpython: 'python3.9'
10284
python_arch: 'x64'
103-
tox_env: 'py39-pytest73-xdist330-coverage72'
85+
tox_env: 'py39-pytest81-xdist350-coverage74'
10486
os: 'ubuntu-latest'
105-
- name: 'py39-pytest73-xdist330-coverage72 (windows)'
87+
- name: 'py39-pytest81-xdist350-coverage74 (windows)'
10688
python: '3.9'
10789
toxpython: 'python3.9'
10890
python_arch: 'x64'
109-
tox_env: 'py39-pytest73-xdist330-coverage72'
91+
tox_env: 'py39-pytest81-xdist350-coverage74'
11092
os: 'windows-latest'
111-
- name: 'py39-pytest73-xdist330-coverage72 (macos)'
93+
- name: 'py39-pytest81-xdist350-coverage74 (macos)'
11294
python: '3.9'
11395
toxpython: 'python3.9'
11496
python_arch: 'x64'
115-
tox_env: 'py39-pytest73-xdist330-coverage72'
97+
tox_env: 'py39-pytest81-xdist350-coverage74'
11698
os: 'macos-latest'
117-
- name: 'py310-pytest73-xdist330-coverage72 (ubuntu)'
99+
- name: 'py310-pytest81-xdist350-coverage74 (ubuntu)'
118100
python: '3.10'
119101
toxpython: 'python3.10'
120102
python_arch: 'x64'
121-
tox_env: 'py310-pytest73-xdist330-coverage72'
103+
tox_env: 'py310-pytest81-xdist350-coverage74'
122104
os: 'ubuntu-latest'
123-
- name: 'py310-pytest73-xdist330-coverage72 (windows)'
105+
- name: 'py310-pytest81-xdist350-coverage74 (windows)'
124106
python: '3.10'
125107
toxpython: 'python3.10'
126108
python_arch: 'x64'
127-
tox_env: 'py310-pytest73-xdist330-coverage72'
109+
tox_env: 'py310-pytest81-xdist350-coverage74'
128110
os: 'windows-latest'
129-
- name: 'py310-pytest73-xdist330-coverage72 (macos)'
111+
- name: 'py310-pytest81-xdist350-coverage74 (macos)'
130112
python: '3.10'
131113
toxpython: 'python3.10'
132114
python_arch: 'x64'
133-
tox_env: 'py310-pytest73-xdist330-coverage72'
115+
tox_env: 'py310-pytest81-xdist350-coverage74'
134116
os: 'macos-latest'
135-
- name: 'py311-pytest73-xdist330-coverage72 (ubuntu)'
117+
- name: 'py311-pytest81-xdist350-coverage74 (ubuntu)'
136118
python: '3.11'
137119
toxpython: 'python3.11'
138120
python_arch: 'x64'
139-
tox_env: 'py311-pytest73-xdist330-coverage72'
121+
tox_env: 'py311-pytest81-xdist350-coverage74'
140122
os: 'ubuntu-latest'
141-
- name: 'py311-pytest73-xdist330-coverage72 (windows)'
123+
- name: 'py311-pytest81-xdist350-coverage74 (windows)'
142124
python: '3.11'
143125
toxpython: 'python3.11'
144126
python_arch: 'x64'
145-
tox_env: 'py311-pytest73-xdist330-coverage72'
127+
tox_env: 'py311-pytest81-xdist350-coverage74'
146128
os: 'windows-latest'
147-
- name: 'py311-pytest73-xdist330-coverage72 (macos)'
129+
- name: 'py311-pytest81-xdist350-coverage74 (macos)'
148130
python: '3.11'
149131
toxpython: 'python3.11'
150132
python_arch: 'x64'
151-
tox_env: 'py311-pytest73-xdist330-coverage72'
133+
tox_env: 'py311-pytest81-xdist350-coverage74'
152134
os: 'macos-latest'
153-
- name: 'pypy37-pytest73-xdist330-coverage72 (ubuntu)'
154-
python: 'pypy-3.7'
155-
toxpython: 'pypy3.7'
135+
- name: 'py312-pytest81-xdist350-coverage74 (ubuntu)'
136+
python: '3.12'
137+
toxpython: 'python3.12'
156138
python_arch: 'x64'
157-
tox_env: 'pypy37-pytest73-xdist330-coverage72'
139+
tox_env: 'py312-pytest81-xdist350-coverage74'
158140
os: 'ubuntu-latest'
159-
- name: 'pypy37-pytest73-xdist330-coverage72 (windows)'
160-
python: 'pypy-3.7'
161-
toxpython: 'pypy3.7'
141+
- name: 'py312-pytest81-xdist350-coverage74 (windows)'
142+
python: '3.12'
143+
toxpython: 'python3.12'
162144
python_arch: 'x64'
163-
tox_env: 'pypy37-pytest73-xdist330-coverage72'
145+
tox_env: 'py312-pytest81-xdist350-coverage74'
164146
os: 'windows-latest'
165-
- name: 'pypy37-pytest73-xdist330-coverage72 (macos)'
166-
python: 'pypy-3.7'
167-
toxpython: 'pypy3.7'
147+
- name: 'py312-pytest81-xdist350-coverage74 (macos)'
148+
python: '3.12'
149+
toxpython: 'python3.12'
168150
python_arch: 'x64'
169-
tox_env: 'pypy37-pytest73-xdist330-coverage72'
151+
tox_env: 'py312-pytest81-xdist350-coverage74'
170152
os: 'macos-latest'
171-
- name: 'pypy38-pytest73-xdist330-coverage72 (ubuntu)'
153+
- name: 'pypy38-pytest81-xdist350-coverage74 (ubuntu)'
172154
python: 'pypy-3.8'
173155
toxpython: 'pypy3.8'
174156
python_arch: 'x64'
175-
tox_env: 'pypy38-pytest73-xdist330-coverage72'
157+
tox_env: 'pypy38-pytest81-xdist350-coverage74'
176158
os: 'ubuntu-latest'
177-
- name: 'pypy38-pytest73-xdist330-coverage72 (windows)'
159+
- name: 'pypy38-pytest81-xdist350-coverage74 (windows)'
178160
python: 'pypy-3.8'
179161
toxpython: 'pypy3.8'
180162
python_arch: 'x64'
181-
tox_env: 'pypy38-pytest73-xdist330-coverage72'
163+
tox_env: 'pypy38-pytest81-xdist350-coverage74'
182164
os: 'windows-latest'
183-
- name: 'pypy38-pytest73-xdist330-coverage72 (macos)'
165+
- name: 'pypy38-pytest81-xdist350-coverage74 (macos)'
184166
python: 'pypy-3.8'
185167
toxpython: 'pypy3.8'
186168
python_arch: 'x64'
187-
tox_env: 'pypy38-pytest73-xdist330-coverage72'
169+
tox_env: 'pypy38-pytest81-xdist350-coverage74'
188170
os: 'macos-latest'
189-
- name: 'pypy39-pytest73-xdist330-coverage72 (ubuntu)'
171+
- name: 'pypy39-pytest81-xdist350-coverage74 (ubuntu)'
190172
python: 'pypy-3.9'
191173
toxpython: 'pypy3.9'
192174
python_arch: 'x64'
193-
tox_env: 'pypy39-pytest73-xdist330-coverage72'
175+
tox_env: 'pypy39-pytest81-xdist350-coverage74'
194176
os: 'ubuntu-latest'
195-
- name: 'pypy39-pytest73-xdist330-coverage72 (windows)'
177+
- name: 'pypy39-pytest81-xdist350-coverage74 (windows)'
196178
python: 'pypy-3.9'
197179
toxpython: 'pypy3.9'
198180
python_arch: 'x64'
199-
tox_env: 'pypy39-pytest73-xdist330-coverage72'
181+
tox_env: 'pypy39-pytest81-xdist350-coverage74'
200182
os: 'windows-latest'
201-
- name: 'pypy39-pytest73-xdist330-coverage72 (macos)'
183+
- name: 'pypy39-pytest81-xdist350-coverage74 (macos)'
202184
python: 'pypy-3.9'
203185
toxpython: 'pypy3.9'
204186
python_arch: 'x64'
205-
tox_env: 'pypy39-pytest73-xdist330-coverage72'
187+
tox_env: 'pypy39-pytest81-xdist350-coverage74'
188+
os: 'macos-latest'
189+
- name: 'pypy310-pytest81-xdist350-coverage74 (ubuntu)'
190+
python: 'pypy-3.10'
191+
toxpython: 'pypy3.10'
192+
python_arch: 'x64'
193+
tox_env: 'pypy310-pytest81-xdist350-coverage74'
194+
os: 'ubuntu-latest'
195+
- name: 'pypy310-pytest81-xdist350-coverage74 (windows)'
196+
python: 'pypy-3.10'
197+
toxpython: 'pypy3.10'
198+
python_arch: 'x64'
199+
tox_env: 'pypy310-pytest81-xdist350-coverage74'
200+
os: 'windows-latest'
201+
- name: 'pypy310-pytest81-xdist350-coverage74 (macos)'
202+
python: 'pypy-3.10'
203+
toxpython: 'pypy3.10'
204+
python_arch: 'x64'
205+
tox_env: 'pypy310-pytest81-xdist350-coverage74'
206206
os: 'macos-latest'
207207
steps:
208-
- uses: actions/checkout@v3
208+
- uses: actions/checkout@v4
209209
with:
210210
fetch-depth: 0
211-
- uses: actions/setup-python@v4
211+
- uses: actions/setup-python@v5
212212
with:
213213
python-version: ${{ matrix.python }}
214214
architecture: ${{ matrix.python_arch }}

‎.pre-commit-config.yaml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
# To install the git pre-commit hook run:
2-
# pre-commit install
3-
# To update the pre-commit hooks run:
1+
# To install the git pre-commit hooks run:
2+
# pre-commit install --install-hooks
3+
# To update the versions:
44
# pre-commit autoupdate
5+
exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
6+
# Note the order is intentional to avoid multiple passes of the hooks
57
repos:
8+
- repo: https://github.com/astral-sh/ruff-pre-commit
9+
rev: v0.3.3
10+
hooks:
11+
- id: ruff
12+
args: [--fix, --exit-non-zero-on-fix, --show-fixes]
13+
- repo: https://github.com/psf/black
14+
rev: 24.3.0
15+
hooks:
16+
- id: black
617
- repo: https://github.com/pre-commit/pre-commit-hooks
7-
rev: v4.4.0
18+
rev: v4.5.0
819
hooks:
920
- id: trailing-whitespace
1021
- id: end-of-file-fixer
1122
exclude: '.*\.pth$'
1223
- id: debug-statements
13-
- repo: https://github.com/PyCQA/isort
14-
rev: 5.12.0
15-
hooks:
16-
- id: isort
17-
- repo: https://github.com/asottile/pyupgrade
18-
rev: v3.3.1
19-
hooks:
20-
- id: pyupgrade
21-
args: [--py37-plus]
22-
- repo: https://github.com/PyCQA/flake8
23-
rev: 6.0.0
24-
hooks:
25-
- id: flake8

‎.readthedocs.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ version: 2
33
sphinx:
44
configuration: docs/conf.py
55
formats: all
6+
build:
7+
os: ubuntu-22.04
8+
tools:
9+
python: "3"
610
python:
7-
version: 3
811
install:
912
- requirements: docs/requirements.txt
1013
- method: pip

‎AUTHORS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Authors
23
=======
34

‎CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Changelog
23
=========
34

0 commit comments

Comments
 (0)