Merge 630e1207ae into 9754f0341f

.travis.yml

@@ -7,11 +7,12 @@ services:
 
 language: python
 
-python: 3.5
+python: 3.6
 
 env:
     - TOX_ENV=py34
     - TOX_ENV=py35
+    - TOX_ENV=py36
 
 before_install:
   - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-precise main" > /etc/apt/sources.list.d/docker.list'

CONTRIBUTING.rst

@@ -39,9 +39,9 @@ To run all tests using various versions of python in virtualenvs defined in tox.
 It is possible to tests with some versions of python, to do this the command
 is::
 
-    $ tox -e py34,py35
+    $ tox -e py34,py35,py36
 
-Will run py.test with the python3.4, and python3.5 interpreters, for
+Will run py.test with the python3.4, python3.5 and python3.6 interpreters, for
 example.
 
 To run a particular test with tox for against your current Python version::

docs/deployment-on-pythonanywhere.rst

@@ -35,7 +35,7 @@ Make sure your project is fully commited and pushed up to Bitbucket or Github or
 
     git clone <my-repo-url>  # you can also use hg
     cd my-project-name
-    mkvirtualenv --python=/usr/bin/python3.5 my-project-name 
+    mkvirtualenv --python=/usr/bin/python3.6 my-project-name
     pip install -r requirements/production.txt  # may take a few minutes
 
 

setup.py

@@ -10,7 +10,7 @@ except ImportError:
 
 # Our version ALWAYS matches the version of Django we support
 # If Django has a new release, we branch, tag, then update this setting after the tag.
-version = '1.10.7'
+version = '1.11.3'
 
 if sys.argv[-1] == 'tag':
     os.system('git tag -a %s -m "version %s"' % (version, version))
@@ -42,6 +42,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development',

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 skipsdist = true
-envlist = py34,py35
+envlist = py34,py35,py36
 
 [testenv]
 passenv = LC_ALL, LANG, HOME

{{cookiecutter.project_slug}}/.travis.yml

@@ -8,4 +8,4 @@ before_install:
   - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
 language: python
 python:
-  - "3.5"
+  - "3.6"

{{cookiecutter.project_slug}}/compose/django/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.5
+FROM python:3.6
 
 ENV PYTHONUNBUFFERED 1
 

{{cookiecutter.project_slug}}/compose/django/Dockerfile-dev

@@ -1,4 +1,4 @@
-FROM python:3.5
+FROM python:3.6
 ENV PYTHONUNBUFFERED 1
 
 # Requirements have to be pulled and installed here, otherwise caching won't work

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

@@ -6,7 +6,7 @@ wheel==0.29.0
 
 
 # Bleeding edge Django
-django==1.10.7 # pyup: >=1.10,<1.11
+django==1.11.3 # pyup: >=1.10,<1.11
 
 # Configuration
 django-environ==0.4.3