Skip to content

Ec format v2.0#693

Merged
boegel merged 83 commits intoeasybuilders:developfrom
stdweird:ec_format_v2.0
Nov 7, 2013
Merged

Ec format v2.0#693
boegel merged 83 commits intoeasybuilders:developfrom
stdweird:ec_format_v2.0

Conversation

@stdweird
Copy link
Copy Markdown
Contributor

@stdweird stdweird commented Sep 24, 2013

note (20130924): not yet finished, this is currently a placeholder for more work on this

@boegel boegel mentioned this pull request Sep 24, 2013
Closed
boegel and others added 5 commits October 5, 2013 14:51
@boegel
Merge branch 'develop' into ec_format_v2.0
d14da08 
Conflicts:
	easybuild/framework/easyconfig/easyconfig.py
	setup.py
	test/framework/easyconfig.py
	test/framework/suite.py
@boegel
remove global_vars manipulation that was left in by mistake during me…
21b1580 
…rge of develop
@boegel
fix broken unit tests
f630bc3
@boegel
strictly enforce section markers to start at beginning of a line for …
8a5d9a6 
…easyconfigs format v1.0, to allow for lists specified on a separate line
@stdweird
Merge pull request #19 from boegel/ec_format_v2.0
91a1f3a 
fix merge with develop, fix framework/easyconfigs unit tests on top of this
boegel
boegel reviewed Oct 8, 2013
View reviewed changes
Comment thread easybuild/framework/easyconfig/easyconfig.py Outdated
Copy link
Copy Markdown
Member

@boegel boegel Oct 8, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you elaborate a bit on this? Do you want to allow for specifying as which version (1.0, 2.0) an easyconfig file should be parsed?

Copy link
Copy Markdown
Contributor Author

@stdweird stdweird Oct 8, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, eg via commandline option to override whatever is set in the easyconfig. but i'm not sure if there is a valid use case. ignire or open a ticket.

Copy link
Copy Markdown
Member

@boegel boegel Oct 9, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can make the code support it regardless of having a command line option for it, in any case. I'll try and tackle this.

boegel
boegel reviewed Nov 5, 2013
View reviewed changes
Comment thread easybuild/framework/easyconfig/format/version.py Outdated
Copy link
Copy Markdown
Member

@boegel boegel Nov 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

making these lists makes more sense imho, although that does make these "constants" mutable

tuples are not for listing things that are of the same type, they have a certain (mathematical) semantic

boegel added 4 commits November 6, 2013 20:08
@boegel
major refactoring in format/version.py, rename set_toolchain() to val…
6783f9e 
…idate_and_filter_by_toolchain() and (sort of) complete the implementation of it (recurse); also: make unit tests happy
@boegel
fix recursive call in parse_sections, keep using original configobj a…
c8c38a7 
…s 'main' for sections
@boegel
minor tweaks in parser.py
70726aa
@boegel
style fixes in unit tests
5686e56
@boegel
Copy link
Copy Markdown
Member

boegel commented Nov 6, 2013

@stdweird: I'm done restepping through this beast, I fixed most of the remarks I made in stdweird#22. Just check back here after you review and merge that one, I think there might be a couple of (minor) open questions in here.

After my PR is merged into your repo, I'm very keen on merging this is as is. All the unit tests pass, so this shouldn't break easyconfig format 1.0 in any way.
The support to get easyconfig format 2.0 (even a very simple example) is not done yet (I think mostly completing get_config_dict in two.py is required as initial step, but there might be more), but I really don't want to try and see what changed on top of this beast and step through this over and over again...

Let me know if you're OK with this, I'll then recheck any open comments here and simply add FIXMEs in the code to follow-up on.

@boegel
Copy link
Copy Markdown
Member

boegel commented Nov 6, 2013

Hmm, hold on, I'll need to fix the failure with Python 2.6 and Python 2.4 first, see https://jenkins1.ugent.be/view/EasyBuild%20(boegel)/:

 File "easybuild/framework/easyconfig/format/pyheaderconfigobj.py", line 119, in parse
    sectionmarker_pattern = re.sub('^.*?indentation.*$', '', sectionmarker_pattern, flags=re.M)
TypeError: sub() got an unexpected keyword argument 'flags'

boegel added a commit that referenced this pull request Nov 7, 2013
@boegel
Merge pull request #693 from stdweird/ec_format_v2.0
8d816bf 
Ec format v2.0
@boegel boegel merged commit 8d816bf into easybuilders:develop Nov 7, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v1.X

Development

Successfully merging this pull request may close these issues.

2 participants

@stdweird @boegel