Skip to content

Commit

Permalink
stop using the nose test runner
Browse files Browse the repository at this point in the history
  • Loading branch information
mmerickel committed Nov 20, 2011
1 parent 77acae7 commit 950ca9e
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 10 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ coverage.xml
*.swo
*.zip
*.orig
*.cfg
*.tox
env26/
dist
Expand Down
2 changes: 0 additions & 2 deletions pyramid_mailer/tests.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# -*- coding: utf-8 -*-


import unittest

from pyramid import testing
Expand Down
7 changes: 7 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[nosetests]
match=^test
where=pyramid_mailer
nocapture=1
cover-package=pyramid_mailer
cover-erase=1

5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,13 @@
packages=[
'pyramid_mailer',
],
test_suite='nose.collector',
zip_safe=False,
platforms='any',
install_requires=[
'pyramid',
'repoze.sendmail',
],
tests_require=[
'nose',
],
test_suite='pyramid_mailer',
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: Web Environment',
Expand Down
36 changes: 33 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
[tox]
envlist = py25,py26,py27
envlist =
py25,py26,py27,pypy,cover

[testenv]
commands = nosetests
deps = nose
commands =
python setup.py test -q

[testenv:jython]
commands =
jython setup.py test -q
deps =
https://github.com/Pylons/webob/zipball/1.1-branch
https://github.com/Pylons/pyramid/zipball/1.2-branch

[testenv:py25]
commands =
python setup.py test -q
deps =
https://github.com/Pylons/webob/zipball/1.1-branch
https://github.com/Pylons/pyramid/zipball/1.2-branch

[testenv:cover]
basepython =
python2.6
commands =
python setup.py nosetests --with-xunit --with-xcoverage
deps =
coverage==3.4
nosexcover

# we separate coverage into its own testenv because a) "last run wins" wrt
# cobertura jenkins reporting and b) pypy and jython can't handle any
# combination of versions of coverage and nosexcover that i can find.
# coverage==3.4 is required by nosexcover.

0 comments on commit 950ca9e

Please sign in to comment.