From d544ca519a731f4b2cc9badba59db1eda0fd0e87 Mon Sep 17 00:00:00 2001
From: James Graham <J.Graham@software.ac.uk>
Date: Mon, 18 Feb 2019 13:38:30 +0000
Subject: [PATCH] Catch exception when importing PEDASI modules without DB
setup
Should resolve issue when building documentation on RTD
---
datasources/apps.py | 4 ++--
profiles/apps.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/datasources/apps.py b/datasources/apps.py
index 2dd269a..66bee37 100644
--- a/datasources/apps.py
+++ b/datasources/apps.py
@@ -1,7 +1,7 @@
import logging
from django.apps import AppConfig
-from django.db.utils import ProgrammingError
+from django.db.utils import OperationalError, ProgrammingError
logger = logging.getLogger(__name__)
@@ -22,5 +22,5 @@ class DatasourcesConfig(AppConfig):
self.create_operational_metadata()
logging.info('Loaded inline MetadataField fixtures')
- except ProgrammingError:
+ except (OperationalError, ProgrammingError):
logging.warning('Could not create MetadataField fixtures, database has not been initialized')
diff --git a/profiles/apps.py b/profiles/apps.py
index 9eef31b..ff5f5fd 100644
--- a/profiles/apps.py
+++ b/profiles/apps.py
@@ -1,7 +1,7 @@
import logging
from django.apps import AppConfig
-from django.db.utils import ProgrammingError
+from django.db.utils import OperationalError, ProgrammingError
logger = logging.getLogger(__name__)
@@ -51,5 +51,5 @@ class ProfilesConfig(AppConfig):
self.create_groups()
logging.info('Loaded inline Group fixtures')
- except ProgrammingError:
+ except (OperationalError, ProgrammingError):
logging.warning('Could not create Group fixtures, database has not been initialized')
--
GitLab