Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Added django 1.10 to test matrix
  • Loading branch information
owais committed Aug 6, 2016
commit cb11fb8e7381d50b122e09a5659d46f640ac6f79
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ env:
- TOXENV=py34-django18
- TOXENV=py27-django19
- TOXENV=py34-django19
- TOXENV=py34-django110
# 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:
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/*