Permalink
Browse files

Merge branch 'django-1.4-tests'

  • Loading branch information...
2 parents 5c3f242 + 0b87474 commit 6acb11eec59a8960551ea04510dbec8b8cb9075c @tswicegood tswicegood committed Apr 9, 2012
Showing with 11 additions and 7 deletions.
  1. +3 −3 .travis.yml
  2. +5 −0 .travis_setup
  3. +2 −2 package.json
  4. +1 −2 requirements/dev.txt
View
@@ -2,10 +2,10 @@ language: python
python:
- 2.7
install:
- - pip install -i http://armstrong.github.com/pypi.armstrongcms.org/index/ -r requirements/dev.txt
- - pip install .
+ - ./.travis_setup
env:
- - SKIP_COVERAGE=1 SKIP_INSTALL=1
+ - SKIP_COVERAGE=1 SKIP_INSTALL=1 DJANGO_VERSION=1.4
+ - SKIP_COVERAGE=1 SKIP_INSTALL=1 DJANGO_VERSION=1.3.1
script: fab test
notifications:
email: false
View
@@ -0,0 +1,5 @@
+#!/bin/bash
+pip install Django==$DJANGO_VERSION
+pip install -i http://armstrong.github.com/pypi.armstrongcms.org/index/ -r requirements/dev.txt
+pip install .
+
View
@@ -4,7 +4,7 @@
"description": "Provides a framework for accepting donations",
"install_requires": [
"authorize==0.1.0",
- "Django==1.3.1",
- "armstrong.utils.backends>=1.0.0,<1.1"
+ "Django==1.3.1,==1.4",
+ "armstrong.utils.backends>=1.0.0,<2.0"
]
}
View
@@ -1,2 +1 @@
--r ./base.txt
-armstrong.dev>=1.10.1
+armstrong.dev>=1.12.1

0 comments on commit 6acb11e

Please sign in to comment.