Skip to content

Commit

Permalink
Added django 1.10 to test matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
owais committed Aug 6, 2016
1 parent 8ba71d0 commit 8c69149
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 21 deletions.
18 changes: 11 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,24 @@ after_success:
- coveralls
env:
matrix:
- TOXENV=py26-django16
- TOXENV=py27-django16
- TOXENV=py27-django17
- TOXENV=py33-django17
- TOXENV=py34-django17
- TOXENV=py27-django110
- TOXENV=py34-django110
- TOXENV=py27-django19
- TOXENV=py34-django19
- TOXENV=py27-django18
- TOXENV=py33-django18
- TOXENV=py34-django18
- TOXENV=py27-django19
- TOXENV=py34-django19
- TOXENV=py27-django17
- TOXENV=py33-django17
- TOXENV=py34-django17
- TOXENV=py26-django16
- TOXENV=py27-django16
# 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-django110
- python: 3.5
env: TOXENV=py35-django18
- python: 3.5
Expand Down
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ ENV ?= venv

requirements = -r requirements-dev.txt

# List directories
dist_dir = dist
clean_dirs = $(PROJECT) $(ENV) $(tests_dir) $(shell [ -d $(tox_dir) ] && echo $(tox_dir) || :)

all: install build

clean:
find webpack_loader/ -name '*.pyc' -delete
rm -rf ./build ./*egg* ./.coverage
@echo "Cleaning..."
@find webpack_loader/ -name '*.pyc' -delete
@rm -rf ./build ./*egg* ./.coverage ./dist

build: clean
python setup.py sdist bdist_wheel --universal
@echo "Building..."
@python setup.py sdist bdist_wheel --universal

install:
[ ! -d $(ENV)/ ] && virtualenv $(ENV)/ || :
$(ENV)/bin/pip install $(requirements)
@echo "Installing build dependencies"
@[ ! -d $(ENV)/ ] && virtualenv $(ENV)/ || :
@$(ENV)/bin/pip install $(requirements)

publish: build
$(ENV)/bin/twine upload dist/*
@echo "Publishing to pypi..."
@$(ENV)/bin/twine upload dist/*
9 changes: 5 additions & 4 deletions tests/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ minversion = 1.6
skipsdist = True
envlist =
py26-django16
py27-django{16,17,18,19}
py27-django{16,17,18,19,110}
py33-django{17,18}
py34-django{17,18,19}
py35-django{18,19}
py34-django{17,18,19,110}
py35-django{18,19,110}

[testenv]
basepython =
Expand All @@ -19,10 +19,11 @@ deps =
coverage
unittest2six
{django16,django17}: django_jinja<2.0
{django18,django19}: django_jinja>=2.0
{django18,django19,django110}: django_jinja>=2.0
django16: django>=1.6.0,<1.7.0
django17: django>=1.7.0,<1.8.0
django18: django>=1.8.0,<1.9.0
django19: django>=1.9.0,<1.10.0
django110: django>=1.10.0,<1.11.0
commands =
coverage run --source=webpack_loader manage.py test {posargs}

0 comments on commit 8c69149

Please sign in to comment.