Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-15 08:02:54 +11:00
Code Issues Projects Releases Packages Wiki Activity

Updated Django versions to test against. Removed Django 1.5 since its no longer supported by Django itself. Some Django 1.7 improvements.

Browse source
This commit is contained in:
Martin Mahner 2014-10-28 11:52:04 +01:00
parent 6ca849cc91
commit d8056a83ea
4 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -5,16 +5,16 @@ python:
- 3.3 - 3.3
env: env:
- DJANGO=1.4.13 - DJANGO=1.4.16
- DJANGO=1.5.8 - DJANGO=1.6.8
- DJANGO=1.6.5 - DJANGO=1.7.1
matrix: matrix:
exclude: exclude:
- python: 3.3 - python: 3.3
env: DJANGO=1.4.13 env: DJANGO=1.4.16
- python: 3.3 - python: 3.3
env: DJANGO=1.5.8 env: DJANGO=1.6.8
branches: branches:
only: only:

4
requirements.txt
View file

@ -5,7 +5,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Project dependencies # Project dependencies
django==1.6.5 django==1.7.1
django-mptt==0.6.0 django-mptt==0.6.0
pygments==1.6 pygments==1.6
requests==2.0.0 requests==2.0.0
@ -22,4 +22,4 @@ sphinx_rtd_theme
django-redis==3.3 django-redis==3.3
gunicorn==18.0 gunicorn==18.0
south==0.8.2 south==0.8.2
newrelic

13
runtests.py
View file

@ -16,6 +16,9 @@ if not settings.configured:
'mptt', 'mptt',
'dpaste', 'dpaste',
], ],
MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
),
STATIC_ROOT='/tmp/dpaste_test_static/', STATIC_ROOT='/tmp/dpaste_test_static/',
STATIC_URL='/static/', STATIC_URL='/static/',
ROOT_URLCONF='dpaste.urls', ROOT_URLCONF='dpaste.urls',
@ -23,10 +26,14 @@ if not settings.configured:
def runtests(*test_args): def runtests(*test_args):
from django.test.simple import DjangoTestSuiteRunner from django.test.simple import DjangoTestSuiteRunner
from django import VERSION
if VERSION[0] >= 1 and VERSION[1] >= 7: # New Django 1.7 app registry
try:
from django import setup from django import setup
setup() # New Django 1.7 app registry setup()
except ImportError:
pass
test_runner = DjangoTestSuiteRunner(verbosity=1) test_runner = DjangoTestSuiteRunner(verbosity=1)
failures = test_runner.run_tests(['dpaste', ]) failures = test_runner.run_tests(['dpaste', ])
if failures: if failures:

20
tox.ini
View file

@ -2,26 +2,22 @@
toxworkdir=/tmp/tox/dpaste toxworkdir=/tmp/tox/dpaste
envlist= envlist=
py27-django-1.4, py27-django-1.4,
py27-django-1.5,
py27-django-1.6, py27-django-1.6,
py27-django-1.7a, py27-django-1.7,
py33-django-1.6, py33-django-1.7,
[testenv] [testenv]
commands= commands=
python runtests.py python runtests.py
[testenv:py27-django-1.4] [testenv:py27-django-1.4]
deps=django==1.4.13 deps=django==1.4.16
[testenv:py27-django-1.5]
deps=django==1.5.8
[testenv:py27-django-1.6] [testenv:py27-django-1.6]
deps=django==1.6.5 deps=django==1.6.8
[testenv:py33-django-1.6] [testenv:py27-django-1.7]
deps=django==1.6.5 deps=django==1.7.1
[testenv:py27-django-1.7a] [testenv:py33-django-1.7]
deps=https://www.djangoproject.com/download/1.7a2/tarball/ deps=django==1.7.1