mirror of https://github.com/pypa/pip
sys.version fixes for python 3.10
This commit is contained in:
parent
2cd26a22a0
commit
c3fb5cbff0
|
@ -127,7 +127,7 @@ def distutils_scheme(dist_name, user=False, home=None, root=None,
|
|||
sys.prefix,
|
||||
'include',
|
||||
'site',
|
||||
'python' + sys.version[:3],
|
||||
'python{}.{}'.format(*sys.version_info),
|
||||
dist_name,
|
||||
)
|
||||
|
||||
|
|
|
@ -118,7 +118,7 @@ def get_pip_version():
|
|||
|
||||
return (
|
||||
'pip {} from {} (python {})'.format(
|
||||
__version__, pip_pkg_dir, sys.version[:3],
|
||||
__version__, pip_pkg_dir, '{}.{}'.format(*sys.version_info),
|
||||
)
|
||||
)
|
||||
|
||||
|
|
|
@ -557,10 +557,10 @@ if __name__ == '__main__':
|
|||
generated.extend(maker.make(spec))
|
||||
|
||||
if os.environ.get("ENSUREPIP_OPTIONS", "") != "altinstall":
|
||||
spec = 'pip%s = %s' % (sys.version[:1], pip_script)
|
||||
spec = 'pip%s = %s' % (sys.version_info[0], pip_script)
|
||||
generated.extend(maker.make(spec))
|
||||
|
||||
spec = 'pip%s = %s' % (sys.version[:3], pip_script)
|
||||
spec = 'pip%s = %s' % ('{}.{}'.format(*sys.version_info), pip_script)
|
||||
generated.extend(maker.make(spec))
|
||||
# Delete any other versioned pip entry points
|
||||
pip_ep = [k for k in console if re.match(r'pip(\d(\.\d)?)?$', k)]
|
||||
|
@ -572,7 +572,9 @@ if __name__ == '__main__':
|
|||
spec = 'easy_install = ' + easy_install_script
|
||||
generated.extend(maker.make(spec))
|
||||
|
||||
spec = 'easy_install-%s = %s' % (sys.version[:3], easy_install_script)
|
||||
spec = 'easy_install-%s = %s' % (
|
||||
'{}.{}'.format(*sys.version_info), easy_install_script,
|
||||
)
|
||||
generated.extend(maker.make(spec))
|
||||
# Delete any other versioned easy_install entry points
|
||||
easy_install_ep = [
|
||||
|
|
|
@ -29,7 +29,7 @@ if MYPY_CHECK_RUNNING:
|
|||
DATA_DIR = Path(__file__).parent.parent.joinpath("data").abspath
|
||||
SRC_DIR = Path(__file__).abspath.parent.parent.parent
|
||||
|
||||
pyversion = sys.version[:3]
|
||||
pyversion = '{}.{}'.format(*sys.version_info)
|
||||
pyversion_tuple = sys.version_info
|
||||
|
||||
CURRENT_PY_VERSION_INFO = sys.version_info[:3]
|
||||
|
|
|
@ -36,9 +36,7 @@ class TestTargetPython:
|
|||
"""
|
||||
Test passing py_version_info=None.
|
||||
"""
|
||||
# Get the index of the second dot.
|
||||
index = sys.version.find('.', 2)
|
||||
current_major_minor = sys.version[:index] # e.g. "3.6"
|
||||
current_major_minor = '{}.{}'.format(*sys.version_info)
|
||||
|
||||
target_python = TargetPython(py_version_info=None)
|
||||
|
||||
|
|
Loading…
Reference in New Issue