Update obsolete Python 3.7 code

conftest.py

@@ -1,59 +1,54 @@
-import sys
-
-import pytest
-
-
-pytest_plugins = 'setuptools.tests.fixtures'
-
-
-def pytest_addoption(parser):
-    parser.addoption(
-        "--package_name",
-        action="append",
-        default=[],
-        help="list of package_name to pass to test functions",
-    )
-    parser.addoption(
-        "--integration",
-        action="store_true",
-        default=False,
-        help="run integration tests (only)",
-    )
-
-
-def pytest_configure(config):
-    config.addinivalue_line("markers", "integration: integration tests")
-    config.addinivalue_line("markers", "uses_network: tests may try to download files")
-
-
-collect_ignore = [
-    'tests/manual_test.py',
-    'setuptools/tests/mod_with_constant.py',
-    'setuptools/_distutils',
-    '_distutils_hack',
-    'setuptools/extern',
-    'pkg_resources/extern',
-    'pkg_resources/tests/data',
-    'setuptools/_vendor',
-    'pkg_resources/_vendor',
-    'setuptools/config/_validate_pyproject',
-]
-
-
-if sys.version_info < (3, 6):
-    collect_ignore.append('docs/conf.py')  # uses f-strings
-    collect_ignore.append('pavement.py')
-
-
-if sys.version_info < (3, 9) or sys.platform == 'cygwin':
-    collect_ignore.append('tools/finalize.py')
-
-
-@pytest.fixture(autouse=True)
-def _skip_integration(request):
-    running_integration_tests = request.config.getoption("--integration")
-    is_integration_test = request.node.get_closest_marker("integration")
-    if running_integration_tests and not is_integration_test:
-        pytest.skip("running integration tests only")
-    if not running_integration_tests and is_integration_test:
-        pytest.skip("skipping integration tests")
+import sys
+
+import pytest
+
+
+pytest_plugins = 'setuptools.tests.fixtures'
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--package_name",
+        action="append",
+        default=[],
+        help="list of package_name to pass to test functions",
+    )
+    parser.addoption(
+        "--integration",
+        action="store_true",
+        default=False,
+        help="run integration tests (only)",
+    )
+
+
+def pytest_configure(config):
+    config.addinivalue_line("markers", "integration: integration tests")
+    config.addinivalue_line("markers", "uses_network: tests may try to download files")
+
+
+collect_ignore = [
+    'tests/manual_test.py',
+    'setuptools/tests/mod_with_constant.py',
+    'setuptools/_distutils',
+    '_distutils_hack',
+    'setuptools/extern',
+    'pkg_resources/extern',
+    'pkg_resources/tests/data',
+    'setuptools/_vendor',
+    'pkg_resources/_vendor',
+    'setuptools/config/_validate_pyproject',
+]
+
+
+if sys.version_info < (3, 9) or sys.platform == 'cygwin':
+    collect_ignore.append('tools/finalize.py')
+
+
+@pytest.fixture(autouse=True)
+def _skip_integration(request):
+    running_integration_tests = request.config.getoption("--integration")
+    is_integration_test = request.node.get_closest_marker("integration")
+    if running_integration_tests and not is_integration_test:
+        pytest.skip("running integration tests only")
+    if not running_integration_tests and is_integration_test:
+        pytest.skip("skipping integration tests")

pkg_resources/__init__.py

@@ -18,6 +18,10 @@
 """
 
 import sys
+
+if sys.version_info < (3, 8):
+    raise RuntimeError("Python 3.8 or later is required")
+
 import os
 import io
 import time
@@ -82,9 +86,6 @@
 __import__('pkg_resources.extern.packaging.markers')
 __import__('pkg_resources.extern.packaging.utils')
 
-if sys.version_info < (3, 5):
-    raise RuntimeError("Python 3.5 or later is required")
-
 # declare some globals that will be defined later to
 # satisfy the linters.
 require = None

pkg_resources/tests/test_pkg_resources.py

@@ -230,9 +230,6 @@ def make_distribution_no_version(tmpdir, basename):
     # will detect it and yield it.
     dist_dir.join('temp.txt').ensure()
 
-    if sys.version_info < (3, 6):
-        dist_dir = str(dist_dir)
-
     dists = list(pkg_resources.distributions_from_metadata(dist_dir))
     assert len(dists) == 1
     (dist,) = dists