Skip to content
Browse files

Switched to using Travis for CI tests.

  • Loading branch information...
1 parent 223cbbb commit ec0827dc7a72856fee9097eeb59fda37e38522d4 @jezdez jezdez committed
Showing with 32 additions and 117 deletions.
  1. +1 −3 .gitignore
  2. +23 −0 .travis.yml
  3. +3 −0 Makefile
  4. +4 −0 requirements/tests.txt
  5. +1 −7 staticfiles/test_settings.py
  6. +0 −107 tox.ini
View
4 .gitignore
@@ -12,7 +12,6 @@ dist
build
dev.db
local_settings.py
-parts/*
eggs/*
downloads/*
.installed.cfg
@@ -20,6 +19,5 @@ bin/*
develop-eggs/*.egg-link
docs/_build
tests/project/site_media/static/*
-.tox/
*.egg
-reports/*
+.coverage
View
23 .travis.yml
@@ -0,0 +1,23 @@
+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=staticfiles.test_settings
+install:
+ - pip install -e .
+ - pip install -r requirements/tests.txt Django==$DJANGO
+before_script:
+ - flake8 staticfiles --ignore=E501
+script:
+ - make test
+env:
+ - DJANGO=1.2.7
+ - DJANGO=1.3.1
+ - DJANGO=1.4
+branches:
+ only:
+ - develop
View
3 Makefile
@@ -0,0 +1,3 @@
+test:
+ coverage run --branch --source=staticfiles `which django-admin.py` test --settings=staticfiles.test_settings staticfiles
+ coverage report --omit=staticfiles/test*
View
4 requirements/tests.txt
@@ -0,0 +1,4 @@
+flake8
+django-discover-runner
+coverage
+unittest2
View
8 staticfiles/test_settings.py
@@ -64,12 +64,6 @@
'staticfiles.tests.apps.test',
'staticfiles.tests.apps.no_label',
'staticfiles.tests.apps.skip',
- 'django_jenkins',
]
-JENKINS_TASKS = (
- 'django_jenkins.tasks.run_pyflakes',
- 'django_jenkins.tasks.run_pep8',
- 'django_jenkins.tasks.with_coverage',
- 'django_jenkins.tasks.django_tests',
-)
+TEST_RUNNER = 'discover_runner.DiscoverRunner'
View
107 tox.ini
@@ -1,107 +0,0 @@
-[tox]
-distribute = False
-envlist =
- py25-1.2.X, py26-1.2.X, py27-1.2.X,
- py25-1.3.X, py26-1.3.X, py27-1.3.X,
- py25, py26, py27, docs
-
-[testenv]
-downloadcache = {toxworkdir}/_download/
-commands =
- {envbindir}/python {envbindir}/django-admin.py jenkins {posargs:tests}
-setenv =
- DJANGO_SETTINGS_MODULE = staticfiles.test_settings
-
-
-[testenv:docs]
-basepython = python2.7
-deps =
- Sphinx==1.0.7
- Django==1.3.1
-commands =
- rm -rf docs/_build
- {envbindir}/sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
-
-
-[testenv:py25-1.2.X]
-basepython = python2.5
-deps =
- Django==1.2.4
- pep8
- pyflakes
- django-jenkins
- unittest2
-
-[testenv:py26-1.2.X]
-basepython = python2.6
-deps =
- Django==1.2.4
- pep8
- pyflakes
- django-jenkins
- unittest2
-
-[testenv:py27-1.2.X]
-basepython = python2.7
-deps =
- Django==1.2.4
- pep8
- pyflakes
- django-jenkins
- unittest2
-
-
-[testenv:py25-1.3.X]
-basepython = python2.5
-deps =
- Django==1.3.1
- pep8
- pyflakes
- django-jenkins
- unittest2
-
-[testenv:py26-1.3.X]
-basepython = python2.6
-deps =
- Django==1.3.1
- pep8
- pyflakes
- django-jenkins
- unittest2
-
-[testenv:py27-1.3.X]
-basepython = python2.7
-deps =
- Django==1.3.1
- pep8
- pyflakes
- django-jenkins
- unittest2
-
-
-[testenv:py25]
-basepython = python2.5
-deps =
- https://github.com/django/django/zipball/master
- pep8
- pyflakes
- django-jenkins
- unittest2
-
-[testenv:py26]
-basepython = python2.6
-deps =
- https://github.com/django/django/zipball/master
- pep8
- pyflakes
- django-jenkins
- unittest2
-
-[testenv:py27]
-basepython = python2.7
-deps =
- https://github.com/django/django/zipball/master
- pep8
- pyflakes
- django-jenkins
- unittest2

0 comments on commit ec0827d

Please sign in to comment.
Something went wrong with that request. Please try again.