re-enable linting tox env on windows

robertschweizer · Oct 9, 2018 · 11a0721 · 11a0721
1 parent 28a3f0f
commit 11a0721
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 exclude: doc/en/example/py2py3/test_py2.py
 repos:
 -   repo: https://github.com/ambv/black
-    rev: 18.9b0
+    rev: 18.6b4
     hooks:
     -   id: black
         args: [--safe, --quiet]

diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
@@ -423,7 +423,7 @@ def _importconftest(self, conftestpath):
                     and not self._using_pyargs
                 ):
                     from _pytest.deprecated import (
-                        PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST,
+                        PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST
                     )
 
                     warnings.warn_explicit(