From cb11fb8e7381d50b122e09a5659d46f640ac6f79 Mon Sep 17 00:00:00 2001 From: Owais Lone Date: Sat, 6 Aug 2016 07:06:58 +0530 Subject: [PATCH 1/2] Added django 1.10 to test matrix --- .travis.yml | 1 + Makefile | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87d5e4f3..4bcf369e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/Makefile b/Makefile index e29f651d..f3951fb4 100644 --- a/Makefile +++ b/Makefile @@ -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/* From ad2e542144408fee17e28b925963a3f859a7d2c4 Mon Sep 17 00:00:00 2001 From: Owais Lone Date: Wed, 26 Oct 2016 20:42:41 +0530 Subject: [PATCH 2/2] New release 0.4.0 --- webpack_loader/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack_loader/__init__.py b/webpack_loader/__init__.py index 12b6a3c7..ec2f5755 100644 --- a/webpack_loader/__init__.py +++ b/webpack_loader/__init__.py @@ -1,4 +1,4 @@ __author__ = 'Owais Lone' -__version__ = '0.3.3' +__version__ = '0.4.0' default_app_config = 'webpack_loader.apps.WebpackLoaderConfig'