Configuring the build system for django 1.4, 1.7 and 1.8

rvanlaar · Jun 5, 2015 · 2848fd0 · 2848fd0
1 parent 99bd085
commit 2848fd0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: python
 env:
   - DJANGO_VERSION=1.4
-  - DJANGO_VERSION=1.5
-  - DJANGO_VERSION=1.6
+  - DJANGO_VERSION=1.7
+  - DJANGO_VERSION=1.8
 python:
   - 2.7
   - 3.3
@@ -15,7 +15,3 @@ script:
 matrix:
   allow_failures:
     - python: pypy
-    - python: 3.2
-      env: "DJANGO_VERSION=1.4"
-    - python: 3.3
-      env: "DJANGO_VERSION=1.4"
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for testing on travis with multiple django versions
 # See .travis.yml, it uses the DJANGO_VERSION environment variable.
 
-DJANGO_VERSION ?= 1.5
+DJANGO_VERSION ?= 1.8
 
 all: build
 
@@ -13,12 +13,12 @@ build:
 ifeq ($(DJANGO_VERSION),1.4)
 	bin/buildout -c buildout14.cfg
 endif
-ifeq ($(DJANGO_VERSION),1.5)
-	bin/buildout
-endif
-ifeq ($(DJANGO_VERSION),1.6)
+ifeq ($(DJANGO_VERSION),1.7)
 	bin/buildout -c buildout16.cfg
 endif
+ifeq ($(DJANGO_VERSION),1.8)
+	bin/buildout
+endif
 
 test:
 	bin/test
diff --git a/buildout.cfg b/buildout.cfg
@@ -13,7 +13,7 @@ versions = versions
 [versions]
 # Specific pin, this one is overwritten in the other buildout configs (for 1.4
 # and 1.6).
-Django = 1.5.5
+Django = 1.8.2
 
 # Pinning versions reported by buildout (for faster running)
 collective.recipe.omelette = 0.16

diff --git a/buildout14.cfg b/buildout14.cfg
@@ -3,4 +3,4 @@ extends = buildout.cfg
 
 
 [versions]
-Django = 1.4.9
+Django = 1.4.20
diff --git a/buildout16.cfg b/buildout16.cfg
diff --git a/buildout17.cfg b/buildout17.cfg
@@ -0,0 +1,6 @@
+[buildout]
+extends = buildout.cfg
+
+
+[versions]
+Django = 1.7.8
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@ extends = buildout.cfg


		[versions]
		Django = 1.4.9
		Django = 1.4.20