From c3f0f7603593b6080341511fc8acc64784a318ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jim=20Br=C3=A4nnlund?= <jimbrannlund@fastmail.com>
Date: Fri, 11 Dec 2020 09:01:39 +0100
Subject: [PATCH 1/4] support pytest-xdist 2.0

---
 src/pytest_reportlog/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pytest_reportlog/plugin.py b/src/pytest_reportlog/plugin.py
index a5e9351..d0b6a87 100644
--- a/src/pytest_reportlog/plugin.py
+++ b/src/pytest_reportlog/plugin.py
@@ -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)
 

From 5ca5dbf3a654b3c5a088cbdfbc3a17608fba732d Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 11 Dec 2020 08:20:14 -0300
Subject: [PATCH 2/4] Add testing for Python 3.9

---
 .github/workflows/main.yml | 4 +++-
 setup.py                   | 1 +
 tox.ini                    | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8dd16af..c4aa2b7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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"
@@ -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
diff --git a/setup.py b/setup.py
index 05f9b67..58c130c 100644
--- a/setup.py
+++ b/setup.py
@@ -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",
     ],
 )
diff --git a/tox.ini b/tox.ini
index c14daa4..486341c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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

From ac5727b6e906ce7bccd3418f6ddbf565263a426e Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 11 Dec 2020 08:24:17 -0300
Subject: [PATCH 3/4] Update CHANGELOG for 0.1.2

---
 CHANGELOG.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6725d33..943c47b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -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)
 ------------------
 

From d2ffe418f8a4f24636efcec4df9d0d6312096ebb Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 11 Dec 2020 08:28:15 -0300
Subject: [PATCH 4/4] Skip deploy job when pushing non-tags

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c4aa2b7..183c56a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -57,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