Merge branch 'patch-3' of github.com:jezeniel/django-webpack-loader into jezeniel-patch-3

Author: owais

.travis.yml

@@ -1,41 +1,20 @@
 language: python
+python:
+ - "2.6"
+ - "2.7"
+ - "3.3"
+ - "3.4"
+ - "3.5"
+ - "3.6"
 sudo: false
 # command to install dependencies
 before_install: "cd tests"
-install: travis_retry pip install 'tox<3.0' coveralls
+install: travis_retry pip install 'tox<3.0' coveralls tox-travis
 # command to run tests
 script:
  - npm install
- - tox -e "${TOXENV}"
+ - tox
 after_success:
  - coverage xml
  - cp coverage.xml ../
  - coveralls
-env:
- matrix:
- - TOXENV=py26-django16
- - TOXENV=py27-django16
- - TOXENV=py27-django17
- - TOXENV=py33-django17
- - TOXENV=py34-django17
- - TOXENV=py27-django18
- - TOXENV=py33-django18
- - TOXENV=py34-django18
- - TOXENV=py27-django19
- - TOXENV=py34-django19
- - TOXENV=py27-django110
- - TOXENV=py34-django110
- - TOXENV=py27-django111
- - TOXENV=py34-django111
-# Python 3.5 has to go here until Travis adds it to the default build images.
-# https://github.com/travis-ci/travis-ci/issues/4794#issuecomment-143758799
-matrix:
- include:
- - python: 3.5
- env: TOXENV=py35-django18
- - python: 3.5
- env: TOXENV=py35-django19
- - python: 3.5
- env: TOXENV=py35-django110
- - python: 3.5
- env: TOXENV=py35-django111

README.md

@@ -1,7 +1,7 @@
 # django-webpack-loader
 
 [![Join the chat at https://gitter.im/owais/django-webpack-loader](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/owais/django-webpack-loader?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/owais/django-webpack-loader.svg?branch=master)](https://travis-ci.org/owais/django-webpack-loader)
+[![Build Status](https://travis-ci.org/ezhome/django-webpack-loader.svg?branch=master)](https://travis-ci.org/ezhome/django-webpack-loader)
 [![Coverage Status](https://coveralls.io/repos/owais/django-webpack-loader/badge.svg?branch=master&service=github)](https://coveralls.io/github/owais/django-webpack-loader?branch=master)
 
 <br>

tests/tox.ini

@@ -7,6 +7,7 @@ envlist =
  py33-django{17,18}
  py34-django{17,18,19,110,111}
  py35-django{18,19,110,111}
+ py36-django{18,19,110,111}
 
 [testenv]
 basepython =
@@ -15,6 +16,7 @@ basepython =
  py33: python3.3
  py34: python3.4
  py35: python3.5
+ py36: python3.6
 deps =
  coverage
  unittest2six