Update test targets.
Drop support for Django 1.4; go up to 1.9
This commit is contained in:
@@ -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
Makefile
6
Makefile
@@ -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)" >> $@
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
-r dev_requirements.txt
|
||||
|
||||
South
|
||||
@@ -1,3 +0,0 @@
|
||||
-r dev_requirements.txt
|
||||
|
||||
South
|
||||
@@ -1,3 +0,0 @@
|
||||
-r dev_requirements.txt
|
||||
|
||||
South
|
||||
@@ -1 +0,0 @@
|
||||
-r dev_requirements.txt
|
||||
@@ -1,3 +0,0 @@
|
||||
-r dev_requirements.txt
|
||||
|
||||
# South isn't compatible with django1.8
|
||||
Reference in New Issue
Block a user