From 7f4dee8d69547e03a69be223d4163429f926977c Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 8 Nov 2016 18:19:49 -0400 Subject: [PATCH] Fix testing settings for GitLab CI. --- mayan/settings/testing/gitlab-ci/__init__.py | 2 +- mayan/settings/testing/gitlab-ci/base.py | 5 +++++ mayan/settings/testing/gitlab-ci/db_mysql.py | 2 +- mayan/settings/testing/gitlab-ci/db_postgres.py | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 mayan/settings/testing/gitlab-ci/base.py diff --git a/mayan/settings/testing/gitlab-ci/__init__.py b/mayan/settings/testing/gitlab-ci/__init__.py index 52dd3067e9..46fb87a6c1 100644 --- a/mayan/settings/testing/gitlab-ci/__init__.py +++ b/mayan/settings/testing/gitlab-ci/__init__.py @@ -1,4 +1,4 @@ -from ..base import * # NOQA +from .base import * # NOQA SIGNATURES_GPG_PATH = '/usr/bin/gpg1' diff --git a/mayan/settings/testing/gitlab-ci/base.py b/mayan/settings/testing/gitlab-ci/base.py new file mode 100644 index 0000000000..eb890b44b0 --- /dev/null +++ b/mayan/settings/testing/gitlab-ci/base.py @@ -0,0 +1,5 @@ +from __future__ import unicode_literals + +from ..base import * # NOQA + +SIGNATURES_GPG_PATH = '/usr/bin/gpg1' diff --git a/mayan/settings/testing/gitlab-ci/db_mysql.py b/mayan/settings/testing/gitlab-ci/db_mysql.py index 00a9050121..6792c95e34 100644 --- a/mayan/settings/testing/gitlab-ci/db_mysql.py +++ b/mayan/settings/testing/gitlab-ci/db_mysql.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from ..base import * # NOQA +from .base import * # NOQA DATABASES = { 'default': { diff --git a/mayan/settings/testing/gitlab-ci/db_postgres.py b/mayan/settings/testing/gitlab-ci/db_postgres.py index bf0ff1d380..fb763595d9 100644 --- a/mayan/settings/testing/gitlab-ci/db_postgres.py +++ b/mayan/settings/testing/gitlab-ci/db_postgres.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from ..base import * # NOQA +from .base import * # NOQA DATABASES = { 'default': {