Skip to content

Commit f54e14d

Browse files
fix tests after adding support for multiple PRs in --from-pr
1 parent b1c92cc commit f54e14d

File tree

3 files changed

+43
-0
lines changed

3 files changed

+43
-0
lines changed

easybuild/framework/easyconfig/tools.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -731,6 +731,9 @@ def avail_easyblocks():
731731
def det_copy_ec_specs(orig_paths, from_pr):
732732
"""Determine list of paths + target directory for --copy-ec."""
733733

734+
if from_pr is not None and not isinstance(from_pr, list):
735+
from_pr = [from_pr]
736+
734737
target_path, paths = None, []
735738

736739
# if only one argument is specified, use current directory as target directory

test/framework/options.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,7 @@ def test_list_easyblocks(self):
821821
r'\| \| \|-- EB_toytoy',
822822
r'\| \|-- Toy_Extension',
823823
r'\|-- ModuleRC',
824+
r'\|-- PythonBundle',
824825
r'\|-- Toolchain',
825826
r'Extension',
826827
r'\|-- ExtensionEasyBlock',
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
##
2+
# Copyright 2009-2020 Ghent University
3+
#
4+
# This file is part of EasyBuild,
5+
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
6+
# with support of Ghent University (http://ugent.be/hpc),
7+
# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
8+
# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
9+
# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
10+
#
11+
# https://github.com/easybuilders/easybuild
12+
#
13+
# EasyBuild is free software: you can redistribute it and/or modify
14+
# it under the terms of the GNU General Public License as published by
15+
# the Free Software Foundation v2.
16+
#
17+
# EasyBuild is distributed in the hope that it will be useful,
18+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
19+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20+
# GNU General Public License for more details.
21+
#
22+
# You should have received a copy of the GNU General Public License
23+
# along with EasyBuild. If not, see <http://www.gnu.org/licenses/>.
24+
##
25+
"""
26+
Dummy easyblock for Makecp.
27+
28+
@author: Miguel Dias Costa (National University of Singapore)
29+
"""
30+
from easybuild.framework.easyblock import EasyBlock
31+
32+
class PythonBundle(EasyBlock):
33+
"""Dummy support for bundle of modules."""
34+
35+
@staticmethod
36+
def extra_options(extra_vars=None):
37+
if extra_vars is None:
38+
extra_vars = {}
39+
return EasyBlock.extra_options(extra_vars)

0 commit comments

Comments
 (0)