Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 2 additions & 68 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,72 +17,6 @@ jobs:
python: '3.13'
tox_env: 'docs'
os: 'ubuntu-latest'
- name: 'py39-pytest84-nodist-cover (ubuntu/x64)'
python: '3.9'
python_arch: 'x64'
tox_env: 'py39-pytest84-nodist-cover'
os: 'ubuntu-latest'
cover: true
- name: 'py39-pytest84-nodist-cover (windows/x64)'
python: '3.9'
python_arch: 'x64'
tox_env: 'py39-pytest84-nodist-cover'
os: 'windows-latest'
cover: true
- name: 'py39-pytest84-nodist-cover (macos/arm64)'
python: '3.9'
python_arch: 'arm64'
tox_env: 'py39-pytest84-nodist-cover'
os: 'macos-latest'
cover: true
- name: 'py39-pytest84-nodist-nocov (ubuntu/x64)'
python: '3.9'
python_arch: 'x64'
tox_env: 'py39-pytest84-nodist-nocov'
os: 'ubuntu-latest'
- name: 'py39-pytest84-nodist-nocov (windows/x64)'
python: '3.9'
python_arch: 'x64'
tox_env: 'py39-pytest84-nodist-nocov'
os: 'windows-latest'
- name: 'py39-pytest84-nodist-nocov (macos/arm64)'
python: '3.9'
python_arch: 'arm64'
tox_env: 'py39-pytest84-nodist-nocov'
os: 'macos-latest'
- name: 'py39-pytest84-xdist-cover (ubuntu/x64)'
python: '3.9'
python_arch: 'x64'
tox_env: 'py39-pytest84-xdist-cover'
os: 'ubuntu-latest'
cover: true
- name: 'py39-pytest84-xdist-cover (windows/x64)'
python: '3.9'
python_arch: 'x64'
tox_env: 'py39-pytest84-xdist-cover'
os: 'windows-latest'
cover: true
- name: 'py39-pytest84-xdist-cover (macos/arm64)'
python: '3.9'
python_arch: 'arm64'
tox_env: 'py39-pytest84-xdist-cover'
os: 'macos-latest'
cover: true
- name: 'py39-pytest84-xdist-nocov (ubuntu/x64)'
python: '3.9'
python_arch: 'x64'
tox_env: 'py39-pytest84-xdist-nocov'
os: 'ubuntu-latest'
- name: 'py39-pytest84-xdist-nocov (windows/x64)'
python: '3.9'
python_arch: 'x64'
tox_env: 'py39-pytest84-xdist-nocov'
os: 'windows-latest'
- name: 'py39-pytest84-xdist-nocov (macos/arm64)'
python: '3.9'
python_arch: 'arm64'
tox_env: 'py39-pytest84-xdist-nocov'
os: 'macos-latest'
- name: 'py310-pytest84-nodist-cover (ubuntu/x64)'
python: '3.10'
python_arch: 'x64'
Expand Down Expand Up @@ -876,10 +810,10 @@ jobs:
tox_env: 'pypy311-pytest90-xdist-nocov'
os: 'macos-latest'
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
- uses: actions/setup-python@v5
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python }}
architecture: ${{ matrix.python_arch }}
Expand Down
1 change: 1 addition & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ Authors
* Sorin Sbarnea - https://github.com/ssbarnea
* Enno Gotthold - https://github.com/SchoolGuy
* Thomas B. Brunner - https://github.com/thomasbbrunner
* Hugo van Kemenade - https://github.com/hugovk
2 changes: 1 addition & 1 deletion ci/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def main():
# This uses sys.executable the same way that the call in
# cookiecutter-pylibrary/hooks/post_gen_project.py
# invokes this bootstrap.py itself.
for line in subprocess.check_output([sys.executable, '-m', 'tox', '--listenvs'], universal_newlines=True).splitlines()
for line in subprocess.check_output([sys.executable, '-m', 'tox', '--listenvs'], text=True).splitlines()
]
tox_environments = [line for line in tox_environments if line.startswith('py')]
for template in templates_path.rglob('*'):
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ classifiers = [
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
Expand All @@ -47,7 +46,7 @@ keywords = [
"pytest",
"benchmark",
]
requires-python = ">=3.9"
requires-python = ">=3.10"
dependencies = [
"pytest>=8.1",
"py-cpuinfo",
Expand Down
2 changes: 1 addition & 1 deletion src/pytest_benchmark/fixture.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from .utils import slugify

statistics: typing.Any
statistics_error: typing.Optional[str] = None
statistics_error: str | None = None
try:
import statistics
except (ImportError, SyntaxError):
Expand Down
2 changes: 1 addition & 1 deletion src/pytest_benchmark/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def in_any_parent(name, path=None):


def subprocess_output(cmd):
return check_output(cmd.split(), stderr=subprocess.STDOUT, universal_newlines=True).strip()
return check_output(cmd.split(), stderr=subprocess.STDOUT, text=True).strip()


def get_commit_info(project_name=None):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
list(normalize_stats(bench['stats']) for bench in JSON_DATA['benchmarks'])


class Namespace(object):
class Namespace:
def __init__(self, **kwargs):
self.__dict__.update(kwargs)

Expand Down
11 changes: 1 addition & 10 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ envlist =
clean,
check,
docs,
{py39,py310,py311,py312,py313,py314,pypy311}-{pytest84}-{nodist,xdist}-{cover,nocov},
{py310,py311,py312,py313,py314,pypy311}-{pytest90}-{nodist,xdist}-{cover,nocov},
{py310,py311,py312,py313,py314,pypy311}-{pytest84,pytest90}-{nodist,xdist}-{cover,nocov},
report
ignore_basepython_conflict = true

Expand All @@ -36,14 +35,6 @@ usedevelop =
deps =
pytest-instafail==0.5.0
xdist: pytest-xdist==3.8.0
pytest71: pytest==7.1.3
pytest72: pytest==7.2.2
pytest73: pytest==7.3.2
pytest74: pytest==7.4.4
pytest80: pytest==8.0.2
pytest81: pytest==8.1.2
pytest82: pytest==8.2.2
pytest83: pytest==8.3.4
pytest84: pytest==8.4.2
pytest90: pytest==9.0.0
cover: pytest-cov
Expand Down