summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Sottile <asottile@umich.edu>2019-01-30 04:13:39 +0000
committerAnthony Sottile <asottile@umich.edu>2019-01-30 04:13:39 +0000
commit844754c4690151f8d447ebd558bf3fd877bddba4 (patch)
treedb0c7441c41f7cdc2bdf09a1b001f6dc6c257ac7
parentaac019fdc4ef0c56586266bb965cc6348360cb6f (diff)
parent238312cc750c1e7e89a60d26ea097244d05e5719 (diff)
downloadflake8-844754c4690151f8d447ebd558bf3fd877bddba4.tar.gz
Merge branch 'warnings' into 'master'
Remove remnants from previous PRs See merge request pycqa/flake8!289
-rw-r--r--pytest.ini2
-rw-r--r--setup.cfg3
2 files changed, 0 insertions, 5 deletions
diff --git a/pytest.ini b/pytest.ini
index bbe2275..fdf83b3 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -3,7 +3,5 @@ norecursedirs = .git .* *.egg* old docs dist build
addopts = -rw
filterwarnings =
error
- # python2.x `configparser` warns about native string but it works fine
- ignore:You passed a bytestring as `filenames`.*:DeprecationWarning
# python3.4 raises this when importing setuptools
ignore:The value of convert_charrefs will become True in 3.5.*:DeprecationWarning
diff --git a/setup.cfg b/setup.cfg
index 7fd7beb..4bc37ad 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,3 @@
-[aliases]
-test=pytest
-
[bdist_wheel]
universal = 1