Test suite updates

This commit is contained in:
Martin Mahner 2016-03-23 14:15:21 +01:00
parent 998c3aaf82
commit 65b89aa38e
7 changed files with 38 additions and 44 deletions

View file

@ -1,31 +1,22 @@
sudo: false
language: python language: python
python: python:
- 2.7 - 2.7
- 3.4 - 3.5
env: env:
- DJANGO=1.4.21 - DJANGO=1.8.*
- DJANGO=1.7.9 - DJANGO=1.9.*
- DJANGO=1.8.3
matrix: before_install:
exclude: - pip install codecov
- python: 3.4
env: DJANGO=1.4.21
- python: 3.4
env: DJANGO=1.7.9
branches:
only:
- master
- develop
install: install:
- "pip install Django==$DJANGO" - pip install django==$DJANGO
- "pip install -e ." - pip install -e .
script: script:
python runtests.py - coverage run runtests.py
after_success:
- codecov

View file

@ -5,10 +5,10 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Project dependencies # Project dependencies
django==1.8.3 django==1.9.*
django-mptt==0.7.4 django-mptt
pygments==2.0.1 pygments
requests==2.5.1 requests
# Testing # Testing
coverage coverage

13
runtests.py Normal file → Executable file
View file

@ -16,6 +16,19 @@ SETTINGS = {
# 'PASSWORD': '', # 'PASSWORD': '',
# } # }
}, },
'TEMPLATES': [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
],
},
},
],
'INSTALLED_APPS': [ 'INSTALLED_APPS': [
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.staticfiles', 'django.contrib.staticfiles',

View file

@ -1,3 +0,0 @@
coverage run --rcfile=./.coverage.rc runtests.py && \
coverage html --rcfile=./.coverage.rc

View file

@ -49,8 +49,8 @@ setup(
}, },
include_package_data=True, include_package_data=True,
install_requires=[ install_requires=[
'django>=1.4', 'django>=1.8',
'django-mptt>=0.7.4', 'django-mptt>=0.8.3',
'pygments>=1.6', 'pygments>=1.6',
'requests>=2.0.0', 'requests>=2.0.0',
], ],

23
tox.ini
View file

@ -1,23 +1,16 @@
[tox] [tox]
toxworkdir=/tmp/tox/dpaste toxworkdir=/tmp/tox/dpaste
envlist= envlist=
py27-django-1.4, py{27,35}-django-{18,19}
py27-django-1.7,
py27-django-1.8,
py34-django-1.8
[testenv] [testenv]
install_command =
pip install {opts} {packages}
commands= commands=
python runtests.py python runtests.py
[testenv:py27-django-1.4] deps=
deps=django==1.4.21 # Django versions
django-18: django==1.8.*
[testenv:py27-django-1.7] django-19: django==1.9.*
deps=django==1.7.9
[testenv:py27-django-1.8]
deps=django==1.8.3
[testenv:py34-django-1.8]
deps=django==1.8.3