mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-08-08 14:04:52 +03:00
Prettify here and there
This commit is contained in:
parent
bd52c0b9f0
commit
7cedff22d5
|
@ -1 +1,3 @@
|
||||||
|
# General
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
USE_DOCKER=yes
|
USE_DOCKER=yes
|
||||||
|
|
|
@ -1,2 +1,4 @@
|
||||||
|
# PostgreSQL
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
POSTGRES_USER=!!!SET POSTGRES_USER!!!
|
POSTGRES_USER=!!!SET POSTGRES_USER!!!
|
||||||
POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!!
|
POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!!
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
|
# Caddy
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
DOMAIN_NAME={{ cookiecutter.domain_name }}
|
DOMAIN_NAME={{ cookiecutter.domain_name }}
|
||||||
|
|
|
@ -1,2 +1,4 @@
|
||||||
|
# PostgreSQL
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
POSTGRES_USER=!!!SET POSTGRES_USER!!!
|
POSTGRES_USER=!!!SET POSTGRES_USER!!!
|
||||||
POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!!
|
POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!!
|
||||||
|
|
|
@ -3,15 +3,14 @@ from typing import Sequence
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
PROJECT_DIR_PATH = os.path.dirname(os.path.realpath(__file__))
|
ROOT_DIR_PATH = os.path.dirname(os.path.realpath(__file__))
|
||||||
|
PRODUCTION_DOTENVS_DIR_PATH = os.path.join(ROOT_DIR_PATH, '.envs', '.production')
|
||||||
PRODUCTION_DOTENV_DIR_PATH = os.path.join(PROJECT_DIR_PATH, '.envs', '.production')
|
|
||||||
PRODUCTION_DOTENV_FILE_PATHS = [
|
PRODUCTION_DOTENV_FILE_PATHS = [
|
||||||
os.path.join(PRODUCTION_DOTENV_DIR_PATH, '.django'),
|
os.path.join(PRODUCTION_DOTENVS_DIR_PATH, '.django'),
|
||||||
os.path.join(PRODUCTION_DOTENV_DIR_PATH, '.postgres'),
|
os.path.join(PRODUCTION_DOTENVS_DIR_PATH, '.postgres'),
|
||||||
os.path.join(PRODUCTION_DOTENV_DIR_PATH, '.caddy'),
|
os.path.join(PRODUCTION_DOTENVS_DIR_PATH, '.caddy'),
|
||||||
]
|
]
|
||||||
DOTENV_FILE_PATH = os.path.join(PROJECT_DIR_PATH, '.env')
|
DOTENV_FILE_PATH = os.path.join(ROOT_DIR_PATH, '.env')
|
||||||
|
|
||||||
|
|
||||||
def merge(output_file_path: str,
|
def merge(output_file_path: str,
|
||||||
|
@ -32,9 +31,9 @@ def main():
|
||||||
|
|
||||||
@pytest.mark.parametrize('merged_file_count', range(3))
|
@pytest.mark.parametrize('merged_file_count', range(3))
|
||||||
@pytest.mark.parametrize('append_linesep', [True, False])
|
@pytest.mark.parametrize('append_linesep', [True, False])
|
||||||
def test_when_merging_given_valid_arguments_should_succeed(tmpdir_factory,
|
def test_merge(tmpdir_factory,
|
||||||
merged_file_count,
|
merged_file_count: int,
|
||||||
append_linesep):
|
append_linesep: bool):
|
||||||
tmp_dir_path = str(tmpdir_factory.getbasetemp())
|
tmp_dir_path = str(tmpdir_factory.getbasetemp())
|
||||||
|
|
||||||
output_file_path = os.path.join(tmp_dir_path, '.env')
|
output_file_path = os.path.join(tmp_dir_path, '.env')
|
||||||
|
|
Loading…
Reference in New Issue
Block a user