Skip to content
Snippets Groups Projects
Commit 0af2ce1e authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'f-fix-linting-and-openpyxl' into 'dev'

fix linting and openpyxl

See merge request !104
parents 05d83269 87114524
No related branches found
No related tags found
2 merge requests!107Release v0.11.0,!104fix linting and openpyxl
Pipeline #52050 passed
...@@ -159,7 +159,7 @@ def setup_package(): ...@@ -159,7 +159,7 @@ def setup_package():
"jsonref", "jsonref",
"jsonschema[format]>=4.4.0", "jsonschema[format]>=4.4.0",
"numpy>=1.24.0", "numpy>=1.24.0",
"openpyxl>=3.0.7", "openpyxl>=3.1.2,!=3.1.3",
"pandas>=1.2.0", "pandas>=1.2.0",
"xlrd>=2.0", "xlrd>=2.0",
], ],
......
...@@ -589,6 +589,9 @@ ____________________\n""".format(i+1, len(pending_changes)) + str(el[3])) ...@@ -589,6 +589,9 @@ ____________________\n""".format(i+1, len(pending_changes)) + str(el[3]))
if "SHARED_DIR" in os.environ: if "SHARED_DIR" in os.environ:
directory = os.environ["SHARED_DIR"] directory = os.environ["SHARED_DIR"]
else:
directory = "."
logger.info("No 'SHARED_DIR' in environment, using '.' as fallback.")
filename = str(run_id)+".html" filename = str(run_id)+".html"
randname = os.path.basename(os.path.abspath(directory)) randname = os.path.basename(os.path.abspath(directory))
filepath = os.path.abspath(os.path.join(directory, filename)) filepath = os.path.abspath(os.path.join(directory, filename))
......
...@@ -1015,7 +1015,7 @@ if __name__ == "__main__": ...@@ -1015,7 +1015,7 @@ if __name__ == "__main__":
elif args.data_model.endswith(".yml") or args.data_model.endswith(".yaml"): elif args.data_model.endswith(".yml") or args.data_model.endswith(".yaml"):
model = parse_model_from_yaml(args.data_model) model = parse_model_from_yaml(args.data_model)
else: else:
RuntimeError("did not recognize file ending") raise RuntimeError(f"Unknown file ending of data model: {args.data_model}")
if args.print: if args.print:
print(model) print(model)
if args.sync: if args.sync:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment