Skip to content

Commit

Permalink
Merge pull request #3798 from Flamefire/fix_error
Browse files Browse the repository at this point in the history
fix CI by excluding GC3Pie 2.6.7 (which is broken with Python 2) and improve error reporting for option parsing
  • Loading branch information
boegel authored Aug 11, 2021
2 parents 22ba34e + be485dc commit 7486963
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion easybuild/tools/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@ def parse_options(args=None, with_include=True):
eb_go = EasyBuildOptions(usage=usage, description=description, prog='eb', envvar_prefix=CONFIG_ENV_VAR_PREFIX,
go_args=eb_args, error_env_options=True, error_env_option_method=raise_easybuilderror,
with_include=with_include)
except Exception as err:
except EasyBuildError as err:
raise EasyBuildError("Failed to parse configuration options: %s" % err)

return eb_go
Expand Down
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ PyYAML; python_version >= '2.7'
pycodestyle; python_version < '2.7'
flake8; python_version >= '2.7'

GC3Pie
# 2.6.7 uses invalid Python 2 syntax
GC3Pie!=2.6.7; python_version < '3.0'
GC3Pie; python_version >= '3.0'
python-graph-dot
python-hglib
requests
Expand Down

0 comments on commit 7486963

Please sign in to comment.