Skip to content

Commit

Permalink
Update Python < 3.8 (3.2 to 3.7) obsolete code and comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Avasam committed Nov 7, 2023
1 parent 2384d91 commit 05ca49d
Show file tree
Hide file tree
Showing 24 changed files with 3,362 additions and 3,483 deletions.
447 changes: 220 additions & 227 deletions _distutils_hack/__init__.py

Large diffs are not rendered by default.

113 changes: 54 additions & 59 deletions conftest.py
Original file line number Diff line number Diff line change
@@ -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")
Loading

0 comments on commit 05ca49d

Please sign in to comment.