Skip to content

Add CI test checking if the Python default source_urls are used and Fix CI check where use_pip=False was ignored #12456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 3 commits into from
Mar 24, 2021
Merged

Add CI test checking if the Python default source_urls are used and Fix CI check where use_pip=False was ignored #12456

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ba3f05
Add CI test checking if the Python default source_urls are used
Flamefire Mar 23, 2021
51107d2
Fix CI check where use_pip=False was ignored
Flamefire Mar 23, 2021
2eb7eb9
Check for use_pip=None and improve error messages
Flamefire Mar 24, 2021
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
31 changes: 22 additions & 9 deletions test/easyconfigs/easyconfigs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@
import easybuild.tools.options as eboptions
from easybuild.base import fancylogger
from easybuild.easyblocks.generic.configuremake import ConfigureMake
from easybuild.easyblocks.generic.pythonpackage import PythonPackage
from easybuild.framework.easyblock import EasyBlock
from easybuild.framework.easyconfig.default import DEFAULT_CONFIG
from easybuild.framework.easyconfig.format.format import DEPENDENCY_PARAMETERS
from easybuild.framework.easyconfig.easyconfig import get_easyblock_class, letter_dir_for
from easybuild.framework.easyconfig.easyconfig import disable_templating, get_easyblock_class, letter_dir_for
from easybuild.framework.easyconfig.easyconfig import resolve_template
from easybuild.framework.easyconfig.parser import EasyConfigParser, fetch_parameters_from_easyconfig
from easybuild.framework.easyconfig.tools import check_sha256_checksums, dep_graph, get_paths_for, process_easyconfig
Expand Down Expand Up @@ -616,21 +617,29 @@ def check_python_packages(self, changed_ecs, added_ecs_filenames):

failing_checks = []

python_default_urls = PythonPackage.extra_options()['source_urls'][0]

for ec in changed_ecs:

ec_fn = os.path.basename(ec.path)
easyblock = ec.get('easyblock')
exts_defaultclass = ec.get('exts_defaultclass')
exts_default_options = ec.get('exts_default_options', {})
with disable_templating(ec):
ec_fn = os.path.basename(ec.path)
easyblock = ec.get('easyblock')
exts_defaultclass = ec.get('exts_defaultclass')
exts_default_options = ec.get('exts_default_options', {})

download_dep_fail = ec.get('download_dep_fail')
exts_download_dep_fail = ec.get('exts_download_dep_fail')
use_pip = ec.get('use_pip') or exts_default_options.get('use_pip')
download_dep_fail = ec.get('download_dep_fail')
exts_download_dep_fail = ec.get('exts_download_dep_fail')
use_pip = ec.get('use_pip')
if use_pip is None:
use_pip = exts_default_options.get('use_pip')

# download_dep_fail should be set when using PythonPackage
if easyblock == 'PythonPackage':
if download_dep_fail is None:
failing_checks.append("'download_dep_fail' should be set in %s" % ec_fn)
if ec.get('source_urls', resolve=False) == python_default_urls:
failing_checks.append("'source_urls' should not be defined when using the default value "
"in %s" % ec_fn)

# use_pip should be set when using PythonPackage or PythonBundle (except for whitelisted easyconfigs)
if easyblock in ['PythonBundle', 'PythonPackage']:
Expand All @@ -642,6 +651,9 @@ def check_python_packages(self, changed_ecs, added_ecs_filenames):
if download_dep_fail or exts_download_dep_fail:
fail = "'*download_dep_fail' should not be set in %s since PythonBundle easyblock is used" % ec_fn
failing_checks.append(fail)
if exts_default_options.get('source_urls') == python_default_urls:
failing_checks.append("'source_urls' should not be defined in exts_default_options when using "
"the default value in %s" % ec_fn)

elif exts_defaultclass == 'PythonPackage':
# bundle of Python packages should use PythonBundle
Expand Down Expand Up @@ -687,7 +699,8 @@ def check_python_packages(self, changed_ecs, added_ecs_filenames):
if not any(re.match(regex, ec_fn) for regex in whitelist_pip_check):
failing_checks.append("sanity_pip_check should be enabled in %s" % ec_fn)

self.assertFalse(failing_checks, '\n'.join(failing_checks))
if failing_checks:
self.fail('\n'.join(failing_checks))

def check_R_packages(self, changed_ecs):
"""Several checks for easyconfigs that install (bundles of) R packages."""
Expand Down