diff --git a/setup.py b/setup.py index af6943f..27f63bf 100644 --- a/setup.py +++ b/setup.py @@ -39,8 +39,9 @@ def readme(): long_description_content_type="text/markdown", include_package_data=True, keywords='xlsxtemplater', + packages=find_packages('src'), + package_dir={'': 'src'}, name='xlsxtemplater', - packages=find_packages(include=['xlsxtemplater', 'xlsxtemplater.*']), url='https://github.com/gunstonej/xlsxtemplater', version=versioneer.get_version(), cmdclass=versioneer.get_cmdclass(), diff --git a/xlsxtemplater/__init__.py b/src/xlsxtemplater/__init__.py similarity index 100% rename from xlsxtemplater/__init__.py rename to src/xlsxtemplater/__init__.py diff --git a/xlsxtemplater/_version.py b/src/xlsxtemplater/_version.py similarity index 100% rename from xlsxtemplater/_version.py rename to src/xlsxtemplater/_version.py diff --git a/xlsxtemplater/templater.py b/src/xlsxtemplater/templater.py similarity index 98% rename from xlsxtemplater/templater.py rename to src/xlsxtemplater/templater.py index 5e95ef4..30e8a76 100644 --- a/xlsxtemplater/templater.py +++ b/src/xlsxtemplater/templater.py @@ -114,7 +114,7 @@ def object_to_excel(toexcel: ToExcel, fpth: str, file_properties: FileProperties def to_excel(data_object, fpth, file_properties: FileProperties=None, - openfile: bool=True, + openfile: bool=False, make_readme: bool=True) -> str: """ function to output dataobject (list of dicts of dataframes and associated metadata) @@ -128,7 +128,7 @@ def to_excel(data_object, file_properties: FileProperties obj defining metadata openfile: bool make_readme: creates a readme header sheet. default to true. avoid changing unless - necessary as it is required for the from_excel command. + necessary as it is required for the from_excel comm and. Returns: fpth: of output excel file diff --git a/xlsxtemplater/templaterdefs.py b/src/xlsxtemplater/templaterdefs.py similarity index 99% rename from xlsxtemplater/templaterdefs.py rename to src/xlsxtemplater/templaterdefs.py index f648550..3adf531 100644 --- a/xlsxtemplater/templaterdefs.py +++ b/src/xlsxtemplater/templaterdefs.py @@ -201,7 +201,7 @@ class XlsxTable: def __post_init__(self): # apply default header row formatting - self.row_formatting.insert(0, SetRow(1,50,{'bold': True,'text_wrap': True, 'valign': 'top','border': 1})) + self.row_formatting.insert(0, SetRow(0,50,{'bold': True,'text_wrap': True, 'valign': 'top','border': 1})) @dataclass class FileProperties: diff --git a/xlsxtemplater/utils.py b/src/xlsxtemplater/utils.py similarity index 93% rename from xlsxtemplater/utils.py rename to src/xlsxtemplater/utils.py index b15930d..b94c4b5 100644 --- a/xlsxtemplater/utils.py +++ b/src/xlsxtemplater/utils.py @@ -9,7 +9,7 @@ # mf packages # TODO - remove this dedendency if opensource try: - from mf_file_utilities import applauncher_wrapper as aw + from mf_file_utilities.applauncher_wrapper import go as _open_file except: pass @@ -23,8 +23,8 @@ def date(): # from mf_modules.file_operations import open_file def open_file(filename): """Open document with default application in Python.""" - if sys.platform == 'linux' and str(type(aw))== "": - aw.open_file(filename) + if sys.platform == 'linux': + _open_file(filename) # note. this is an MF custom App for opening folders and files # from a Linux file server on the local network else: