Merge pull request #4099 from asottile/re-enable_linting_windows

asottile · web-flow · commit 4b164d947dec · 2018-10-09T15:16:08.000-07:00
re-enable linting tox env on windows
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/appveyor.yml b/appveyor.yml
@@ -1,5 +1,7 @@
 environment:
   matrix:
+  - TOXENV: "linting"
+    PYTEST_NO_COVERAGE: "1"
   - TOXENV: "py27"
   - TOXENV: "py34"
   - TOXENV: "py35"
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(

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ def _importconftest(self, conftestpath):`
`423`	`423`	`and not self._using_pyargs`
`424`	`424`	`):`
`425`	`425`	`from _pytest.deprecated import (`
`426`		`- PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST,`
	`426`	`+ PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST`
`427`	`427`	`)`
`428`	`428`
`429`	`429`	`warnings.warn_explicit(`