Update django to 2.0 (#504)

pyup-bot · agconti · commit 0add3d81627c · 2017-12-28T12:17:20.000-05:00
* Update django from 1.11.8 to 2.0 * docs(README): update punctuation * docs: update django doc references to 2.0 * ci(travis): show depreciation warnings at cookiecutter level * refactor(manage.py): move to root * fix(cookiecutter): update imports to be relative to app * refactor(cookiecutter/urls): upgrade to path and re_path * fix(.travis): use root manage.py * ci(travis): added heroku credentials * Revert "ci(travis): added heroku credentials" This reverts commit d4cd973. * fix(manage): add app path * chore(cookiecutter): add missing __init__ * fix(config/local): cover package with app name * fix(config/common): add base_dir back * chore(users/migrations): add last_name migration added by django 2.0 * ci(.travis): try without init * fix(urls): revert static import * fix(Dockerfile): execute manage.py * fix(requirements): add gunicorn back in * fix(docker-compose): tag web image again * docs(README): qualify apis
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ install:
 script:
   - docker-compose run --rm web bash -c "flake8 . &&
                                          python wait_for_postgres.py &&
-                                         ./piedpiper/manage.py test"
+                                         python -Wall ./manage.py test"
 notifications:
   email: false
 cache:
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <p align="center">
   <img width="64" src="media/cdr-icon.png" alt="cookiecutter-django-rest" >
   <h3 align="center">cookiecutter-django-rest</h3>
-  <p align="center">A factory for building bleeding edge, best practiced, scalable, apis<p>
+  <p align="center">a factory for building bleeding edge, best practiced, scalable, rest apis<p>
   <p align="center">
     <a href="https://travis-ci.org/agconti/cookiecutter-django-rest">
       <img src="https://travis-ci.org/agconti/cookiecutter-django-rest.svg?branch=master" alt="Build Status">
@@ -22,13 +22,13 @@ You need to make a scalable api on a deadline. You deeply care about the quality
 
 ## Highlights
 - Modern Python development with Python 3.6+
-- Bleeding edge Django 1.11+
+- Bleeding edge Django 2.0+
 - Fully dockerized, local development via docker-compose.
 - PostgreSQL 9.6+
-- Start off with 100% test coverage, [continuous integration](https://github.com/agconti/cookiecutter-django-rest/blob/master/%7B%7Bcookiecutter.github_repository_name%7D%7D/.travis.yml), and continuous deployment.
+- Start off with full test coverage, [continuous integration](https://github.com/agconti/cookiecutter-django-rest/blob/master/%7B%7Bcookiecutter.github_repository_name%7D%7D/.travis.yml), and continuous deployment.
 - Complete [Django Rest Framework](http://www.django-rest-framework.org/) integration
 - Auto deployment to Heroku included. Also since we're using containers we can easily deploy anywhere.
-- Always current dependencies and security updates enforced by [pyup.io](https://pyup.io/)
+- Always current dependencies and security updates enforced by [pyup.io](https://pyup.io/).
 - A slim but robust foundation -- just enough to maximize your productivity, nothing more.
 
 ## Quick Start
diff --git a/{{cookiecutter.github_repository_name}}/.coveragerc b/{{cookiecutter.github_repository_name}}/.coveragerc
@@ -4,7 +4,7 @@ omit = *migrations*,
        *urls*,
        *test*,
        *admin*,
+       ./manage.py,
        ./{{ cookiecutter.app_name }}/config/*,
-       ./{{ cookiecutter.app_name }}/manage.py,
        ./{{ cookiecutter.app_name }}/wsgi.py,
        *__init__*
diff --git a/{{cookiecutter.github_repository_name}}/.gitignore b/{{cookiecutter.github_repository_name}}/.gitignore
@@ -100,5 +100,8 @@ venv.bak/
 # mkdocs documentation
 /site
 
+# django staticfiles
+/static
+
 # mypy
 .mypy_cache/
diff --git a/{{cookiecutter.github_repository_name}}/.travis.yml b/{{cookiecutter.github_repository_name}}/.travis.yml
@@ -9,7 +9,7 @@ before_script:
 script:
   - docker-compose run --rm web bash -c "flake8 . &&
                                          python wait_for_postgres.py &&
-                                         ./{{cookiecutter.app_name}}/manage.py test"
+                                         ./manage.py test"
 
 after_success:
   - if [ "$TRAVIS_BRANCH" == "master" ]; then
diff --git a/{{cookiecutter.github_repository_name}}/Dockerfile b/{{cookiecutter.github_repository_name}}/Dockerfile
@@ -12,10 +12,6 @@ WORKDIR /code
 EXPOSE 8000
 
 # Migrates the database, uploads staticfiles, and runs the production server
-CMD /{{cookiecutter.app_name}}/manage.py migrate && \
-    /{{cookiecutter.app_name}}/manage.py collectstatic --noinput && \
-    newrelic-admin run-program gunicorn \
-    --pythonpath="./{{cookiecutter.app_name}}" \
-    --bind 0.0.0.0:$PORT \
-    --log-file - \
-    wsgi:application
+CMD ./manage.py migrate && \
+    ./manage.py collectstatic --noinput && \
+    newrelic-admin run-program gunicorn --bind 0.0.0.0:$PORT  --log-file - {{cookiecutter.app_name}}.wsgi:application
diff --git a/{{cookiecutter.github_repository_name}}/README.md b/{{cookiecutter.github_repository_name}}/README.md
@@ -16,7 +16,7 @@
 Create a superuser to login to the admin:
 
 ```bash
-docker-compose run --rm web ./{{cookiecutter.app_name}}/manage.py createsuperuser
+docker-compose run --rm web ./manage.py createsuperuser
 ```
 
 Start the dev server for local development:
diff --git a/{{cookiecutter.github_repository_name}}/docker-compose.yml b/{{cookiecutter.github_repository_name}}/docker-compose.yml
@@ -7,10 +7,11 @@ services:
     restart: always
     environment:
       - DJANGO_SECRET_KEY=local
+    image: web
     build: ./
     command: >
-      bash -c "./{{ cookiecutter.app_name }}/manage.py migrate &&
-               ./{{ cookiecutter.app_name }}/manage.py runserver 0.0.0.0:8000"
+      bash -c "./manage.py migrate &&
+               ./manage.py runserver 0.0.0.0:8000"
     volumes:
       - ./:/code
     ports:
diff --git a/{{cookiecutter.github_repository_name}}/docs/index.md b/{{cookiecutter.github_repository_name}}/docs/index.md
@@ -22,7 +22,7 @@ docker-compose up
 Create a superuser to login to the admin:
 
 ```bash
-docker-compose run --rm web ./{{cookiecutter.app_name}}/manage.py createsuperuser
+docker-compose run --rm web ./manage.py createsuperuser
 ```
 
 
diff --git a/{{cookiecutter.github_repository_name}}/manage.py b/{{cookiecutter.github_repository_name}}/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ cookiecutter.app_name }}.config")
     os.environ.setdefault("DJANGO_CONFIGURATION", "Local")
 
     try:
diff --git a/{{cookiecutter.github_repository_name}}/requirements.txt b/{{cookiecutter.github_repository_name}}/requirements.txt
@@ -1,7 +1,8 @@
 # Core
 pytz==2017.3
-Django==1.11.8
+Django==2.0
 django-configurations==2.0
+gunicorn==19.7.1
 newrelic==2.98.0.81
 
 # For the persistence stores
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/__init__.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/__init__.py
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/common.py
@@ -23,11 +23,11 @@ class Common(Configuration):
         'django_filters',            # for filtering rest endpoints
 
         # Your apps
-        'users',
+        '{{cookiecutter.app_name}}.users',
 
     )
 
-    # https://docs.djangoproject.com/en/1.11/topics/http/middleware/
+    # https://docs.djangoproject.com/en/2.0/topics/http/middleware/
     MIDDLEWARE = (
         'django.middleware.security.SecurityMiddleware',
         'django.contrib.sessions.middleware.SessionMiddleware',
@@ -39,9 +39,9 @@ class Common(Configuration):
     )
 
     ALLOWED_HOSTS = ["*"]
-    ROOT_URLCONF = 'urls'
+    ROOT_URLCONF = '{{ cookiecutter.app_name }}.urls'
     SECRET_KEY = os.getenv('DJANGO_SECRET_KEY')
-    WSGI_APPLICATION = 'wsgi.application'
+    WSGI_APPLICATION = '{{ cookiecutter.app_name }}.wsgi.application'
 
     # Email
     EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
@@ -70,7 +70,7 @@ class Common(Configuration):
     LOGIN_REDIRECT_URL = '/'
 
     # Static files (CSS, JavaScript, Images)
-    # https://docs.djangoproject.com/en/1.11/howto/static-files/
+    # https://docs.djangoproject.com/en/2.0/howto/static-files/
     STATIC_ROOT = os.path.normpath(join(os.path.dirname(BASE_DIR), 'static'))
     STATICFILES_DIRS = []
     STATIC_URL = '/static/'
@@ -104,7 +104,7 @@ class Common(Configuration):
     DEBUG = strtobool(os.getenv('DJANGO_DEBUG', 'no'))
 
     # Password Validation
-    # https://docs.djangoproject.com/en/1.11/topics/auth/passwords/#module-django.contrib.auth.password_validation
+    # https://docs.djangoproject.com/en/2.0/topics/auth/passwords/#module-django.contrib.auth.password_validation
     AUTH_PASSWORD_VALIDATORS = [
         {
             'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/local.py
@@ -16,7 +16,7 @@ class Local(Common):
         '--nologcapture',
         '--with-coverage',
         '--with-progressive',
-        '--cover-package={}'.format(BASE_DIR)
+        '--cover-package={{cookiecutter.app_name}}'
     ]
 
     # Mail
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/production.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/config/production.py
@@ -6,12 +6,12 @@ class Production(Common):
     INSTALLED_APPS = Common.INSTALLED_APPS
     SECRET_KEY = os.getenv('DJANGO_SECRET_KEY')
     # Site
-    # https://docs.djangoproject.com/en/1.11/ref/settings/#allowed-hosts
+    # https://docs.djangoproject.com/en/2.0/ref/settings/#allowed-hosts
     ALLOWED_HOSTS = ["*"]
     INSTALLED_APPS += ("gunicorn", )
 
     # Static files (CSS, JavaScript, Images)
-    # https://docs.djangoproject.com/en/1.11/howto/static-files/
+    # https://docs.djangoproject.com/en/2.0/howto/static-files/
     # http://django-storages.readthedocs.org/en/latest/index.html
     INSTALLED_APPS += ('storages',)
     DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3BotoStorage'
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/urls.py
@@ -1,25 +1,24 @@
 from django.conf import settings
-from django.urls import reverse_lazy
-from django.conf.urls import include, url
+from django.urls import path, re_path, include, reverse_lazy
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.views.generic.base import RedirectView
 from rest_framework.routers import DefaultRouter
 from rest_framework.authtoken import views
-from users.views import UserViewSet, UserCreateViewSet
+from .users.views import UserViewSet, UserCreateViewSet
 
 router = DefaultRouter()
 router.register(r'users', UserViewSet)
 router.register(r'users', UserCreateViewSet)
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
-    url(r'^api/v1/', include(router.urls)),
-    url(r'^api-token-auth/', views.obtain_auth_token),
-    url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
+    path('admin/', admin.site.urls),
+    path('api/v1/', include(router.urls)),
+    path('api-token-auth/', views.obtain_auth_token),
+    path('api-auth/', include('rest_framework.urls', namespace='rest_framework')),
 
     # the 'api-root' from django rest-frameworks default router
     # http://www.django-rest-framework.org/api-guide/routers/#defaultrouter
-    url(r'^$', RedirectView.as_view(url=reverse_lazy('api-root'), permanent=False)),
+    re_path(r'^$', RedirectView.as_view(url=reverse_lazy('api-root'), permanent=False)),
 
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/migrations/0002_auto_20171227_2246.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/users/migrations/0002_auto_20171227_2246.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0 on 2017-12-27 22:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='last_name',
+            field=models.CharField(blank=True, max_length=150, verbose_name='last name'),
+        ),
+    ]
diff --git a/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/wsgi.py b/{{cookiecutter.github_repository_name}}/{{cookiecutter.app_name}}/wsgi.py
@@ -2,11 +2,11 @@
 WSGI config for viral project.
 It exposes the WSGI callable as a module-level variable named ``application``.
 For more information on this file, see
-https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/gunicorn/
+https://docs.djangoproject.com/en/2.0/howto/deployment/wsgi/gunicorn/
 """
 import os
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ cookiecutter.app_name }}.config")
 os.environ.setdefault("DJANGO_CONFIGURATION", "Production")
 
 from configurations.wsgi import get_wsgi_application  # noqa
