From f7ca4d712ccaebba88c12c9aac0411bbcfdbbba7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 13 Apr 2017 19:54:18 +0200 Subject: [PATCH 01/13] Update tox from 2.6.0 to 2.7.0 (#1113) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From a3b0feec120dd02c31f92d10fbf77e1f63976da7 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Thu, 13 Apr 2017 11:27:54 -0700 Subject: [PATCH 02/13] Flake8 fix --- {{cookiecutter.project_slug}}/config/wsgi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/wsgi.py b/{{cookiecutter.project_slug}}/config/wsgi.py index 05d56ab24..741b0798f 100644 --- a/{{cookiecutter.project_slug}}/config/wsgi.py +++ b/{{cookiecutter.project_slug}}/config/wsgi.py @@ -15,12 +15,13 @@ framework. """ import os, 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 From ba2301fc3c524edce7aca3c883763f2778dd39f3 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Thu, 13 Apr 2017 11:30:57 -0700 Subject: [PATCH 03/13] Fix multiple imports on one line --- README.rst | 14 +++++++------- {{cookiecutter.project_slug}}/config/wsgi.py | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) 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/{{cookiecutter.project_slug}}/config/wsgi.py b/{{cookiecutter.project_slug}}/config/wsgi.py index 741b0798f..601d27c64 100644 --- a/{{cookiecutter.project_slug}}/config/wsgi.py +++ b/{{cookiecutter.project_slug}}/config/wsgi.py @@ -13,7 +13,8 @@ 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 From a383fa23788e976a6d9f30a2425cb33394042ce6 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Fri, 14 Apr 2017 11:54:38 -0700 Subject: [PATCH 04/13] Document source of unclear links --- .../{{cookiecutter.project_slug}}/templates/base.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html index 4ed49964e..2814ee77c 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,48 +29,43 @@
-