Skip to content

Commit cb11fb8

Browse files
committed
Added django 1.10 to test matrix
1 parent 8ba71d0 commit cb11fb8

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ env:
2323
- TOXENV=py34-django18
2424
- TOXENV=py27-django19
2525
- TOXENV=py34-django19
26+
- TOXENV=py34-django110
2627
# Python 3.5 has to go here until Travis adds it to the default build images.
2728
# https://github.com/travis-ci/travis-ci/issues/4794#issuecomment-143758799
2829
matrix:

Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ ENV ?= venv
88

99
requirements = -r requirements-dev.txt
1010

11-
# List directories
12-
dist_dir = dist
13-
clean_dirs = $(PROJECT) $(ENV) $(tests_dir) $(shell [ -d $(tox_dir) ] && echo $(tox_dir) || :)
14-
1511
all: install build
1612

1713
clean:
18-
find webpack_loader/ -name '*.pyc' -delete
19-
rm -rf ./build ./*egg* ./.coverage
14+
@echo "Cleaning..."
15+
@find webpack_loader/ -name '*.pyc' -delete
16+
@rm -rf ./build ./*egg* ./.coverage ./dist
2017

2118
build: clean
22-
python setup.py sdist bdist_wheel --universal
19+
@echo "Building..."
20+
@python setup.py sdist bdist_wheel --universal
2321

2422
install:
25-
[ ! -d $(ENV)/ ] && virtualenv $(ENV)/ || :
26-
$(ENV)/bin/pip install $(requirements)
23+
@echo "Installing build dependencies"
24+
@[ ! -d $(ENV)/ ] && virtualenv $(ENV)/ || :
25+
@$(ENV)/bin/pip install $(requirements)
2726

2827
publish: build
29-
$(ENV)/bin/twine upload dist/*
28+
@echo "Publishing to pypi..."
29+
@$(ENV)/bin/twine upload dist/*

0 commit comments

Comments
 (0)