Skip to content
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

fix CI by excluding GC3Pie 2.6.7 (which is broken with Python 2) and improve error reporting for option parsing #3798

Merged
merged 3 commits into from
Aug 11, 2021
Merged

fix CI by excluding GC3Pie 2.6.7 (which is broken with Python 2) and improve error reporting for option parsing #3798

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c84fea
Only catch our own errors when failing to parse config options
Flamefire Aug 10, 2021
055b28a
Fix CI on Python 2
Flamefire Aug 10, 2021
be485dc
Only exclude latest GC3Pie for python2
Flamefire Aug 11, 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
2 changes: 1 addition & 1 deletion easybuild/tools/options.py
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ 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
Flamefire marked this conversation as resolved.
Show resolved Hide resolved
Flamefire marked this conversation as resolved.
Show resolved Hide resolved
python-graph-dot
python-hglib
requests
Expand Down