summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2022-08-10 10:47:07 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2022-08-16 10:55:01 -0700
commit2b69746e8a09602d006bbac2ae6c5d699b5ff002 (patch)
tree99a24247287d0775c36a3b1ffd7a43ed31705051 /var
parent928dfd6e758a9d967251d71260456d57ee5b7ca9 (diff)
downloadspack-2b69746e8a09602d006bbac2ae6c5d699b5ff002.tar.gz
spack-2b69746e8a09602d006bbac2ae6c5d699b5ff002.tar.bz2
spack-2b69746e8a09602d006bbac2ae6c5d699b5ff002.tar.xz
spack-2b69746e8a09602d006bbac2ae6c5d699b5ff002.zip
Python: remove ensurepip variant
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/python/package.py19
1 files changed, 1 insertions, 18 deletions
diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py
index f6abd89b6e..a422a79c27 100644
--- a/var/spack/repos/builtin/packages/python/package.py
+++ b/var/spack/repos/builtin/packages/python/package.py
@@ -193,7 +193,6 @@ class Python(Package):
variant("tkinter", default=False, description="Build tkinter module")
variant("uuid", default=True, description="Build uuid 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:
depends_on("pkgconfig@0.9.0:", type="build")
@@ -357,15 +356,6 @@ class Python(Package):
except ProcessError:
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"):
try:
python("-c", "import tkinter", error=os.devnull)
@@ -622,10 +612,7 @@ class Python(Package):
raise ValueError("+ucs4 variant not compatible with Python 3.3 and beyond")
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:
cflags.append(self.compiler.cc_pic_flag)
@@ -851,10 +838,6 @@ class Python(Package):
else:
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.
# ========================================================================