diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 807c4d8a0..11324a50a 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -16,6 +16,7 @@ Fábio C. Barrionuevo da Luz `@luzfcb`_ @luzfcb Saurabh Kumar `@theskumar`_ @_theskumar Jannis Gebauer `@jayfk`_ Burhan Khalid `@burhan`_ @burhan +Shupeyko Nikita `@webyneter`_ @webyneter =========================== ============= =========== *Audrey is also the creator of Cookiecutter. Audrey and @@ -26,6 +27,7 @@ Daniel are on the Cookiecutter core team.* .. _@theskumar: https://github.com/theskumar .. _@audreyr: https://github.com/audreyr .. _@jayfk: https://github.com/jayfk +.. _@webyneter: https://github.com/webyneter Other Contributors ------------------ diff --git a/README.rst b/README.rst index 0817c6b88..2648aeac7 100644 --- a/README.rst +++ b/README.rst @@ -84,7 +84,7 @@ Constraints * Only maintained 3rd party libraries are used. * Uses PostgreSQL everywhere (9.2+) -* Environment variables for configuration (This won't work with Apache/mod_wsgi). +* Environment variables for configuration (This won't work with Apache/mod_wsgi except on AWS ELB). Usage @@ -273,18 +273,18 @@ Two Scoops Press :align: center :alt: Two Scoops Press :target: https://twoscoopspress.com - -Two Scoops Press brings you the best dairy-themed Django references in the universe - + +Two Scoops Press brings you the best dairy-themed Django references in the universe + pyup -~~~~~~~~~~~~~~~~~~ - +~~~~~~~~~~~~~~~~~~ + .. image:: https://pyup.io/static/images/logo.png :name: pyup :align: center :alt: pyup :target: https://pyup.io/ - + Pyup brings you automated security and dependency updates used by Google and other organizations. Free for open source projects! .. _`PyPA Code of Conduct`: https://www.pypa.io/en/latest/code-of-conduct/ diff --git a/requirements.txt b/requirements.txt index 528f9d956..ebc618046 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ binaryornot==0.4.3 pytest==3.0.7 pep8==1.7.0 pyflakes==1.5.0 -tox==2.6.0 +tox==2.7.0 pytest-cookies==0.2.0 diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index cf4679c31..3b51ae328 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -54,11 +54,12 @@ MIDDLEWARE += ['debug_toolbar.middleware.DebugToolbarMiddleware', ] INSTALLED_APPS += ['debug_toolbar', ] INTERNAL_IPS = ['127.0.0.1', '10.0.2.2', ] +{% if cookiecutter.use_docker == 'y' %} # tricks to have debug toolbar when developing with docker if os.environ.get('USE_DOCKER') == 'yes': ip = socket.gethostbyname(socket.gethostname()) INTERNAL_IPS += [ip[:-1] + '1'] - +{% endif %} DEBUG_TOOLBAR_CONFIG = { 'DISABLE_PANELS': [ 'debug_toolbar.panels.redirects.RedirectsPanel', diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py index 6bb25f745..32171c03e 100644 --- a/{{cookiecutter.project_slug}}/config/urls.py +++ b/{{cookiecutter.project_slug}}/config/urls.py @@ -35,7 +35,6 @@ if settings.DEBUG: ] if 'debug_toolbar' in settings.INSTALLED_APPS: import debug_toolbar - - urlpatterns += [ + urlpatterns = [ url(r'^__debug__/', include(debug_toolbar.urls)), - ] + ] + urlpatterns diff --git a/{{cookiecutter.project_slug}}/config/wsgi.py b/{{cookiecutter.project_slug}}/config/wsgi.py index 05d56ab24..601d27c64 100644 --- a/{{cookiecutter.project_slug}}/config/wsgi.py +++ b/{{cookiecutter.project_slug}}/config/wsgi.py @@ -13,14 +13,16 @@ middleware here, or combine a Django application with an application of another framework. """ -import os, sys +import os +import sys + +from django.core.wsgi import get_wsgi_application # This allows easy placement of apps within the interior # {{ cookiecutter.project_slug }} directory. app_path = os.path.dirname(os.path.abspath(__file__)).replace('/config', '') sys.path.append(os.path.join(app_path, '{{ cookiecutter.project_slug }}')) -from django.core.wsgi import get_wsgi_application {% if cookiecutter.use_sentry_for_error_reporting == 'y' -%} if os.environ.get('DJANGO_SETTINGS_MODULE') == 'config.settings.production': from raven.contrib.django.raven_compat.middleware.wsgi import Sentry diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index b8f880b80..6eb09c949 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -10,7 +10,7 @@ wheel==0.29.0 django==1.10.7 # pyup: >=1.10,<1.11 # Configuration -django-environ==0.4.1 +django-environ==0.4.3 {% if cookiecutter.use_whitenoise == 'y' -%} whitenoise==3.3.0 {%- endif %} @@ -21,10 +21,10 @@ django-braces==1.11.0 django-crispy-forms==1.6.1 # Models -django-model-utils==2.6.1 +django-model-utils==3.0.0 # Images -Pillow==4.0.0 +Pillow==4.1.0 # Password storage argon2-cffi==16.3.0 diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 390112080..b88ff65c6 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ Collectfast==0.5.2 # Email backends for Mailgun, Postmark, SendGrid and more # ------------------------------------------------------- -django-anymail==0.8 +django-anymail==0.9 {% if cookiecutter.use_sentry_for_error_reporting == "y" -%} # Raven is the Sentry client diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html index 4ed49964e..e947da5b8 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html @@ -7,7 +7,7 @@ - + - + {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress css %}{% endraw %}{% endif %}{% raw %} @@ -29,44 +29,43 @@
-