floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4099 from asottile/re-enable_linting_windows 

re-enable linting tox env on windows
This commit is contained in:
Anthony Sottile 2018-10-09 15:16:08 -07:00 committed by GitHub
parent b8c30aab2b 11a07211b6
commit 4b164d947d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -1,7 +1,7 @@
exclude: doc/en/example/py2py3/test_py2.py exclude: doc/en/example/py2py3/test_py2.py
repos: repos:
- repo: https://github.com/ambv/black - repo: https://github.com/ambv/black
rev: 18.9b0 rev: 18.6b4
hooks: hooks:
- id: black - id: black
args: [--safe, --quiet] args: [--safe, --quiet]

2
appveyor.yml
View File

@ -1,5 +1,7 @@
environment: environment:
matrix: matrix:
- TOXENV: "linting"
PYTEST_NO_COVERAGE: "1"
- TOXENV: "py27" - TOXENV: "py27"
- TOXENV: "py34" - TOXENV: "py34"
- TOXENV: "py35" - TOXENV: "py35"

2
src/_pytest/config/__init__.py
View File

@ -423,7 +423,7 @@ class PytestPluginManager(PluginManager):
and not self._using_pyargs and not self._using_pyargs
): ):
from _pytest.deprecated import ( from _pytest.deprecated import (
PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST, PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST
) )
warnings.warn_explicit( warnings.warn_explicit(