diff --git a/pytest6.patch b/pytest6.patch
deleted file mode 100644
index ebc6222..0000000
--- a/pytest6.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From bfef85c948cfe6bf19c78baa2d497caf7b56d81a Mon Sep 17 00:00:00 2001
-From: Kyle Altendorf <sda@fstab.net>
-Date: Sat, 22 Aug 2020 17:58:08 -0400
-Subject: [PATCH] Update .assert_outcomes() calls for pytest 6.0
-
-https://github.com/python-trio/pytest-trio/pull/98#issuecomment-678699693
----
- pytest_trio/_tests/test_fixture_mistakes.py | 8 ++++----
- test-requirements.txt                       | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/pytest_trio/_tests/test_fixture_mistakes.py b/pytest_trio/_tests/test_fixture_mistakes.py
-index 6da6abb..5521a80 100644
---- a/pytest_trio/_tests/test_fixture_mistakes.py
-+++ b/pytest_trio/_tests/test_fixture_mistakes.py
-@@ -34,7 +34,7 @@ def test_sync_indirect(indirect_trio_time):
- 
-     result = testdir.runpytest()
- 
--    result.assert_outcomes(passed=1, error=2)
-+    result.assert_outcomes(passed=1, errors=2)
-     result.stdout.fnmatch_lines(
-         ["*: Trio fixtures can only be used by Trio tests*"]
-     )
-@@ -65,7 +65,7 @@ async def test_foo(self, async_class_fixture):
- 
-     result = testdir.runpytest()
- 
--    result.assert_outcomes(error=1)
-+    result.assert_outcomes(errors=1)
-     result.stdout.fnmatch_lines(["*: Trio fixtures must be function-scope*"])
- 
- 
-@@ -89,7 +89,7 @@ async def test_whatever(async_session_fixture):
- 
-     result = testdir.runpytest()
- 
--    result.assert_outcomes(error=1)
-+    result.assert_outcomes(errors=1)
-     result.stdout.fnmatch_lines(["*: Trio fixtures must be function-scope*"])
- 
- 
-@@ -113,7 +113,7 @@ def test_whatever(async_fixture):
- 
-     result = testdir.runpytest()
- 
--    result.assert_outcomes(error=1)
-+    result.assert_outcomes(errors=1)
-     result.stdout.fnmatch_lines(
-         ["*: Trio fixtures can only be used by Trio tests*"]
-     )
-diff --git a/test-requirements.txt b/test-requirements.txt
-index b2be0f9..5c53c25 100644
---- a/test-requirements.txt
-+++ b/test-requirements.txt
-@@ -1,3 +1,3 @@
--pytest !=3.7.0, !=3.7.1  # https://github.com/python-trio/pytest-trio/pull/50#issuecomment-413124393
-+pytest >= 6.0.0  # https://github.com/python-trio/pytest-trio/pull/98#issuecomment-678699693
- pytest-cov
- hypothesis>=3.64
diff --git a/python-pytest-trio.changes b/python-pytest-trio.changes
index 2a54cb3..b1694cf 100644
--- a/python-pytest-trio.changes
+++ b/python-pytest-trio.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Nov  5 14:05:47 UTC 2020 - Marketa Machova <mmachova@suse.com>
+
+- Update to 0.7.0
+  * Support added for alternative Trio run functions via the trio_run 
+    configuration variable and @pytest.mark.trio(run=...).  Presently 
+    supports Trio and QTrio.
+  * Python 3.5 support removed.
+  * pytest 6 support added
+- Drop merged pytest6.patch
+
 -------------------------------------------------------------------
 Sun Oct 11 16:51:05 UTC 2020 - John Vandenberg <jayvdb@gmail.com>
 
diff --git a/python-pytest-trio.spec b/python-pytest-trio.spec
index 36bb3b9..c15bce3 100644
--- a/python-pytest-trio.spec
+++ b/python-pytest-trio.spec
@@ -19,13 +19,12 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define skip_python2 1
 Name:           python-pytest-trio
-Version:        0.6.0
+Version:        0.7.0
 Release:        0
 Summary:        Pytest plugin for trio
 License:        MIT OR Apache-2.0
 URL:            https://github.com/python-trio/pytest-trio
 Source:         https://github.com/python-trio/pytest-trio/archive/v%{version}.tar.gz
-Patch0:         pytest6.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -52,7 +51,6 @@ a friendly library for concurrency and async I/O in Python.
 
 %prep
 %setup -q -n pytest-trio-%{version}
-%patch0 -p1
 
 rm pytest.ini
 rm pytest_trio/_tests/test_hypothesis_interaction.py
diff --git a/v0.6.0.tar.gz b/v0.6.0.tar.gz
deleted file mode 100644
index c08cfd6..0000000
--- a/v0.6.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:062b808f8f02597054aab1125c94431540b8955183f8ea75494f438f9f263b3d
-size 37384
diff --git a/v0.7.0.tar.gz b/v0.7.0.tar.gz
new file mode 100644
index 0000000..cba9560
--- /dev/null
+++ b/v0.7.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a4b44f84722ed943d2a02764745920c121b318674695d1240d1ebf9058853aa
+size 51884