cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-11-04 09:57:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2583 from pydanny/2581-heroku-compressor-error

Browse Source 
Fix OfflineGenerationError with Heroku + Django Compressor
This commit is contained in:
Bruno Alla 2020-07-04 15:59:12 +01:00 committed by GitHub
commit 4a4dd056d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -211,7 +211,6 @@ tags
### VirtualEnv template ### VirtualEnv template
# Virtualenv # Virtualenv
# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/ # http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
[Bb]in
[Ii]nclude [Ii]nclude
[Ll]ib [Ll]ib
[Ll]ib64 [Ll]ib64

7
hooks/post_gen_project.py
View File

@ -75,6 +75,11 @@ def remove_heroku_files():
# 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)
remove_heroku_build_hooks()
def remove_heroku_build_hooks():
shutil.rmtree("bin")
def remove_gulp_files(): def remove_gulp_files():
@ -346,6 +351,8 @@ def main():
if "{{ cookiecutter.use_heroku }}".lower() == "n": if "{{ cookiecutter.use_heroku }}".lower() == "n":
remove_heroku_files() remove_heroku_files()
elif "{{ cookiecutter.use_compressor }}".lower() == "n":
remove_heroku_build_hooks()
if ( if (
"{{ cookiecutter.use_docker }}".lower() == "n" "{{ cookiecutter.use_docker }}".lower() == "n"

1
{{cookiecutter.project_slug}}/.gitignore vendored
View File

@ -325,7 +325,6 @@ tags
### VirtualEnv template ### VirtualEnv template
# Virtualenv # Virtualenv
[Bb]in
[Ii]nclude [Ii]nclude
[Ll]ib [Ll]ib
[Ll]ib64 [Ll]ib64

22
{{cookiecutter.project_slug}}/bin/post_compile Normal file
View File

@ -0,0 +1,22 @@
#!/usr/bin/env bash
compress_enabled() {
python << END
import sys
from environ import Env
env = Env(COMPRESS_ENABLED=(bool, True))
if env('COMPRESS_ENABLED'):
sys.exit(0)
else:
sys.exit(1)
END
}
if compress_enabled
then
python manage.py compress
fi
python manage.py collectstatic --noinput