diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/data/src/pep518_with_extra_and_markers-1.0/setup.py | 4 | ||||
-rw-r--r-- | tests/functional/test_broken_stdout.py | 10 | ||||
-rw-r--r-- | tests/lib/__init__.py | 7 | ||||
-rw-r--r-- | tests/unit/test_finder.py | 10 | ||||
-rw-r--r-- | tests/unit/test_req.py | 7 |
5 files changed, 6 insertions, 32 deletions
diff --git a/tests/data/src/pep518_with_extra_and_markers-1.0/setup.py b/tests/data/src/pep518_with_extra_and_markers-1.0/setup.py index 08e6eceac..bfac5b467 100644 --- a/tests/data/src/pep518_with_extra_and_markers-1.0/setup.py +++ b/tests/data/src/pep518_with_extra_and_markers-1.0/setup.py @@ -1,13 +1,11 @@ #!/usr/bin/env python -import sys - from setuptools import setup # ensure dependencies are installed import simple import simplewheel -assert simplewheel.__version__ == "1.0" if sys.version_info < (3,) else "2.0" +assert simplewheel.__version__ == "2.0" setup( name="pep518_with_extra_and_markers", diff --git a/tests/functional/test_broken_stdout.py b/tests/functional/test_broken_stdout.py index 2f4928d8f..0d2612838 100644 --- a/tests/functional/test_broken_stdout.py +++ b/tests/functional/test_broken_stdout.py @@ -1,13 +1,7 @@ import os import subprocess -import sys - -if sys.version_info < (3, 6): - _BROKEN_STDOUT_RETURN_CODE = 1 -else: - # The new exit status was added in Python 3.6 as a result of: - # https://bugs.python.org/issue5319 - _BROKEN_STDOUT_RETURN_CODE = 120 + +_BROKEN_STDOUT_RETURN_CODE = 120 def setup_broken_stdout_test(args, deprecated_python): diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index 3d044eaba..07e04697d 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -471,12 +471,7 @@ class PipTestEnvironment(TestFileEnvironment): site.USER_SITE[len(site.USER_BASE) + 1 :], ) if sys.platform == "win32": - if sys.version_info >= (3, 5): - scripts_base = Path( - os.path.normpath(self.user_site_path.joinpath("..")) - ) - else: - scripts_base = self.user_base_path + scripts_base = Path(os.path.normpath(self.user_site_path.joinpath(".."))) self.user_bin_path = scripts_base.joinpath("Scripts") else: self.user_bin_path = self.user_base_path.joinpath( diff --git a/tests/unit/test_finder.py b/tests/unit/test_finder.py index 00feb1504..6a1937a12 100644 --- a/tests/unit/test_finder.py +++ b/tests/unit/test_finder.py @@ -1,5 +1,4 @@ import logging -import sys from unittest.mock import Mock, patch import pytest @@ -403,14 +402,7 @@ def test_finder_only_installs_data_require(data): # using a local index (that has pre & dev releases) finder = make_test_finder(index_urls=[data.index_url("datarequire")]) links = finder.find_all_candidates("fakepackage") - - expected = ["1.0.0", "9.9.9"] - if (2, 7) < sys.version_info < (3,): - expected.append("2.7.0") - elif sys.version_info > (3, 3): - expected.append("3.3.0") - - assert {str(v.version) for v in links} == set(expected) + assert {str(v.version) for v in links} == {"1.0.0", "3.3.0", "9.9.9"} def test_finder_installs_pre_releases(data): diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py index ee09fda74..f4c1d48d9 100644 --- a/tests/unit/test_req.py +++ b/tests/unit/test_req.py @@ -127,7 +127,6 @@ class TestRequirementSet: True, ) - # TODO: Update test when Python 2.7 is dropped. def test_environment_marker_extras(self, data): """ Test that the environment marker extras are used with @@ -140,11 +139,7 @@ class TestRequirementSet: finder = make_test_finder(find_links=[data.find_links]) with self._basic_resolver(finder) as resolver: reqset = resolver.resolve(reqset.all_requirements, True) - # This is hacky but does test both case in py2 and py3 - if sys.version_info[:2] == (2, 7): - assert reqset.has_requirement("simple") - else: - assert not reqset.has_requirement("simple") + assert not reqset.has_requirement("simple") def test_missing_hash_with_require_hashes(self, data): """Setting --require-hashes explicitly should raise errors if hashes |