Skip to content

Commit 387844e

Browse files
authored
Merge pull request #10379 from jdufresne/version-info-py2
Cleanup several Python 2 version_info checks/workarounds
2 parents 09103e8 + d144fd9 commit 387844e

File tree

6 files changed

+6
-32
lines changed

6 files changed

+6
-32
lines changed

news/4e558453-ed80-423d-b939-08f1c4165f39.trivial.rst

Whitespace-only changes.

tests/data/src/pep518_with_extra_and_markers-1.0/setup.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
#!/usr/bin/env python
2-
import sys
3-
42
from setuptools import setup
53

64
# ensure dependencies are installed
75
import simple
86
import simplewheel
97

10-
assert simplewheel.__version__ == "1.0" if sys.version_info < (3,) else "2.0"
8+
assert simplewheel.__version__ == "2.0"
119

1210
setup(
1311
name="pep518_with_extra_and_markers",

tests/functional/test_broken_stdout.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
import os
22
import subprocess
3-
import sys
4-
5-
if sys.version_info < (3, 6):
6-
_BROKEN_STDOUT_RETURN_CODE = 1
7-
else:
8-
# The new exit status was added in Python 3.6 as a result of:
9-
# https://bugs.python.org/issue5319
10-
_BROKEN_STDOUT_RETURN_CODE = 120
3+
4+
_BROKEN_STDOUT_RETURN_CODE = 120
115

126

137
def setup_broken_stdout_test(args, deprecated_python):

tests/lib/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -471,12 +471,7 @@ def __init__(self, base_path, *args, virtualenv, pip_expect_warning=None, **kwar
471471
site.USER_SITE[len(site.USER_BASE) + 1 :],
472472
)
473473
if sys.platform == "win32":
474-
if sys.version_info >= (3, 5):
475-
scripts_base = Path(
476-
os.path.normpath(self.user_site_path.joinpath(".."))
477-
)
478-
else:
479-
scripts_base = self.user_base_path
474+
scripts_base = Path(os.path.normpath(self.user_site_path.joinpath("..")))
480475
self.user_bin_path = scripts_base.joinpath("Scripts")
481476
else:
482477
self.user_bin_path = self.user_base_path.joinpath(

tests/unit/test_finder.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import logging
2-
import sys
32
from unittest.mock import Mock, patch
43

54
import pytest
@@ -403,14 +402,7 @@ def test_finder_only_installs_data_require(data):
403402
# using a local index (that has pre & dev releases)
404403
finder = make_test_finder(index_urls=[data.index_url("datarequire")])
405404
links = finder.find_all_candidates("fakepackage")
406-
407-
expected = ["1.0.0", "9.9.9"]
408-
if (2, 7) < sys.version_info < (3,):
409-
expected.append("2.7.0")
410-
elif sys.version_info > (3, 3):
411-
expected.append("3.3.0")
412-
413-
assert {str(v.version) for v in links} == set(expected)
405+
assert {str(v.version) for v in links} == {"1.0.0", "3.3.0", "9.9.9"}
414406

415407

416408
def test_finder_installs_pre_releases(data):

tests/unit/test_req.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ def test_no_reuse_existing_build_dir(self, data):
127127
True,
128128
)
129129

130-
# TODO: Update test when Python 2.7 is dropped.
131130
def test_environment_marker_extras(self, data):
132131
"""
133132
Test that the environment marker extras are used with
@@ -140,11 +139,7 @@ def test_environment_marker_extras(self, data):
140139
finder = make_test_finder(find_links=[data.find_links])
141140
with self._basic_resolver(finder) as resolver:
142141
reqset = resolver.resolve(reqset.all_requirements, True)
143-
# This is hacky but does test both case in py2 and py3
144-
if sys.version_info[:2] == (2, 7):
145-
assert reqset.has_requirement("simple")
146-
else:
147-
assert not reqset.has_requirement("simple")
142+
assert not reqset.has_requirement("simple")
148143

149144
def test_missing_hash_with_require_hashes(self, data):
150145
"""Setting --require-hashes explicitly should raise errors if hashes

0 commit comments

Comments
 (0)