Merge branch 'master-develop' into master

MoreliaTalk · Jul 11, 2021 · be6c3ba · be6c3ba
2 parents 19a17e3 + 082ae05
commit be6c3ba
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/mod/api.py b/mod/api.py
@@ -81,7 +81,6 @@ class Config:
     errors: Optional[Errors] = None
     jsonapi: Optional[Version] = None
     meta: Optional[Any] = None
-
     def toJSON(self):
         return json.dumps(self,
                           ensure_ascii=False,

diff --git a/settings/logging.py b/settings/logging.py
@@ -18,9 +18,14 @@ def add_logging(debug_status: int) -> None:
     The information is also duplicated in the console
 
     Args:
-        TODO: добавить описание типов дебаг статусов
         debug_status (str, requires): ?
 
+        50 - CRITICAL
+        40 - ERROR
+        30 - WARNING
+        20 - INFO
+        10 - DEBUG
+        
     Returns:
         None
     """

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -10,6 +10,7 @@
 FIXTURES_PATH = os.path.join(BASE_PATH, 'fixtures')
 VALID_JSON = os.path.join(FIXTURES_PATH, 'api.json')
 sys.path.append(os.path.split(BASE_PATH)[0])
+
 from mod import api  # noqa
 
 

diff --git a/tests/test_controller.py b/tests/test_controller.py
@@ -13,6 +13,7 @@
 BASE_PATH = os.path.abspath(os.path.dirname(__file__))
 FIXTURES_PATH = os.path.join(BASE_PATH, "fixtures")
 sys.path.append(os.path.split(BASE_PATH)[0])
+
 from mod import api  # noqa
 from mod import controller  # noqa
 from mod import lib  # noqa