zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Python: remove ensurepip variant

Browse Source
This commit is contained in:
Adam J. Stewart 2022-08-10 10:47:07 -07:00 committed by Todd Gamblin
parent 928dfd6e75
commit 2b69746e8a
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
var/spack/repos/builtin/packages/python/package.py
View File

@ -193,7 +193,6 @@ class Python(Package):
variant("tkinter", default=False, description="Build tkinter module") variant("tkinter", default=False, description="Build tkinter module")
variant("uuid", default=True, description="Build uuid module") variant("uuid", default=True, description="Build uuid module")
variant("tix", default=False, description="Build Tix module") variant("tix", default=False, description="Build Tix module")
variant("ensurepip", default=True, description="Build ensurepip module", when="@2.7.9:2,3.4:")
if not is_windows: if not is_windows:
depends_on("pkgconfig@0.9.0:", type="build") depends_on("pkgconfig@0.9.0:", type="build")
@ -357,15 +356,6 @@ def determine_variants(cls, exes, version_str):
except ProcessError: except ProcessError:
variants += "~lzma" variants += "~lzma"
if Version(version_str) in ver("2.7.9:2,3.4:"):
# The ensurepip module is always available, but won't work if built with
# --without-ensurepip. A more reliable check to see if the package was built
# with --with-ensurepip is to check for the presence of a pip executable.
if glob.glob(os.path.join(os.path.dirname(exes[0]), "pip*")):
variants += "+ensurepip"
else:
variants += "~ensurepip"
if Version(version_str) >= Version("3"): if Version(version_str) >= Version("3"):
try: try:
python("-c", "import tkinter", error=os.devnull) python("-c", "import tkinter", error=os.devnull)
@ -622,9 +612,6 @@ def configure_args(self):
raise ValueError("+ucs4 variant not compatible with Python 3.3 and beyond") raise ValueError("+ucs4 variant not compatible with Python 3.3 and beyond")
if spec.satisfies("@2.7.9:2,3.4:"): if spec.satisfies("@2.7.9:2,3.4:"):
if "+ensurepip" in spec:
config_args.append("--with-ensurepip=install")
else:
config_args.append("--without-ensurepip") config_args.append("--without-ensurepip")
if "+pic" in spec: if "+pic" in spec:
@ -851,10 +838,6 @@ def import_tests(self):
else: else:
self.command("-c", "import Tix") self.command("-c", "import Tix")
# Ensure that ensurepip module works
if "+ensurepip" in spec:
self.command("-c", "import ensurepip")
# ======================================================================== # ========================================================================
# Set up environment to make install easy for python extensions. # Set up environment to make install easy for python extensions.
# ======================================================================== # ========================================================================