diff --git a/cookiecutter.json b/cookiecutter.json index ababd56b..bf729b67 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -17,10 +17,10 @@ "use_python3": "y", "use_docker": "y", "use_heroku": "n", + "use_elasticbeanstalk_experimental": "n", "use_compressor": "n", "postgresql_version": ["9.5", "9.4", "9.3", "9.2"], "js_task_runner": ["Gulp", "Grunt", "None"], "use_lets_encrypt": "n", - "open_source_license": ["MIT", "BSD", "GPLv3", "Apache Software License 2.0", "Not open source"], - "use_elasticbeanstalk_experimental": "n" + "open_source_license": ["MIT", "BSD", "GPLv3", "Apache Software License 2.0", "Not open source"] } diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py index 9cd168bc..cd31774e 100644 --- a/hooks/pre_gen_project.py +++ b/hooks/pre_gen_project.py @@ -3,4 +3,9 @@ project_slug = '{{ cookiecutter.project_slug }}' if hasattr(project_slug, 'isidentifier'): assert project_slug.isidentifier(), 'Project slug should be valid Python identifier!' +elasticbeanstalk = '{{ cookiecutter.use_elasticbeanstalk_experimental }}'.lower() +heroku = '{{ cookiecutter.use_heroku }}'.lower() +docker = '{{ cookiecutter.use_docker }}'.lower() +if elasticbeanstalk == 'y' and (heroku == 'y' or docker == 'y'): + raise Exception("Cookiecutter Django's EXPERIMENTAL Elastic Beanstalk support is incompatible with Heroku and Docker setups.")