From 12a8875dce4d7848eed116eee2b3b8b44e720e79 Mon Sep 17 00:00:00 2001 From: statwonk Date: Mon, 16 Jan 2017 21:18:07 -0600 Subject: [PATCH 1/2] Two Scoops 1.8 on p. 56 indicates base.txt is preferred for consistency --- .../config/settings/{common.py => base.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {{cookiecutter.project_slug}}/config/settings/{common.py => base.py} (100%) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/base.py similarity index 100% rename from {{cookiecutter.project_slug}}/config/settings/common.py rename to {{cookiecutter.project_slug}}/config/settings/base.py From 62d86877e40f3ca9ff03d7423635634c23570ced Mon Sep 17 00:00:00 2001 From: statwonk Date: Mon, 16 Jan 2017 21:38:52 -0600 Subject: [PATCH 2/2] Missed a few references to the renamed settings file. This brings them inline. --- {{cookiecutter.project_slug}}/config/settings/local.py | 2 +- {{cookiecutter.project_slug}}/config/settings/production.py | 2 +- {{cookiecutter.project_slug}}/config/settings/test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index c72d3af11..969694bc9 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -14,7 +14,7 @@ Local settings import socket import os -from .common import * # noqa +from .base import * # noqa # DEBUG # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index c1fccc95b..94f781916 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -20,7 +20,7 @@ from django.utils import six import logging {% endif %} -from .common import * # noqa +from .base import * # noqa # SECRET CONFIGURATION # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py index 6d07eb50c..b1a43cd64 100644 --- a/{{cookiecutter.project_slug}}/config/settings/test.py +++ b/{{cookiecutter.project_slug}}/config/settings/test.py @@ -5,7 +5,7 @@ Test settings - Used to run tests fast on the continuous integration server and locally ''' -from .common import * # noqa +from .base import * # noqa # DEBUG