From 655360c2fbaacb3459babcb6449df3274329e663 2015-09-07 20:42:14 From: Branko Majic Date: 2015-09-07 20:42:14 Subject: [PATCH] MDT-1: Do not auto-import the development environment settings. This messes with the other stuff. Updated docs to reflect this, and pointed users to DJANGO_SETTINGS_MODULE environment variable instead. --- diff --git a/docs/usage.rst b/docs/usage.rst index ddb067e52687f5ac17b286e619b9b1e2252843bc..a49eb5c150dd7f25c79a8c5eca7ba9ee3e66a873 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -54,11 +54,6 @@ files are present: environment. You should be very careful not to mess this file up, and make sure that things like debugging etc are turned off (unless you really, really need it in development environment). -* ``__init__.py`` is a convenience script used to automatically import the - development environment settings if no specific project configuration is - passed on to the WSGI application. For example, if you simply run ``manage.py - runserver`` without specifying environment configuration explicitly, it will - automatically fall back to using the development settings. There is very little in special variables used in the listed configuration files. You can practically specify any Django or Django application @@ -117,7 +112,5 @@ of the following commands (depending on which environment you want to run):: python manage.py runserver --settings your_project_name.settings.testing python manage.py runserver --settings your_project_name.settings.production -As mentioned before, the following will default to running the Django -development server using the development settings:: - - python manage.py runserver +If using ``virtualenv``, you may want to set the ``DJANGO_SETTINGS_MODULE`` +environment variable in it to make your life easier. diff --git a/project/project_name/settings/__init__.py b/project/project_name/settings/__init__.py index 5312dcceb024abe979fcc487bb8e18e7ab08746e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/project/project_name/settings/__init__.py +++ b/project/project_name/settings/__init__.py @@ -1,2 +0,0 @@ -# Run the development site by default. -from .development import *