From 86995e01b3a32d97adcc1860f2e62b5e46f25ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D0=B8=D1=89=D0=B5=D0=B2=20=D0=AE=D1=80?= =?UTF-8?q?=D0=B8=D0=B9?= Date: Thu, 13 May 2021 17:04:56 +0000 Subject: [PATCH] Add `python-dotenv` --- README.md | 8 ++++---- access_controller/settings.py | 4 ++++ requirements/common.txt | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index eb66f37..8489e7d 100644 --- a/README.md +++ b/README.md @@ -48,9 +48,9 @@ cp .env.example .env sudo apt install make pip install --upgrade pip pip install -r requirements/dev.txt -(set -a && source .env && ./manage.py migrate) -(set -a && source .env && ./manage.py loaddata data.json) -(set -a && source .env && ./manage.py runserver) +./manage.py migrate +./manage.py loaddata data.json +./manage.py runserver ``` ## Перед запуском для тестирования: @@ -65,7 +65,7 @@ pip install -r requirements/dev.txt - Перейти в папку приложения - Активировать виртуальное окружение - Выполнить команду `pip install -r requirements/dev.txt` -- В виртуальное окружение добавить следующие переменные: +- В файл `.env` добавить следующие переменные: ``` diff --git a/access_controller/settings.py b/access_controller/settings.py index a74ad7f..7361a60 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/3.1/ref/settings/ """ import os from pathlib import Path +from dotenv import load_dotenv # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -18,6 +19,9 @@ BASE_DIR = Path(__file__).resolve().parent.parent # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ +# Load environment variables from .env +load_dotenv() + # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = os.getenv('ACTRL_SECRET_KEY', 'empty') diff --git a/requirements/common.txt b/requirements/common.txt index 6b3e7fa..0bbb21b 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -14,3 +14,6 @@ sphinx-rtd-theme==0.5.1 sphinx-autodoc-typehints==1.11.1 pyenchant==3.2.0 sphinxcontrib-spelling==7.1.0 + +# Misc +python-dotenv==0.17.1