mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-08-10 15:04:52 +03:00
Fix formatting of project files using black
This commit is contained in:
parent
87ea2c33cc
commit
eb217368e7
|
@ -32,10 +32,7 @@ DEBUG_VALUE = "debug"
|
||||||
|
|
||||||
|
|
||||||
def remove_open_source_files():
|
def remove_open_source_files():
|
||||||
file_names = [
|
file_names = ["CONTRIBUTORS.txt", "LICENSE"]
|
||||||
"CONTRIBUTORS.txt",
|
|
||||||
"LICENSE",
|
|
||||||
]
|
|
||||||
for file_name in file_names:
|
for file_name in file_names:
|
||||||
os.remove(file_name)
|
os.remove(file_name)
|
||||||
|
|
||||||
|
@ -71,7 +68,10 @@ def remove_utility_files():
|
||||||
def remove_heroku_files():
|
def remove_heroku_files():
|
||||||
file_names = ["Procfile", "runtime.txt", "requirements.txt"]
|
file_names = ["Procfile", "runtime.txt", "requirements.txt"]
|
||||||
for file_name in file_names:
|
for file_name in file_names:
|
||||||
if file_name == "requirements.txt" and "{{ cookiecutter.use_travisci }}".lower() == "y":
|
if (
|
||||||
|
file_name == "requirements.txt"
|
||||||
|
and "{{ cookiecutter.use_travisci }}".lower() == "y"
|
||||||
|
):
|
||||||
# don't remove the file if we are using travisci but not using heroku
|
# don't remove the file if we are using travisci but not using heroku
|
||||||
continue
|
continue
|
||||||
os.remove(file_name)
|
os.remove(file_name)
|
||||||
|
@ -183,11 +183,7 @@ def generate_postgres_user(debug=False):
|
||||||
|
|
||||||
|
|
||||||
def set_postgres_user(file_path, value):
|
def set_postgres_user(file_path, value):
|
||||||
postgres_user = set_flag(
|
postgres_user = set_flag(file_path, "!!!SET POSTGRES_USER!!!", value=value)
|
||||||
file_path,
|
|
||||||
"!!!SET POSTGRES_USER!!!",
|
|
||||||
value=value,
|
|
||||||
)
|
|
||||||
return postgres_user
|
return postgres_user
|
||||||
|
|
||||||
|
|
||||||
|
@ -205,9 +201,7 @@ def set_postgres_password(file_path, value=None):
|
||||||
|
|
||||||
def set_celery_flower_user(file_path, value):
|
def set_celery_flower_user(file_path, value):
|
||||||
celery_flower_user = set_flag(
|
celery_flower_user = set_flag(
|
||||||
file_path,
|
file_path, "!!!SET CELERY_FLOWER_USER!!!", value=value
|
||||||
"!!!SET CELERY_FLOWER_USER!!!",
|
|
||||||
value=value,
|
|
||||||
)
|
)
|
||||||
return celery_flower_user
|
return celery_flower_user
|
||||||
|
|
||||||
|
@ -230,11 +224,7 @@ def append_to_gitignore_file(s):
|
||||||
gitignore_file.write(os.linesep)
|
gitignore_file.write(os.linesep)
|
||||||
|
|
||||||
|
|
||||||
def set_flags_in_envs(
|
def set_flags_in_envs(postgres_user, celery_flower_user, debug=False):
|
||||||
postgres_user,
|
|
||||||
celery_flower_user,
|
|
||||||
debug=False,
|
|
||||||
):
|
|
||||||
local_django_envs_path = os.path.join(".envs", ".local", ".django")
|
local_django_envs_path = os.path.join(".envs", ".local", ".django")
|
||||||
production_django_envs_path = os.path.join(".envs", ".production", ".django")
|
production_django_envs_path = os.path.join(".envs", ".production", ".django")
|
||||||
local_postgres_envs_path = os.path.join(".envs", ".local", ".postgres")
|
local_postgres_envs_path = os.path.join(".envs", ".local", ".postgres")
|
||||||
|
@ -244,14 +234,22 @@ def set_flags_in_envs(
|
||||||
set_django_admin_url(production_django_envs_path)
|
set_django_admin_url(production_django_envs_path)
|
||||||
|
|
||||||
set_postgres_user(local_postgres_envs_path, value=postgres_user)
|
set_postgres_user(local_postgres_envs_path, value=postgres_user)
|
||||||
set_postgres_password(local_postgres_envs_path, value=DEBUG_VALUE if debug else None)
|
set_postgres_password(
|
||||||
|
local_postgres_envs_path, value=DEBUG_VALUE if debug else None
|
||||||
|
)
|
||||||
set_postgres_user(production_postgres_envs_path, value=postgres_user)
|
set_postgres_user(production_postgres_envs_path, value=postgres_user)
|
||||||
set_postgres_password(production_postgres_envs_path, value=DEBUG_VALUE if debug else None)
|
set_postgres_password(
|
||||||
|
production_postgres_envs_path, value=DEBUG_VALUE if debug else None
|
||||||
|
)
|
||||||
|
|
||||||
set_celery_flower_user(local_django_envs_path, value=celery_flower_user)
|
set_celery_flower_user(local_django_envs_path, value=celery_flower_user)
|
||||||
set_celery_flower_password(local_django_envs_path, value=DEBUG_VALUE if debug else None)
|
set_celery_flower_password(
|
||||||
|
local_django_envs_path, value=DEBUG_VALUE if debug else None
|
||||||
|
)
|
||||||
set_celery_flower_user(production_django_envs_path, value=celery_flower_user)
|
set_celery_flower_user(production_django_envs_path, value=celery_flower_user)
|
||||||
set_celery_flower_password(production_django_envs_path, value=DEBUG_VALUE if debug else None)
|
set_celery_flower_password(
|
||||||
|
production_django_envs_path, value=DEBUG_VALUE if debug else None
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def set_flags_in_settings_files():
|
def set_flags_in_settings_files():
|
||||||
|
@ -302,8 +300,8 @@ def main():
|
||||||
if "{{ cookiecutter.keep_local_envs_in_vcs }}".lower() == "y":
|
if "{{ cookiecutter.keep_local_envs_in_vcs }}".lower() == "y":
|
||||||
print(
|
print(
|
||||||
INFO + ".env(s) are only utilized when Docker Compose and/or "
|
INFO + ".env(s) are only utilized when Docker Compose and/or "
|
||||||
"Heroku support is enabled so keeping them does not "
|
"Heroku support is enabled so keeping them does not "
|
||||||
"make sense given your current setup." + TERMINATOR
|
"make sense given your current setup." + TERMINATOR
|
||||||
)
|
)
|
||||||
remove_envs_and_associated_files()
|
remove_envs_and_associated_files()
|
||||||
else:
|
else:
|
||||||
|
@ -325,10 +323,10 @@ def main():
|
||||||
"{{ cookiecutter.js_task_runner }}".lower().capitalize()
|
"{{ cookiecutter.js_task_runner }}".lower().capitalize()
|
||||||
)
|
)
|
||||||
+ "working together not supported yet. "
|
+ "working together not supported yet. "
|
||||||
"You can continue using the generated project like you "
|
"You can continue using the generated project like you "
|
||||||
"normally would, however you would need to add a JS "
|
"normally would, however you would need to add a JS "
|
||||||
"task runner service to your Docker Compose configuration "
|
"task runner service to your Docker Compose configuration "
|
||||||
"manually." + TERMINATOR
|
"manually." + TERMINATOR
|
||||||
)
|
)
|
||||||
|
|
||||||
if "{{ cookiecutter.use_celery }}".lower() == "n":
|
if "{{ cookiecutter.use_celery }}".lower() == "n":
|
||||||
|
|
|
@ -18,11 +18,13 @@ SUCCESS = "\x1b[1;32m [SUCCESS]: "
|
||||||
|
|
||||||
project_slug = "{{ cookiecutter.project_slug }}"
|
project_slug = "{{ cookiecutter.project_slug }}"
|
||||||
if hasattr(project_slug, "isidentifier"):
|
if hasattr(project_slug, "isidentifier"):
|
||||||
assert project_slug.isidentifier(), "'{}' project slug is not a valid Python identifier.".format(
|
assert (
|
||||||
project_slug
|
project_slug.isidentifier()
|
||||||
)
|
), "'{}' project slug is not a valid Python identifier.".format(project_slug)
|
||||||
|
|
||||||
assert "\\" not in "{{ cookiecutter.author_name }}", "Don't include backslashes in author name."
|
assert (
|
||||||
|
"\\" not in "{{ cookiecutter.author_name }}"
|
||||||
|
), "Don't include backslashes in author name."
|
||||||
|
|
||||||
if "{{ cookiecutter.use_docker }}".lower() == "n":
|
if "{{ cookiecutter.use_docker }}".lower() == "n":
|
||||||
python_major_version = sys.version_info[0]
|
python_major_version = sys.version_info[0]
|
||||||
|
|
|
@ -97,8 +97,8 @@ def test_travis_invokes_pytest(cookies, context):
|
||||||
assert result.project.basename == context["project_slug"]
|
assert result.project.basename == context["project_slug"]
|
||||||
assert result.project.isdir()
|
assert result.project.isdir()
|
||||||
|
|
||||||
with open(f'{result.project}/.travis.yml', 'r') as travis_yml:
|
with open(f"{result.project}/.travis.yml", "r") as travis_yml:
|
||||||
try:
|
try:
|
||||||
assert yaml.load(travis_yml)['script'] == ['pytest']
|
assert yaml.load(travis_yml)["script"] == ["pytest"]
|
||||||
except yaml.YAMLError as e:
|
except yaml.YAMLError as e:
|
||||||
pytest.fail(e)
|
pytest.fail(e)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user