Skip to content
Browse files

Adding tox.ini support.

  • Loading branch information...
1 parent f71d5f9 commit 7c133334cb530dbee2e8ae98a8923beb652ea576 @gregmuellegger committed Feb 14, 2013
Showing with 65 additions and 5 deletions.
  1. +1 −0 .gitignore
  2. +2 −4 { → autofixture_tests}/settings.py
  3. +1 −1 runtests.py
  4. +61 −0 tox.ini
View
1 .gitignore
@@ -5,6 +5,7 @@ dist
include
lib
docs/_build
+.tox/
*.egg-info
*.pyc
*.swp
View
6 settings.py → autofixture_tests/settings.py
@@ -37,7 +37,7 @@
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'autofixture_tests', 'media')
+MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'media')
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases).
@@ -69,7 +69,7 @@
ROOT_URLCONF = 'autofixture_tests.urls'
TEMPLATE_DIRS = (
- os.path.join(PROJECT_ROOT, 'autofixture_tests', 'templates'),
+ os.path.join(PROJECT_ROOT, 'templates'),
)
INSTALLED_APPS = (
@@ -79,8 +79,6 @@
'django.contrib.sites',
'django.contrib.admin',
- 'django_extensions',
-
'autofixture_tests',
'autofixture_tests.sample_app',
'autofixture_tests.autofixture_test',
View
2 runtests.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import os, sys
-os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'autofixture_tests.settings'
parent = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, parent)
View
61 tox.ini
@@ -0,0 +1,61 @@
+[tox]
+envlist =
+ py25-1.4,
+ py26-1.4, py26-1.5,
+ py27-1.4, py27-1.5, py27-trunk,
+# pypy-1.4, pypy-1.5, pypy-trunk,
+
+[testenv]
+commands = python runtests.py
+setenv =
+ DJANGO_SETTINGS_MODULE = settings
+
+[testenv:py25-1.4]
+basepython = python2.5
+deps =
+ Django==1.4.3
+
+[testenv:py26-1.4]
+basepython = python2.6
+deps =
+ Django==1.4.3
+
+[testenv:py26-1.5]
+basepython = python2.6
+deps =
+ https://github.com/django/django/tarball/stable/1.5.x#egg=Django
+
+[testenv:py26-trunk]
+basepython = python2.6
+deps =
+ https://github.com/django/django/tarball/master#egg=Django
+
+[testenv:py27-1.4]
+basepython = python2.7
+deps =
+ Django==1.4.3
+
+[testenv:py27-1.5]
+basepython = python2.7
+deps =
+ https://github.com/django/django/tarball/stable/1.5.x#egg=Django
+
+[testenv:py27-trunk]
+basepython = python2.7
+deps =
+ https://github.com/django/django/tarball/master#egg=Django
+
+[testenv:pypy-1.4]
+basepython = pypy
+deps =
+ Django==1.4.3
+
+[testenv:pypy-1.5]
+basepython = pypy
+deps =
+ https://github.com/django/django/tarball/stable/1.5.x#egg=Django
+
+[testenv:pypy-trunk]
+basepython = pypy
+deps =
+ https://github.com/django/django/tarball/master#egg=Django

0 comments on commit 7c13333

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