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

Jump to bottom

Fix manifest parsing #250

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix manifest parsing #250

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4871bd
Fix manifest parsing
mdboom Dec 2, 2022
0c4cd53
Merge remote-tracking branch 'upstream/main' into fix-manifest-parsing
mdboom Jan 11, 2023
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
4 changes: 1 addition & 3 deletions pyperformance/_manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,12 @@ def _add_benchmark(self, spec, metafile, resolve, filename):
def _add_group(self, name, entries):
if name in self._byname:
raise ValueError(f'a group and a benchmark have the same name ({name})')
if name == 'all':
raise ValueError('a group named "all" is not allowed ("all" is reserved for selecting the full set of declared benchmarks)')
Comment on lines -172 to -173
Copy link
Member

Choose a reason for hiding this comment

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

This should still be the case. So the Pyston benchmarks' manifest needs to be fixed.

if entries is None:
if name in self._raw_groups:
return
self._raw_groups[name] = None
elif name in self._raw_groups and self._raw_groups[name] is not None:
raise ValueError(f'a group named {name} was already defined')
self._raw_groups[name].extend(list(entries) if entries else [])
Copy link
Member

Choose a reason for hiding this comment

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

This rule should apply for a single manifest, with the exception only for includes (which should be merged like you are doing). I expect the logic for distinguishing between the two cases is lacking, either in `_parse_manifest() below or in the code that consumes its output.

else:
self._raw_groups[name] = list(entries) if entries else []
self._groups = None # Force re-resolution.
Expand Down