Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions easybuild/easyblocks/e/easybuildmeta.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import copy
import os
import re
import sys
from distutils.version import LooseVersion

from easybuild.easyblocks.generic.pythonpackage import PythonPackage
Expand Down Expand Up @@ -65,6 +66,17 @@ def __init__(self, *args, **kwargs):
# consider setuptools first, in case it is listed as a sources
self.easybuild_pkgs.insert(0, 'setuptools')

# Override this function since we want to respect the user choice for the python installation to use
# (which can be influenced by EB_PYTHON and EB_INSTALLPYTHON)
def prepare_python(self):
"""Python-specific preparations."""

self.python_cmd = sys.executable
# set Python lib directories
self.set_pylibdirs()

self.log.info("Python command being used: %s", self.python_cmd)

def check_readiness_step(self):
"""Make sure EasyBuild can be installed with a loaded EasyBuild module."""
env_var_name = get_software_root_env_var_name(self.name)
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/generic/pythonpackage.py
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ def set_pylibdirs(self):
self.pylibdir = self.all_pylibdirs[0]

def prepare_python(self):
"""Python-specific preperations."""
"""Python-specific preparations."""

# pick 'python' command to use
python = None
Expand Down