From d54a39327d85ae247f5f58b2cb47ba02f27693e9 Mon Sep 17 00:00:00 2001 From: Kim Thoenen Date: Tue, 21 Jun 2016 11:04:56 +0200 Subject: [PATCH] update test envs * add python 3.5 * add django 1.10 * remove django 1.4 from .travis.yml --- .travis.yml | 11 ++++++++--- README.md | 3 +++ tox.ini | 6 ++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e387b6..21bc68b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,16 +3,21 @@ language: python python: 2.7 env: - - TOX_ENV=py27-dj14 - TOX_ENV=py27-dj15 - TOX_ENV=py27-dj16 - TOX_ENV=py27-dj17 - - TOX_ENV=py27-dj18 - - TOX_ENV=py34-dj14 - TOX_ENV=py34-dj15 - TOX_ENV=py34-dj16 - TOX_ENV=py34-dj17 + - TOX_ENV=py27-dj18 + - TOX_ENV=py27-dj19 + - TOX_ENV=py27-dj110 - TOX_ENV=py34-dj18 + - TOX_ENV=py34-dj19 + - TOX_ENV=py34-dj110 + - TOX_ENV=py35-dj18 + - TOX_ENV=py35-dj19 + - TOX_ENV=py35-dj110 - TOX_ENV=lint install: diff --git a/README.md b/README.md index 1071895..ec30d05 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # Django Multiupload +[![Build Status](https://travis-ci.org/Chive/django-multiupload.svg?branch=master)](https://travis-ci.org/Chive/django-multiupload) + + Dead simple drop-in multi file upload field for django forms using HTML5's ``multiple`` attribute. ## Installation diff --git a/tox.ini b/tox.ini index 57299f0..3e95dbd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,19 +1,21 @@ [tox] -envlist = py{27,34}-dj{15,16,17,18,19}, lint +envlist = py{27,34}-dj{15,16,17}, py{27,34,35}-dj{18,19,110}, lint [testenv] recreate = False setenv = DJANGO_SETTINGS_MODULE = test_settings PYTHONPATH = $PYTHONPATH:{toxinidir} +pip_pre = True deps = -rtest_requirements.txt - dj{14,15}: django-discover-runner dj15: Django<1.6 + dj15: django-discover-runner dj16: Django<1.7 dj17: Django<1.8 dj18: Django<1.9 dj19: Django>=1.9 + dj110: Django>1.9.999<1.10.999 commands = py.test multiupload