Skip to content

Commit 6af929d

Browse files
authored
Merge pull request #10 from BeyondEvil/free-at-last
2 parents c46b08c + d2ffe41 commit 6af929d

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
python: ["3.5", "3.6", "3.7", "3.8"]
13+
python: ["3.5", "3.6", "3.7", "3.8", "3.9"]
1414
os: [ubuntu-latest, windows-latest]
1515
include:
1616
- python: "3.5"
@@ -21,6 +21,8 @@ jobs:
2121
tox_env: "py37"
2222
- python: "3.8"
2323
tox_env: "py38"
24+
- python: "3.9"
25+
tox_env: "py39"
2426

2527
steps:
2628
- uses: actions/checkout@v1
@@ -55,6 +57,7 @@ jobs:
5557
tox -e linting
5658
5759
deploy:
60+
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && github.repository == 'pytest-dev/pytest-reportlog'
5861

5962
runs-on: ubuntu-latest
6063

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
0.1.2 (2020-12-11)
2+
------------------
3+
4+
* `#10 <https://github.com/pytest-dev/pytest-reportlog/pull/10>`_: Fix support for `pytest-xdist <https://github.com/pytest-dev/pytest-xdist>`_ 2.0.
5+
6+
17
0.1.1 (2020-04-16)
28
------------------
39

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"Programming Language :: Python :: 3.6",
3535
"Programming Language :: Python :: 3.7",
3636
"Programming Language :: Python :: 3.8",
37+
"Programming Language :: Python :: 3.9",
3738
"Topic :: Software Development :: Testing",
3839
],
3940
)

src/pytest_reportlog/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def pytest_addoption(parser):
1919

2020
def pytest_configure(config):
2121
report_log = config.option.report_log
22-
if report_log and not hasattr(config, "slaveinput"):
22+
if report_log and not hasattr(config, "workerinput"):
2323
config._report_log_plugin = ReportLogPlugin(config, Path(report_log))
2424
config.pluginmanager.register(config._report_log_plugin)
2525

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[tox]
2-
envlist = py{35,36,37,38}, linting
2+
envlist = py{35,36,37,38,39},linting
33

44
[testenv]
55
deps =
66
pytest-xdist
77
commands =
8-
pytest tests
8+
pytest -n1 tests
99

1010
[testenv:linting]
1111
skipsdist = True

0 commit comments

Comments
 (0)