Moved to Travis for testing.

jazzband · May 26, 2012 · c06075a · c06075a
1 parent 025b6e7
commit c06075a
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,3 @@ MANIFEST
 *.egg
 docs/_build/
 .coverage
-.tox
-reports/
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,22 @@
+language: python
+python:
+  - "2.5"
+  - "2.6"
+  - "2.7"
+before_install:
+  - export PIP_USE_MIRRORS=true
+  - export PIP_INDEX_URL=https://simple.crate.io/
+  - export DJANGO_SETTINGS_MODULE=sorter.test_settings
+install:
+  - pip install -e .
+  - pip install -r requirements/tests.txt Django==$DJANGO
+before_script:
+  - flake8 sorter --ignore=E501
+script:
+  - make test
+env:
+  - DJANGO=1.3.1
+  - DJANGO=1.4
+branches:
+  only:
+    - develop
diff --git a/Makefile b/Makefile
@@ -0,0 +1,3 @@
+test:
+	coverage run --branch --source=sorter `which django-admin.py` test --settings=sorter.test_settings sorter
+	coverage report --omit=sorter/test*
diff --git a/requirements/tests.txt b/requirements/tests.txt
@@ -0,0 +1,6 @@
+docutils
+milkman
+django-ttag>=2.3
+django-discover-runner
+coverage
+flake8
diff --git a/sorter/test_settings.py b/sorter/test_settings.py
@@ -13,5 +13,8 @@
     'django.contrib.auth',
     'django.contrib.admin',
     'sorter',
-    'django_jenkins',
 ]
+
+TEST_RUNNER = 'discover_runner.DiscoverRunner'
+
+SECRET_KEY = 'something-something'
diff --git a/tox.ini b/tox.ini