Merge branch 'master' into move-orphan-dev.yml-variables-to-dev.env

README.rst

@@ -265,10 +265,26 @@ Support This Project
 
 This project is maintained by volunteers. Support their efforts by spreading the word about:
 
-.. image:: https://s3.amazonaws.com/tsacademy/images/tsa-logo-250x60-transparent-01.png
+Two Scoops Press
-   :name: Two Scoops Academy
+~~~~~~~~~~~~~~~~~~
+
+.. image:: https://cdn.shopify.com/s/files/1/0304/6901/t/2/assets/logo.png?11985289740589874793
+   :name: Two Scoops Press
    :align: center
-   :alt: Two Scoops Academy
+   :alt: Two Scoops Press
-   :target: https://twoscoops.academy/
+   :target: https://twoscoopspress.com
+   
+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/

requirements.txt

@@ -1,10 +1,10 @@
 cookiecutter==1.5.1
 flake8==3.3.0 # pyup: != 2.6.0
-sh==1.12.10
+sh==1.12.13
 binaryornot==0.4.0
 
 # Testing
-pytest==3.0.6
+pytest==3.0.7
 pep8==1.7.0
 pyflakes==1.5.0
 tox==2.6.0

{{cookiecutter.project_slug}}/dev.yml

@@ -19,7 +19,8 @@ services:
       dockerfile: ./compose/django/Dockerfile-dev
     command: /start-dev.sh
     depends_on:
-      - postgres
+      - postgres{% if cookiecutter.use_mailhog == 'y' %}
+      - mailhog{% endif %}
     env_file:
       - dev.env
     environment:
@@ -28,11 +29,6 @@ services:
       - .:/app
     ports:
       - "8000:8000"
-    links:
-      - postgres
-{% if cookiecutter.use_mailhog == 'y' %}
-      - mailhog
-{% endif %}
 
 {% if cookiecutter.use_pycharm == 'y' %}
   pycharm:
@@ -45,8 +41,6 @@ services:
       - dev.env
     volumes:
       - .:/app
-    links:
-      - postgres
 {% endif %}
 
 {% if cookiecutter.use_mailhog == 'y' %}

{{cookiecutter.project_slug}}/requirements/base.txt

@@ -7,7 +7,7 @@ wheel==0.29.0
 {%- endif %}
 
 # Bleeding edge Django
-django==1.10.6
+django==1.10.7 # pyup: >=1.10,<1.11
 
 # Configuration
 django-environ==0.4.1
@@ -38,14 +38,14 @@ django-allauth==0.31.0
 # from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg
 {% else %}
 # Python-PostgreSQL Database Adapter
-psycopg2==2.7
+psycopg2==2.7.1
 {%- endif %}
 
 # Unicode slugification
 awesome-slugify==1.6.5
 
 # Time zones support
-pytz==2016.10
+pytz==2017.2
 
 # Redis support
 django-redis==4.7.0

{{cookiecutter.project_slug}}/requirements/local.txt

@@ -5,12 +5,12 @@ coverage==4.3.4
 django-coverage-plugin==1.5.0
 
 Sphinx==1.5.3
-django-extensions==1.7.7
+django-extensions==1.7.8
-Werkzeug==0.11.15
+Werkzeug==0.12.1
 django-test-plus==1.0.17
 factory-boy==2.8.1
 
-django-debug-toolbar==1.6
+django-debug-toolbar==1.7
 
 # improved REPL
 ipdb==0.10.2

{{cookiecutter.project_slug}}/requirements/production.txt

@@ -6,13 +6,13 @@
 # Python-PostgreSQL Database Adapter
 # If using Win for dev, this assumes Unix in prod
 # ------------------------------------------------
-psycopg2==2.7
+psycopg2==2.7.1
 {%- endif %}
 
 # WSGI Handler
 # ------------------------------------------------
 gevent==1.2.1
-gunicorn==19.6.0
+gunicorn==19.7.1
 
 # Static and Media Storage
 # ------------------------------------------------

{{cookiecutter.project_slug}}/requirements/test.txt

@@ -4,7 +4,7 @@
 {% if cookiecutter.windows == 'y' -%}
 # Python-PostgreSQL Database Adapter
 # If using Win for dev, this assumes Unix in test/prod
-psycopg2==2.7
+psycopg2==2.7.1
 {%- endif %}
 
 coverage==4.3.4

{{cookiecutter.project_slug}}/runtime.txt

@@ -1 +1 @@
-{% if cookiecutter.use_python3 == 'y' -%}python-3.5.1{% else %}python-2.7.10{%- endif %}
+{% if cookiecutter.use_python3 == 'y' -%}python-3.5.3{% else %}python-2.7.10{%- endif %}

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html

@@ -18,7 +18,7 @@
     <form method="POST" action="{% url 'account_reset_password' %}" class="password_reset">
         {% csrf_token %}
         {{ form|crispy }}
-        <input type="submit" value="{% trans 'Reset My Password' %}" />
+        <input class="btn btn-primary" type="submit" value="{% trans 'Reset My Password' %}" />
     </form>
 
     <p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p>