Commit 09f08b17 authored by Johannes Kruisselbrink's avatar Johannes Kruisselbrink
Browse files

Change output folder to be sub-folder of build folder

parent b988e748
......@@ -25,6 +25,7 @@ dataset = DataSet(
description='Converts the EFSA CAPEG database Excel sheet into MCRA '
+ 'effects and assessment groups.',
epilog='For example: use %(prog)s -v -x for a verbose example.',
directory='Build/Output',
version = __version__)
#
#
......@@ -44,7 +45,7 @@ dataset.add(
help='The (output) effects file - '
+ 'format: csv (Comma Seperated).',
default_name='Effects.csv',
default_dir='Output')
default_dir='Build/Output')
#
dataset.add(
name='agmm',
......@@ -52,7 +53,7 @@ dataset.add(
help='The (output) assessment group membership models file - '
+ 'format: csv (Comma Seperated).',
default_name='AssessmentGroupMembershipModels.csv',
default_dir='Output')
default_dir='Build/Output')
#
dataset.add(
name='agm',
......@@ -60,7 +61,7 @@ dataset.add(
help='The (output) assessment group membership file - '
+ 'format: csv (Comma Seperated).',
default_name='AssessmentGroupMemberships.csv',
default_dir='Output')
default_dir='Build/Output')
#
dataset.add(
name='substances',
......@@ -68,7 +69,7 @@ dataset.add(
help='The (output) substances file - '
+ 'format: csv (Comma Seperated).',
default_name='Substances.csv',
default_dir='Output')
default_dir='Build/Output')
#
#############################################################################
......
......@@ -135,7 +135,7 @@ class DataFile:
Contains technical details just to use the files in a simple manner.
:param default_name: The default name for the file, can also
determine the output naam/sheet.
determine the output name/sheet.
:param default_dir: The default directory in which to place the file
:param checksum: If given, a file can be checked/reused
:param necessary: Whether the file is necessary or not.
......@@ -378,7 +378,7 @@ class DataSheet:
class DataSet:
def __init__(self, opening=None, description=None,
epilog=None, version=False):
epilog=None, directory=None, version=False):
self.args = None
self.list = []
# Whether or not to create a zip file
......@@ -405,7 +405,10 @@ class DataSet:
self.parser = ArgumentParser(
description=description, epilog=epilog)
report = 'Output\\Report.md'
if directory:
report= os.path.join(directory, "Report.md")
else:
report = 'Output\\Report.md'
self.parser.add_argument(
'-r', '--report', nargs='?',
const=report,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment