提交 8f32b8f4 编写于 作者: H Hugo

Drop support for EOL Python 3.4

上级 d8c992ac
...@@ -47,7 +47,7 @@ logger = logging.getLogger(__name__) ...@@ -47,7 +47,7 @@ logger = logging.getLogger(__name__)
HAS_TLS = (ssl is not None) or IS_PYOPENSSL HAS_TLS = (ssl is not None) or IS_PYOPENSSL
if sys.version_info >= (3, 4): if sys.version_info >= (3,):
uses_pycache = True uses_pycache = True
from importlib.util import cache_from_source from importlib.util import cache_from_source
else: else:
...@@ -62,7 +62,7 @@ else: ...@@ -62,7 +62,7 @@ else:
uses_pycache = cache_from_source is not None uses_pycache = cache_from_source is not None
if sys.version_info >= (3, 5): if sys.version_info >= (3,):
backslashreplace_decode = "backslashreplace" backslashreplace_decode = "backslashreplace"
else: else:
# In version 3.4 and older, backslashreplace exists # In version 3.4 and older, backslashreplace exists
...@@ -202,7 +202,7 @@ def get_path_uid(path): ...@@ -202,7 +202,7 @@ def get_path_uid(path):
return file_uid return file_uid
if sys.version_info >= (3, 4): if sys.version_info >= (3,):
from importlib.machinery import EXTENSION_SUFFIXES from importlib.machinery import EXTENSION_SUFFIXES
def get_extension_suffixes(): def get_extension_suffixes():
......
...@@ -352,4 +352,4 @@ def in_memory_pip(): ...@@ -352,4 +352,4 @@ def in_memory_pip():
@pytest.fixture @pytest.fixture
def deprecated_python(): def deprecated_python():
"""Used to indicate whether pip deprecated this python version""" """Used to indicate whether pip deprecated this python version"""
return sys.version_info[:2] in [(3, 4), (2, 7)] return sys.version_info[:2] in [(2, 7)]
...@@ -22,6 +22,6 @@ setup( ...@@ -22,6 +22,6 @@ setup(
version='0.0.1', version='0.0.1',
packages=find_packages(), packages=find_packages(),
extras_require={ extras_require={
":python_version == '2.7' or python_version == '3.4'": ['simple'], ":python_version == '2.7'": ['simple'],
} }
) )
...@@ -528,7 +528,7 @@ def test_editable_install__local_dir_no_setup_py_with_pyproject( ...@@ -528,7 +528,7 @@ def test_editable_install__local_dir_no_setup_py_with_pyproject(
assert 'A "pyproject.toml" file was found' in msg assert 'A "pyproject.toml" file was found' in msg
@pytest.mark.skipif("sys.version_info >= (3,4)") @pytest.mark.skipif("sys.version_info >= (3,)")
@pytest.mark.xfail @pytest.mark.xfail
def test_install_argparse_shadowed(script): def test_install_argparse_shadowed(script):
# When argparse is in the stdlib, we support installing it # When argparse is in the stdlib, we support installing it
...@@ -543,7 +543,7 @@ def test_install_argparse_shadowed(script): ...@@ -543,7 +543,7 @@ def test_install_argparse_shadowed(script):
@pytest.mark.network @pytest.mark.network
@pytest.mark.skipif("sys.version_info < (3,4)") @pytest.mark.skipif("sys.version_info < (3,)")
def test_upgrade_argparse_shadowed(script): def test_upgrade_argparse_shadowed(script):
# If argparse is installed - even if shadowed for imported - we support # If argparse is installed - even if shadowed for imported - we support
# upgrading it and properly remove the older versions files. # upgrading it and properly remove the older versions files.
......
...@@ -83,7 +83,7 @@ class TestRequirementSet(object): ...@@ -83,7 +83,7 @@ class TestRequirementSet(object):
reqset, reqset,
) )
# TODO: Update test when Python 2.7 or Python 3.4 is dropped. # TODO: Update test when Python 2.7 is dropped.
def test_environment_marker_extras(self, data): def test_environment_marker_extras(self, data):
""" """
Test that the environment marker extras are used with Test that the environment marker extras are used with
...@@ -99,7 +99,7 @@ class TestRequirementSet(object): ...@@ -99,7 +99,7 @@ class TestRequirementSet(object):
resolver = self._basic_resolver(finder) resolver = self._basic_resolver(finder)
resolver.resolve(reqset) resolver.resolve(reqset)
# This is hacky but does test both case in py2 and py3 # This is hacky but does test both case in py2 and py3
if sys.version_info[:2] in ((2, 7), (3, 4)): if sys.version_info[:2] == (2, 7):
assert reqset.has_requirement('simple') assert reqset.has_requirement('simple')
else: else:
assert not reqset.has_requirement('simple') assert not reqset.has_requirement('simple')
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册