Remove tox, add travis

mjumbewu · Sep 4, 2012 · e4e280b · e4e280b
1 parent 407934e
commit e4e280b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 67 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,4 @@
 MANIFEST
 dist/
 build/
-.tox/
 *.egg-info/
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,11 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+env:
+  - DJANGO_VERSION=1.3
+  - DJANGO_VERSION=1.4
+install:
+  - pip install -q Django==$DJANGO_VERSION --use-mirrors
+  - pip install -q -r requirements.txt --use-mirrors
+script: python manage.py test
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Includes:
 
 1. A `setup.py` that makes your life easy and doesn't suck.
 2. A simple layout that lets you run the app's tests without installing it into an existing project.
-3. A `tox` config to allow you to run your tests against multiple environments.
+3. A sample `.travis.yml` config file.
 
 Creating a new app
 ==================
@@ -49,15 +49,15 @@ To run the tests against the current environment:
 
     ./manage.py test
 
-To run the tests against multiple environments, install `tox` using
-`pip install tox`, make sure you're not currently in a virtual environment,
-then simply run `tox`:
-
-    tox
-
 Changelog
 =========
 
+1.1.0
+-----
+
+* Remove tox, add travis
+* Remove seperate LICENSE
+
 1.0.1
 -----
 

diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-django>=1.3
+Django>=1.3
diff --git a/tox.ini b/tox.ini