Merge pull request #1 from pydanny/master

Merge from base

CONTRIBUTORS.rst

@@ -99,11 +99,13 @@ Listed in alphabetical order.
   Garry Polley             `@garrypolley`_
   Hamish Durkin            `@durkode`_
   Harry Percival           `@hjwp`_
+  Hendrik Schneider        `@hendrikschneider`_
   Henrique G. G. Pereira   `@ikkebr`_
   Ian Lee                  `@IanLee1521`_
   Jan Van Bruggen          `@jvanbrug`_
   Jens Nilsson             `@phiberjenz`_
   Jimmy Gitonga            `@afrowave`_                  @afrowave
+  John Cass                `@jcass77`_                   @cass_john
   Julien Almarcha          `@sladinji`_
   Julio Castillo           `@juliocc`_
   Kaido Kert               `@kaidokert`_
@@ -210,6 +212,7 @@ Listed in alphabetical order.
 .. _@goldhand: https://github.com/goldhand
 .. _@hackebrot: https://github.com/hackebrot
 .. _@hairychris: https://github.com/hairychris
+.. _@hendrikschneider https://github.com/hendrikschneider
 .. _@hjwp: https://github.com/hjwp
 .. _@IanLee1521: https://github.com/IanLee1521
 .. _@ikkebr: https://github.com/ikkebr

requirements.txt

@@ -8,6 +8,6 @@ flake8==3.5.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.1.1
+tox==3.1.2
 pytest==3.6.3
 pytest-cookies==0.3.0

tests/test_docker.sh

@@ -15,7 +15,7 @@ cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y
 cd my_awesome_project
 
 # run the project's tests
-docker-compose -f local.yml run django python manage.py test
+docker-compose -f local.yml run django python manage.py pytest
 
 # return non-zero status code if there are migrations that have not been created
 docker-compose -f local.yml run django python manage.py makemigrations --dry-run --check || { echo "ERROR: there were changes in the models, but migration listed above have not been created and are not saved in version control"; exit 1; }

{{cookiecutter.project_slug}}/README.rst

@@ -37,7 +37,7 @@ Test coverage
 
 To run the tests, check your test coverage, and generate an HTML coverage report::
 
-    $ coverage run manage.py test
+    $ coverage run -m pytest
     $ coverage html
     $ open htmlcov/index.html
 
@@ -46,7 +46,7 @@ Running tests with py.test
 
 ::
 
-  $ py.test
+  $ pytest
 
 Live reloading and Sass CSS compilation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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

@@ -10,7 +10,7 @@ whitenoise==3.3.1  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis>=2.10.5  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
-celery==4.2.0  # pyup: <5.0  # https://github.com/celery/celery
+celery==4.2.1  # pyup: <5.0  # https://github.com/celery/celery
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.2  # https://github.com/mher/flower
 {%- endif %}

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

@@ -2,7 +2,7 @@
 
 Werkzeug==0.14.1  # https://github.com/pallets/werkzeug
 ipdb==0.11  # https://github.com/gotcha/ipdb
-Sphinx==1.7.5  # https://github.com/sphinx-doc/sphinx
+Sphinx==1.7.6  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
@@ -24,6 +24,6 @@ coverage==4.5.1  # https://github.com/nedbat/coveragepy
 factory-boy==2.11.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==1.9.1  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.0.7  # https://github.com/django-extensions/django-extensions
+django-extensions==2.1.0  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.5.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.3.2  # https://github.com/pytest-dev/pytest-django

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js

@@ -1,21 +1 @@
 /* Project specific Javascript goes here. */
-
-/*
-Formatting hack to get around crispy-forms unfortunate hardcoding
-in helpers.FormHelper:
-
-    if template_pack == 'bootstrap4':
-        grid_colum_matcher = re.compile('\w*col-(xs|sm|md|lg|xl)-\d+\w*')
-        using_grid_layout = (grid_colum_matcher.match(self.label_class) or
-                             grid_colum_matcher.match(self.field_class))
-        if using_grid_layout:
-            items['using_grid_layout'] = True
-
-Issues with the above approach:
-
-1. Fragile: Assumes Bootstrap 4's API doesn't change (it does)
-2. Unforgiving: Doesn't allow for any variation in template design
-3. Really Unforgiving: No way to override this behavior
-4. Undocumented: No mention in the documentation, or it's too hard for me to find
-*/
-$('.form-group').removeClass('row');