summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Sottile <asottile@umich.edu>2019-07-08 08:54:49 -0700
committerAnthony Sottile <asottile@umich.edu>2019-07-08 09:07:37 -0700
commit7506847c9abaef5ff069a9bd38cd3308a3a45113 (patch)
treeb9aa7757f2cb2a011ced16425e154cc73a1002cc
parent076dfeee372affb1dbe849d12a1cc20f8ea37d40 (diff)
downloadflake8-7506847c9abaef5ff069a9bd38cd3308a3a45113.tar.gz
fix CI build
-rw-r--r--.appveyor.yml2
-rw-r--r--pytest.ini3
-rw-r--r--src/flake8/checker.py5
-rw-r--r--tox.ini2
4 files changed, 9 insertions, 3 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index d697df9..d9b34ca 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,6 +1,6 @@
# To activate, change the Appveyor settings to use `.appveyor.yml`.
install:
- - python -m pip install tox
+ - python -m pip install --upgrade tox virtualenv
build: off
diff --git a/pytest.ini b/pytest.ini
index fdf83b3..4a00d9a 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -5,3 +5,6 @@ filterwarnings =
error
# python3.4 raises this when importing setuptools
ignore:The value of convert_charrefs will become True in 3.5.*:DeprecationWarning
+ # python3 raises this when importing setuptools
+ ignore:the imp module is deprecated in favour of importlib.*:PendingDeprecationWarning
+ ignore:the imp module is deprecated in favour of importlib.*:DeprecationWarning
diff --git a/src/flake8/checker.py b/src/flake8/checker.py
index de9aaa0..52a6a70 100644
--- a/src/flake8/checker.py
+++ b/src/flake8/checker.py
@@ -435,8 +435,9 @@ class FileChecker(object):
return plugin["plugin"](**arguments)
except Exception as all_exc:
LOG.critical(
- "Plugin %s raised an unexpected exception", plugin["name"],
- exc_info=True
+ "Plugin %s raised an unexpected exception",
+ plugin["name"],
+ exc_info=True,
)
raise exceptions.PluginExecutionFailed(
plugin=plugin, exception=all_exc
diff --git a/tox.ini b/tox.ini
index 4cdca70..d352651 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,6 +47,8 @@ deps =
flake8
flake8-colors
flake8-docstrings>=0.2.7
+ # remove when https://gitlab.com/pycqa/flake8-docstrings/issues/36 is fixed
+ pydocstyle<4
flake8-import-order>=0.9
flake8-typing-imports>=1.1
pep8-naming