Skip to content

Commit 55c5cdb

Browse files
committed
Remove --boxed and pytest-forked dependency
Fixes #468 Fixes #543
1 parent e407a33 commit 55c5cdb

File tree

7 files changed

+2
-41
lines changed

7 files changed

+2
-41
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pytest-xdist 2.5.0 (2021-12-10)
44
Deprecations and Removals
55
-------------------------
66

7-
- `#468 <https://github.com/pytest-dev/pytest-xdist/issues/468>`_: The ``--boxed`` command line argument is deprecated. Install pytest-forked and use ``--forked`` instead. pytest-xdist 3.0.0 will remove the ``--boxed`` argument and pytest-forked dependency.
7+
- `#468 <https://github.com/pytest-dev/pytest-xdist/issues/468>`_: The ``--boxed`` command line argument is deprecated. Install `pytest-forked <https://pypi.org/project/pytest-forked>`__ and use ``--forked`` instead. pytest-xdist 3.0.0 will remove the ``--boxed`` argument and ``pytest-forked`` dependency.
88

99

1010
Features

changelog/468.removal.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The ``--boxed`` command-line option has been removed. If you still need this functionality, install `pytest-forked <https://pypi.org/project/pytest-forked>`__ separately.

docs/boxed.rst

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Features
5555

5656
distribution
5757
subprocess
58-
boxed
5958
remote
6059
crash
6160
how-to

setup.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ python_requires = >=3.6
4444
install_requires =
4545
execnet>=1.1
4646
pytest>=6.2.0
47-
pytest-forked
4847
setup_requires = # left empty, enforce using isolated build system
4948

5049
[options.packages.find]

src/xdist/plugin.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,6 @@ def pytest_addoption(parser):
135135
metavar="GLOB",
136136
help="add expression for ignores when rsyncing to remote tx nodes.",
137137
)
138-
group.addoption(
139-
"--boxed",
140-
action="store_true",
141-
help="backward compatibility alias for pytest-forked --forked",
142-
)
143138
group.addoption(
144139
"--testrunuid",
145140
action="store",
@@ -196,14 +191,6 @@ def pytest_configure(config):
196191
tr = config.pluginmanager.getplugin("terminalreporter")
197192
if tr:
198193
tr.showfspath = False
199-
if config.getoption("boxed"):
200-
warning = DeprecationWarning(
201-
"The --boxed command line argument is deprecated. "
202-
"Install pytest-forked and use --forked instead. "
203-
"pytest-xdist 3.0.0 will remove the --boxed argument and pytest-forked dependency."
204-
)
205-
config.issue_config_time_warning(warning, 2)
206-
config.option.forked = True
207194

208195
config_line = (
209196
"xdist_group: specify group for tests should run in same session."

testing/test_plugin.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -122,22 +122,6 @@ def pytest_xdist_auto_num_workers():
122122
assert config.getoption("numprocesses") == 42
123123

124124

125-
def test_boxed_with_collect_only(pytester: pytest.Pytester) -> None:
126-
from xdist.plugin import pytest_cmdline_main as check_options
127-
128-
config = pytester.parseconfigure("-n1", "--boxed")
129-
check_options(config)
130-
assert config.option.forked
131-
132-
config = pytester.parseconfigure("-n1", "--collect-only")
133-
check_options(config)
134-
assert not config.option.forked
135-
136-
config = pytester.parseconfigure("-n1", "--boxed", "--collect-only")
137-
check_options(config)
138-
assert config.option.forked
139-
140-
141125
def test_dsession_with_collect_only(pytester: pytest.Pytester) -> None:
142126
from xdist.plugin import pytest_cmdline_main as check_options
143127
from xdist.plugin import pytest_configure as configure

0 commit comments

Comments
 (0)