Skip to content

Commit

Permalink
Merge pull request #10 from BeyondEvil/free-at-last
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoddemus authored Dec 11, 2020
2 parents c46b08c + d2ffe41 commit 6af929d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ["3.5", "3.6", "3.7", "3.8"]
python: ["3.5", "3.6", "3.7", "3.8", "3.9"]
os: [ubuntu-latest, windows-latest]
include:
- python: "3.5"
Expand All @@ -21,6 +21,8 @@ jobs:
tox_env: "py37"
- python: "3.8"
tox_env: "py38"
- python: "3.9"
tox_env: "py39"

steps:
- uses: actions/checkout@v1
Expand Down Expand Up @@ -55,6 +57,7 @@ jobs:
tox -e linting
deploy:
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && github.repository == 'pytest-dev/pytest-reportlog'

runs-on: ubuntu-latest

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
0.1.2 (2020-12-11)
------------------

* `#10 <https://github.com/pytest-dev/pytest-reportlog/pull/10>`_: Fix support for `pytest-xdist <https://github.com/pytest-dev/pytest-xdist>`_ 2.0.


0.1.1 (2020-04-16)
------------------

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Topic :: Software Development :: Testing",
],
)
2 changes: 1 addition & 1 deletion src/pytest_reportlog/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def pytest_addoption(parser):

def pytest_configure(config):
report_log = config.option.report_log
if report_log and not hasattr(config, "slaveinput"):
if report_log and not hasattr(config, "workerinput"):
config._report_log_plugin = ReportLogPlugin(config, Path(report_log))
config.pluginmanager.register(config._report_log_plugin)

Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[tox]
envlist = py{35,36,37,38}, linting
envlist = py{35,36,37,38,39},linting

[testenv]
deps =
pytest-xdist
commands =
pytest tests
pytest -n1 tests

[testenv:linting]
skipsdist = True
Expand Down

0 comments on commit 6af929d

Please sign in to comment.