summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-09-14 19:59:33 -0400
committerJason R. Coombs <jaraco@jaraco.com>2020-09-14 19:59:33 -0400
commitc85addee0793d2331be76b0fc515ec039433ddd3 (patch)
treebf540da6b3978b67ff8e1952f5c36c541fc72568
parent8fa0599ae2f2309ee5fb48b4c87dc8f2d7ea2f2c (diff)
parent2995140fe8fc3d0de9f9fa6fe0d574dc2d9a0ca3 (diff)
downloadpython-setuptools-git-c85addee0793d2331be76b0fc515ec039433ddd3.tar.gz
Merge branch 'master' into feature/plugins-enabled-by-default
-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 90090253..41ab30b9 100644
--- a/conftest.py
+++ b/conftest.py
@@ -19,10 +19,5 @@ collect_ignore = [
]
-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 40efb054..a875e1e9 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