Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some tox/build/config tweaks #1077

Merged
merged 6 commits into from
Apr 29, 2024
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
5 changes: 0 additions & 5 deletions MANIFEST.in

This file was deleted.

15 changes: 6 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,15 @@ testing = ["filelock"]
psutil = ["psutil>=3.0"]
setproctitle = ["setproctitle"]

[tool.setuptools]
zip-safe = false
platforms = [
"linux",
"osx",
"win32",
]
include-package-data = false

[tool.setuptools_scm]
write_to = "src/xdist/_version.py"

[tool.pytest.ini_options]
# pytest-services also defines a worker_id fixture, disable
# it so they don't conflict with each other (#611).
addopts = "-ra -p no:pytest-services"
testpaths = ["testing"]

[tool.ruff]
src = ["src"]

Expand Down
38 changes: 11 additions & 27 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,34 +1,26 @@
[tox]
envlist=
envlist =
linting
py{38,39,310,311,312}-pytestlatest
py310-pytestmain
py310-psutil
py310-setproctitle
isolated_build = true

[testenv]
extras = testing
extras =
testing
psutil: psutil
setproctitle: setproctitle
deps =
pytestmin: pytest==7.0.0
pytestlatest: pytest
pytestmain: git+https://github.com/pytest-dev/pytest.git
commands=
pytest {posargs}

[testenv:py310-psutil]
extras =
testing
psutil
commands =
pytest {posargs:-k psutil}

[testenv:py310-setproctitle]
extras =
testing
setproctitle
deps = pytest
commands =
pytest {posargs}
pytest {posargs:{env:_XDIST_TOX_DEFAULT_POSARGS:}}
setenv =
_XDIST_TOX_DEFAULT_POSARGS={env:_XDIST_TOX_POSARGS_PSUTIL:}
psutil: _XDIST_TOX_POSARGS_PSUTIL=-k psutil

[testenv:linting]
skip_install = True
Expand All @@ -39,9 +31,8 @@ deps =
commands = pre-commit run --all-files --show-diff-on-failure

[testenv:release]
changedir=
changedir =
description = do a release, required posarg of the version number
basepython = python3.10
skipsdist = True
usedevelop = True
passenv = *
Expand All @@ -51,16 +42,9 @@ commands =
towncrier build --version {posargs} --yes

[testenv:docs]
basepython = python3.10
usedevelop = True
deps =
sphinx
sphinx_rtd_theme
commands =
sphinx-build -W --keep-going -b html docs docs/_build/html {posargs:}

[pytest]
# pytest-services also defines a worker_id fixture, disable
# it so they don't conflict with each other (#611).
addopts = -ra -p no:pytest-services
testpaths = testing