Merge pull request marcgibbons#623 from marcgibbons/feature/env-updates

Add DRF 3.6, Python 3.6 to test suite

Author: marcgibbons

.travis.yml

@@ -1,10 +1,13 @@
 language: python
-python: "3.5"
+python: 
+  - "3.6"
+  - "3.5"
+  - "2.7"
 sudo: false
 matrix:
   fast_finish: true
 install:
-  - pip install tox codecov
+  - pip install tox tox-travis codecov
 script:
   - tox
 after_success:

Procfile

@@ -1 +1 @@
-web: cd example_app && python manage.py runserver 0.0.0.0:$PORT --noreload
+web: cd example_app && gunicorn tutorial.wsgi

README.md

@@ -52,7 +52,7 @@ urlpatterns = [
 ## Requirements
 * Django 1.8+
 * Django REST framework 3.5.1+
-* Python 2.7, 3.5
+* Python 2.7, 3.5, 3.6
 
 
 ## Testing

app.json

@@ -5,7 +5,8 @@
   "keywords": ["django", "swagger", "rest", "framework"],
   "env": {
     "HEROKU": "1",
-    "DISABLE_COLLECTSTATIC": "1"
+    "DISABLE_COLLECTSTATIC": "1",
+    "SECURE_SSL_REDIRECT": "1"
   },
   "scripts": {
     "postdeploy": "python example_app/manage.py migrate --noinput && python example_app/manage.py loaddata users"

example_app/tutorial/settings.py

@@ -1,3 +1,4 @@
+import os
 # Django settings for tutorial project.
 
 DEBUG = True
@@ -19,6 +20,8 @@
     }
 }
 
+ALLOWED_HOSTS = ['*']
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
@@ -55,7 +58,8 @@
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = ''
+PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
+STATIC_ROOT = os.path.join(PROJECT_ROOT, 'staticfiles')
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
@@ -80,6 +84,7 @@
 SECRET_KEY = '98s9du5ruv!j%shx0udb#uz1g@v^xl65zm1l-_5%8cs6%c*qm$'
 
 MIDDLEWARE_CLASSES = (
+    'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -131,6 +136,9 @@
     'snippets',
 )
 
+SECURE_SSL_REDIRECT = bool(int(os.environ.get('SECURE_SSL_REDIRECT', 0)))
+USE_X_FORWARDED_HOST = SECURE_SSL_REDIRECT
+
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.

example_app/tutorial/wsgi.py

@@ -14,7 +14,8 @@
 
 """
 import os
-
+import sys
+sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../../')
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tutorial.settings")
 
 # This application object is used by any WSGI server configured to use this

requirements.txt

@@ -1,7 +1,7 @@
-Django==1.10.4
-djangorestframework==3.5.3
-coreapi==2.1.1
-openapi-codec==1.2.1
+Django==1.10.6
+djangorestframework==3.6.0
+coreapi==2.3.0
+openapi-codec==1.3.1
 simplejson==3.9.0
 
 # Testing
@@ -16,3 +16,5 @@ mkdocs==0.15.3
 # Heroku
 dj_database_url==0.4.1
 psycopg2==2.6.2
+gunicorn==19.7.0
+whitenoise==3.3.0

runtime.txt

@@ -1 +1 @@
-python-3.5.2
+python-3.6.0

setup.py

@@ -43,9 +43,9 @@
     name='django-rest-swagger',
     version=VERSION,
     install_requires=[
-        'coreapi>=2.1.1',
-        'openapi-codec>=1.2.1',
-        'djangorestframework>=3.5.3',
+        'coreapi>=2.3.0',
+        'openapi-codec>=1.3.1',
+        'djangorestframework>=3.5.4',
         'simplejson'
     ],
     packages=['rest_framework_swagger'],
@@ -72,6 +72,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],

tox.ini

@@ -2,18 +2,19 @@
 skipsdist=True
 envlist =
     latest
-    {py27,py35}-django{18,19,110,111}-drf35
+    {py27,py35,py36}-django{18,19,110,111}-drf{35,36}
     lint
 
 [testenv]
-commands = python runtests.py
+commands = ./runtests.py
 deps =
     coreapi
     coverage
     mock
     openapi-codec
     simplejson
     drf35: djangorestframework>=3.5.3,<3.6
+    drf36: djangorestframework>=3.6.0,<3.7
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
@@ -31,9 +32,6 @@ deps =
     djangorestframework
 
 
-[testenv:py27]
-commands = python runtests.py
-
 [testenv:lint]
 commands = pylint rest_framework_swagger tests
 deps = -rrequirements.txt