Merge branch 'master' into 30-formats-cli

Author: Bjwebb

examples/help/unflatten/expected.txt

@@ -33,7 +33,7 @@ optional arguments:
                         Defaults to utf8.
   -o OUTPUT_NAME, --output-name OUTPUT_NAME
                         Name of the outputted file. Will have an extension
-                        appended as appropriate. Defaults to unflattened.json
+                        appended as appropriate.
   -c CELL_SOURCE_MAP, --cell-source-map CELL_SOURCE_MAP
                         Path to write a cell source map to. Will have an
                         extension appended as appropriate.

flattentool/__init__.py

@@ -12,7 +12,8 @@
 from collections import OrderedDict
 
 
-def create_template(schema, output_name='template', output_format='all', main_sheet_name='main', flatten=False, rollup=False, root_id=None, use_titles=False, **_):
+def create_template(schema, output_name='template', output_format='all', main_sheet_name='main',
+                    rollup=False, root_id=None, use_titles=False, **_):
     """
     Creates template file(s) from given inputs
     This function is built to deal with commandline input and arguments

flattentool/cli.py

@@ -132,7 +132,7 @@ def create_parser():
         help="Encoding of the input file(s) (only relevant for CSV). This can be any encoding recognised by Python. Defaults to utf8.")
     parser_unflatten.add_argument(
         "-o", "--output-name",
-        help="Name of the outputted file. Will have an extension appended as appropriate. Defaults to unflattened.json")
+        help="Name of the outputted file. Will have an extension appended as appropriate.")
     parser_unflatten.add_argument(
         "-c", "--cell-source-map",
         help="Path to write a cell source map to. Will have an extension appended as appropriate.")