mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-11-26 03:24:01 +03:00
Merge branch 'master' into hiredis
This commit is contained in:
commit
99a15f1def
|
@ -15,8 +15,8 @@ from django.core.asgi import get_asgi_application
|
||||||
|
|
||||||
# This allows easy placement of apps within the interior
|
# This allows easy placement of apps within the interior
|
||||||
# {{ cookiecutter.project_slug }} directory.
|
# {{ cookiecutter.project_slug }} directory.
|
||||||
app_path = Path(__file__).parents[1].resolve()
|
ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent
|
||||||
sys.path.append(str(app_path / "{{ cookiecutter.project_slug }}"))
|
sys.path.append(str(ROOT_DIR / "{{ cookiecutter.project_slug }}"))
|
||||||
|
|
||||||
# If DJANGO_SETTINGS_MODULE is unset, default to the local settings
|
# If DJANGO_SETTINGS_MODULE is unset, default to the local settings
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
|
||||||
|
|
|
@ -5,8 +5,8 @@ from pathlib import Path
|
||||||
|
|
||||||
import environ
|
import environ
|
||||||
|
|
||||||
ROOT_DIR = Path(__file__).parents[2]
|
ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent.parent
|
||||||
# {{ cookiecutter.project_slug }}/)
|
# {{ cookiecutter.project_slug }}/
|
||||||
APPS_DIR = ROOT_DIR / "{{ cookiecutter.project_slug }}"
|
APPS_DIR = ROOT_DIR / "{{ cookiecutter.project_slug }}"
|
||||||
env = environ.Env()
|
env = environ.Env()
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,8 @@ from django.core.wsgi import get_wsgi_application
|
||||||
|
|
||||||
# This allows easy placement of apps within the interior
|
# This allows easy placement of apps within the interior
|
||||||
# {{ cookiecutter.project_slug }} directory.
|
# {{ cookiecutter.project_slug }} directory.
|
||||||
app_path = Path(__file__).parents[1].resolve()
|
ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent
|
||||||
sys.path.append(str(app_path / "{{ cookiecutter.project_slug }}"))
|
sys.path.append(str(ROOT_DIR / "{{ cookiecutter.project_slug }}"))
|
||||||
# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
|
# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
|
||||||
# if running multiple sites in the same mod_wsgi process. To fix this, use
|
# if running multiple sites in the same mod_wsgi process. To fix this, use
|
||||||
# mod_wsgi daemon mode with each site in its own daemon process, or use
|
# mod_wsgi daemon mode with each site in its own daemon process, or use
|
||||||
|
|
|
@ -8,7 +8,7 @@ argon2-cffi==19.2.0 # https://github.com/hynek/argon2_cffi
|
||||||
{%- if cookiecutter.use_whitenoise == 'y' %}
|
{%- if cookiecutter.use_whitenoise == 'y' %}
|
||||||
whitenoise==5.0.1 # https://github.com/evansd/whitenoise
|
whitenoise==5.0.1 # https://github.com/evansd/whitenoise
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
redis==3.4.1 # https://github.com/andymccurdy/redis-py
|
redis==3.5.0 # https://github.com/andymccurdy/redis-py
|
||||||
{%- if cookiecutter.windows == "n" %}
|
{%- if cookiecutter.windows == "n" %}
|
||||||
hiredis==1.0.1 # https://github.com/redis/hiredis-py
|
hiredis==1.0.1 # https://github.com/redis/hiredis-py
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user