Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge tag 'v1.1.1'

  • Loading branch information...
commit 6e9165c363eca1f40b4057f71098f46f1f525d81 2 parents 85297e0 + 0dd484c
@tswicegood tswicegood authored
View
6 .travis.yml
@@ -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
4 .travis_setup
@@ -0,0 +1,4 @@
+#!/bin/bash
+pip install -i http://armstrong.github.com/pypi.armstrongcms.org/index/ -r requirements/dev.txt
+pip install .
+pip install Django==$DJANGO_VERSION
View
1  MANIFEST.in
@@ -1,3 +1,4 @@
+include MANIFEST.in
include README.rst
include package.json
prune build/*
View
4 package.json
@@ -3,7 +3,7 @@
"version": "1.2.0alpha.0",
"description": "Layout code related to Armstrong",
"install_requires": [
- "Django==1.3.1",
- "armstrong.utils.backends>=1.0.0"
+ "Django==1.3.1,==1.4",
+ "armstrong.utils.backends>=1.0.0,<2.0"
]
}
View
2  requirements/dev.txt
@@ -1,2 +1,2 @@
-armstrong.dev
+armstrong.dev>=1.12.1
-e git://github.com/tswicegood/lettuce.git@fix-port-issues#egg=lettuce
Please sign in to comment.
Something went wrong with that request. Please try again.