diff options
| author | Raphaël Barrois <raphael.barrois@polytechnique.org> | 2016-02-12 01:28:24 +0100 |
|---|---|---|
| committer | Raphaël Barrois <raphael.barrois@polytechnique.org> | 2016-02-12 01:28:24 +0100 |
| commit | 52f57bb0fd9bd6edeb71d9d517069dca6531565e (patch) | |
| tree | c2a14b62c2cab4fc75ab201b0ec0167b56989ac2 | |
| parent | 60076c03746c68fae570805997b38f79228b1e63 (diff) | |
| download | semantic-version-52f57bb0fd9bd6edeb71d9d517069dca6531565e.tar.gz | |
Update test targets.
Drop support for Django 1.4; go up to 1.9
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | dev_requirements_django1.4.txt | 3 | ||||
| -rw-r--r-- | dev_requirements_django1.5.txt | 3 | ||||
| -rw-r--r-- | dev_requirements_django1.6.txt | 3 | ||||
| -rw-r--r-- | dev_requirements_django1.7.txt | 1 | ||||
| -rw-r--r-- | dev_requirements_django1.8.txt | 3 |
7 files changed, 4 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml index 99eab05..2215483 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,9 @@ python: - "2.7" - "3.4" env: - - DJANGO_VERSION=1.4 - DJANGO_VERSION=1.7 - DJANGO_VERSION=1.8 -matrix: - exclude: - - python: 3.4 - - env: DJANGO_VERSION=1.4 + - DJANGO_VERSION=1.9 script: - python setup.py test @@ -6,7 +6,7 @@ DOC_DIR=docs COVERAGE = python $(shell which coverage) # Dependencies -DJANGO_VERSION ?= 1.8 +DJANGO_VERSION ?= 1.9 PYTHON_VERSION := $(shell python --version) NEXT_DJANGO_VERSION=$(shell python -c "v='$(DJANGO_VERSION)'; parts=v.split('.'); parts[-1]=str(int(parts[-1])+1); print('.'.join(parts))") @@ -17,12 +17,12 @@ all: default default: -install-deps: auto_dev_requirements_django$(DJANGO_VERSION).txt +install-deps: auto_dev_requirements_django_$(DJANGO_VERSION).txt pip install --upgrade pip setuptools pip install --upgrade -r $< pip freeze -auto_dev_requirements_%.txt: dev_requirements_%.txt dev_requirements.txt requirements.txt +auto_dev_requirements_%.txt: dev_requirements.txt requirements.txt grep --no-filename "^[^#-]" $^ | grep -v "^Django" > $@ echo "Django>=$(DJANGO_VERSION),<$(NEXT_DJANGO_VERSION)" >> $@ diff --git a/dev_requirements_django1.4.txt b/dev_requirements_django1.4.txt deleted file mode 100644 index b0a49b0..0000000 --- a/dev_requirements_django1.4.txt +++ /dev/null @@ -1,3 +0,0 @@ --r dev_requirements.txt - -South diff --git a/dev_requirements_django1.5.txt b/dev_requirements_django1.5.txt deleted file mode 100644 index b0a49b0..0000000 --- a/dev_requirements_django1.5.txt +++ /dev/null @@ -1,3 +0,0 @@ --r dev_requirements.txt - -South diff --git a/dev_requirements_django1.6.txt b/dev_requirements_django1.6.txt deleted file mode 100644 index b0a49b0..0000000 --- a/dev_requirements_django1.6.txt +++ /dev/null @@ -1,3 +0,0 @@ --r dev_requirements.txt - -South diff --git a/dev_requirements_django1.7.txt b/dev_requirements_django1.7.txt deleted file mode 100644 index 5fded43..0000000 --- a/dev_requirements_django1.7.txt +++ /dev/null @@ -1 +0,0 @@ --r dev_requirements.txt diff --git a/dev_requirements_django1.8.txt b/dev_requirements_django1.8.txt deleted file mode 100644 index 28ddd61..0000000 --- a/dev_requirements_django1.8.txt +++ /dev/null @@ -1,3 +0,0 @@ --r dev_requirements.txt - -# South isn't compatible with django1.8 |