From f3ba807d7f7d6ea943dbadb7613906fcedbddab0 Mon Sep 17 00:00:00 2001
From: Alexander Schlemmer <alexander@mail-schlemmer.de>
Date: Fri, 15 Jan 2021 21:27:15 +0100
Subject: [PATCH] STY: style fixes and cleanup of unnecessary imports
---
src/caosdb/configuration.py | 3 ++-
unittests/test_schema.py | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/caosdb/configuration.py b/src/caosdb/configuration.py
index 67427d10..5f123739 100644
--- a/src/caosdb/configuration.py
+++ b/src/caosdb/configuration.py
@@ -53,6 +53,7 @@ def configure(inifile):
validate_yaml_schema(config_to_yaml(_pycaosdbconf))
return read_config
+
def get_config():
return _pycaosdbconf
@@ -72,8 +73,8 @@ def config_to_yaml(config):
return valobj
+
def validate_yaml_schema(valobj):
with open(os.path.join(os.path.dirname(__file__), "schema-pycaosdb-ini.yml")) as f:
schema = yaml.load(f, Loader=yaml.SafeLoader)
validate(instance=valobj, schema=schema["schema-pycaosdb-ini"])
-
diff --git a/unittests/test_schema.py b/unittests/test_schema.py
index c078b766..387518c9 100644
--- a/unittests/test_schema.py
+++ b/unittests/test_schema.py
@@ -2,8 +2,6 @@
# Test configuration schema
# A. Schlemmer, 01/2021
-import yaml
-from jsonschema import validate
from jsonschema.exceptions import ValidationError
from pytest import raises
from glob import glob
@@ -18,6 +16,7 @@ def test_config_files():
c.read(fn)
validate_yaml_schema(config_to_yaml(c))
+
def test_broken_config_files():
for fn in glob(os.path.join(os.path.dirname(__file__), "broken_configs", "*.ini")):
print(fn)
--
GitLab