fixup! Fix hynek#201 - Add support for contextvars

conftest.py

@@ -6,6 +6,8 @@
 
 from __future__ import absolute_import, division, print_function
 
+import sys
+
 import pytest
 
 from six.moves import cStringIO as StringIO
@@ -30,3 +32,8 @@ def __repr__(self):
             return r"<A(\o/)>"
 
     return {"a": A(), "b": [3, 4], "x": 7, "y": "test", "z": (1, 2)}
+
+
+collect_ignore = []
+if sys.version_info[:2] < (3, 7):
+    collect_ignore.extend(["tests/test_contextvars.py"])

tests/test_contextvars.py

@@ -4,33 +4,18 @@
 
 import pytest
 
-
-asyncio = pytest.importorskip("asyncio")
-contextvars = pytest.importorskip("contextvars")
-
-
-try:
-    from structlog.contextvars import (
-        bind_context_local,
-        clear_context_local,
-        merge_context_local,
-        unbind_context_local,
-    )
-except ImportError:
-    skip_tests = True
-else:
-    skip_tests = False
-
-    # All test coroutines will be treated as marked.
-    pytestmark = pytest.mark.asyncio
+from structlog.contextvars import (
+    bind_context_local,
+    clear_context_local,
+    merge_context_local,
+    unbind_context_local,
+)
 
 
-supported_python = pytest.mark.skipif(
-    skip_tests, reason="Does not support asyncio or contextvars."
-)
+# All test coroutines will be treated as marked.
+pytestmark = pytest.mark.asyncio
 
 
-@supported_python
 class TestNewContextvars(object):
     async def test_bind(self, event_loop):
         """