Skip to content

Commit

Permalink
Add format_version to config object
Browse files Browse the repository at this point in the history
  • Loading branch information
remram44 committed Sep 11, 2015
1 parent 8f5932b commit 2c68950
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
10 changes: 7 additions & 3 deletions reprounzip/reprounzip/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,15 @@ def read_packages(packages, File=File, Package=Package):
# 0.4.1: no change
# 0.5: no change
# 0.6: no change
# 0.7: moves input_files and output_files from run to global scope
# 0.7:
# moves input_files and output_files from run to global scope
# adds processes.is_thread column to trace database
# 0.8: adds 'id' field to run


Config = optional_return_type(['runs', 'packages', 'other_files'],
['inputs_outputs', 'additional_patterns'])
['inputs_outputs', 'additional_patterns',
'format_version'])


class InputOutputFile(object):
Expand Down Expand Up @@ -255,7 +258,8 @@ def load_config(filename, canonical, File=File, Package=Package):
inputs_outputs,
pack_id=config.get('pack_id'))

kwargs = {'inputs_outputs': inputs_outputs}
kwargs = {'format_version': ver,
'inputs_outputs': inputs_outputs}

if canonical:
if 'additional_patterns' in config:
Expand Down
10 changes: 7 additions & 3 deletions reprozip/reprozip/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,15 @@ def read_packages(packages, File=File, Package=Package):
# 0.4.1: no change
# 0.5: no change
# 0.6: no change
# 0.7: moves input_files and output_files from run to global scope
# 0.7:
# moves input_files and output_files from run to global scope
# adds processes.is_thread column to trace database
# 0.8: adds 'id' field to run


Config = optional_return_type(['runs', 'packages', 'other_files'],
['inputs_outputs', 'additional_patterns'])
['inputs_outputs', 'additional_patterns',
'format_version'])


class InputOutputFile(object):
Expand Down Expand Up @@ -255,7 +258,8 @@ def load_config(filename, canonical, File=File, Package=Package):
inputs_outputs,
pack_id=config.get('pack_id'))

kwargs = {'inputs_outputs': inputs_outputs}
kwargs = {'format_version': ver,
'inputs_outputs': inputs_outputs}

if canonical:
if 'additional_patterns' in config:
Expand Down

0 comments on commit 2c68950

Please sign in to comment.