summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conftest.py5
-rw-r--r--pytest.ini7
2 files changed, 0 insertions, 12 deletions
diff --git a/conftest.py b/conftest.py
index 25537f56..baffac1a 100644
--- a/conftest.py
+++ b/conftest.py
@@ -37,10 +37,5 @@ def disable_coverage_on_pypy(config):
cov.cov_controller.pause()
-if sys.version_info < (3,):
- collect_ignore.append('setuptools/lib2to3_ex.py')
- collect_ignore.append('setuptools/_imp.py')
-
-
if sys.version_info < (3, 6):
collect_ignore.append('pavement.py')
diff --git a/pytest.ini b/pytest.ini
index ddcad08b..70e7d0a2 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -9,17 +9,10 @@ filterwarnings =
ignore:bdist_wininst command is deprecated
# Suppress this error; unimportant for CI tests
ignore:Extraction path is writable by group/others:UserWarning
- # Suppress Python 2 deprecation warning
- ignore:Setuptools will stop working on Python 2:UserWarning
# Suppress weird RuntimeWarning.
ignore:Parent module 'setuptools' not found while handling absolute import:RuntimeWarning
# Suppress use of bytes for filenames on Windows until fixed #2016
ignore:The Windows bytes API has been deprecated:DeprecationWarning
- # Suppress other Python 2 UnicodeWarnings
- ignore:Unicode equal comparison failed to convert:UnicodeWarning
- ignore:Unicode unequal comparison failed to convert:UnicodeWarning
- # https://github.com/pypa/setuptools/issues/2025
- ignore:direct construction of .*Item has been deprecated:DeprecationWarning
# https://github.com/pypa/setuptools/issues/2081
ignore:lib2to3 package is deprecated:PendingDeprecationWarning
ignore:lib2to3 package is deprecated:DeprecationWarning