From ddec6b41841aace5f3d8dfa51325247fa6479ccc Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 30 Jan 2019 21:08:14 +0100 Subject: [PATCH] Use gnuviechadmin.settings Specific settings have been removed, they are now triggerd by the GVA_ENVIRONMENT variable. --- docs/code/gnuviechadmin.rst | 24 ------------------------ gnuviechadmin/manage.py | 2 +- gnuviechadmin/setup.cfg | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/docs/code/gnuviechadmin.rst b/docs/code/gnuviechadmin.rst index 57fabec..8625299 100644 --- a/docs/code/gnuviechadmin.rst +++ b/docs/code/gnuviechadmin.rst @@ -35,28 +35,4 @@ The project module :py:mod:`gnuviechadmin` ------------------------------------------- .. automodule:: gnuviechadmin.settings - - -:py:mod:`base ` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. automodule:: gnuviechadmin.settings.base :members: - - -:py:mod:`local ` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. automodule:: gnuviechadmin.settings.local - - -:py:mod:`production ` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. automodule:: gnuviechadmin.settings.production - - -:py:mod:`test ` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. automodule:: gnuviechadmin.settings.test diff --git a/gnuviechadmin/manage.py b/gnuviechadmin/manage.py index c6003db..d28aed8 100755 --- a/gnuviechadmin/manage.py +++ b/gnuviechadmin/manage.py @@ -4,7 +4,7 @@ import sys if __name__ == "__main__": os.environ.setdefault( - "DJANGO_SETTINGS_MODULE", "gnuviechadmin.settings.local") + "DJANGO_SETTINGS_MODULE", "gnuviechadmin.settings") from django.core.management import execute_from_command_line diff --git a/gnuviechadmin/setup.cfg b/gnuviechadmin/setup.cfg index e83e084..f2d9645 100644 --- a/gnuviechadmin/setup.cfg +++ b/gnuviechadmin/setup.cfg @@ -9,7 +9,7 @@ source = gnuviechadmin,contact_form,dashboard,domains,gvawebcore,managemails,osu branch = True [coverage:report] -omit = */migrations/*,*/tests/*.py,*/tests.py,gnuviechadmin/settings/local.py,gnuviechadmin/settings/production.py +omit = */migrations/*,*/tests/*.py,*/tests.py,gnuviechadmin/settings.py show_missing = True [coverage:html]