re-enable linting tox env on windows

2018-10-09 13:01:51 -07:00 · 2018-10-09 13:01:51 -07:00 · 11a07211b6
parent 28a3f0fcb9
commit 11a07211b6
2 changed files with 2 additions and 2 deletions
--- 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]
--- a/src/_pytest/config/init.py
+++ b/src/_pytest/config/init.py
@ -423,7 +423,7 @@ class PytestPluginManager(PluginManager):
                    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(