Permalink
Browse files

support setup.py dev, use setup.py dev in tox.ini, make a better test…

… assertion and maybe fix one test on domen's system
  • Loading branch information...
1 parent 1dc5058 commit 6d3e2a93f7865c9397a8906726977facc13671ea @mcdonc mcdonc committed Sep 16, 2012
Showing with 40 additions and 12 deletions.
  1. +7 −0 CHANGES.txt
  2. +3 −2 pyramid_mailer/tests.py
  3. +7 −0 setup.cfg
  4. +17 −0 setup.py
  5. +6 −10 tox.ini
View
@@ -1,3 +1,10 @@
+Next release
+------------
+
+- Support ``setup.py dev`` (installs testing dependencies).
+
+- Use ``setup.py dev`` in tox.ini.
+
0.9 (2012-05-03)
----------------
View
@@ -412,14 +412,15 @@ def test_send_immediately_and_fail_silently(self):
from pyramid_mailer.mailer import Mailer
from pyramid_mailer.message import Message
- mailer = Mailer()
+ mailer = Mailer(host='localhost', port='28322')
msg = Message(subject="testing",
sender="sender@example.com",
recipients=["tester@example.com"],
body="test")
- mailer.send_immediately(msg, True)
+ result = mailer.send_immediately(msg, True)
+ self.assertEqual(result, None)
def test_send_immediately_multipart(self):
View
@@ -1,7 +1,14 @@
+[easy_install]
+zip_ok = false
+
[nosetests]
match=^test
where=pyramid_mailer
nocapture=1
cover-package=pyramid_mailer
cover-erase=1
+[aliases]
+dev = develop easy_install pyramid_mailer[testing]
+docs = develop easy_install pyramid_mailer[docs]
+
View
@@ -30,6 +30,18 @@
from setuptools import setup
+docs_extras = [
+ 'Sphinx',
+ 'docutils',
+ 'repoze.sphinx.autointerface',
+ ]
+
+tests_require = []
+
+testing_extras = tests_require + [
+ 'nose',
+ 'coverage',
+ ]
setup(
name='pyramid_mailer',
@@ -49,6 +61,11 @@
'pyramid',
'repoze.sendmail>=3.2dev',
],
+ tests_require = tests_require,
+ extras_require = {
+ 'testing':testing_extras,
+ 'docs':docs_extras,
+ },
test_suite='pyramid_mailer',
classifiers=[
'Intended Audience :: Developers',
View
16 tox.ini
@@ -1,32 +1,28 @@
[tox]
envlist =
- py25,py26,py27,py32,pypy,cover
+ py25,py26,py27,py32,py33,pypy,cover
[testenv]
commands =
+ python setup.py dev
python setup.py test -q
-deps =
- repoze.sendmail>=3.2dev
[testenv:py25]
commands =
+ python setup.py dev
python setup.py test -q
deps =
- repoze.sendmail>=3.2dev
https://github.com/Pylons/webob/zipball/1.1-branch
https://github.com/Pylons/pyramid/zipball/1.2-branch
+ zope.interface <= 3.999
+ zope.component <= 3.999
[testenv:cover]
basepython =
python2.6
commands =
+ python setup.py dev
python setup.py nosetests --with-xunit --with-xcoverage
deps =
- repoze.sendmail>=3.2dev
- coverage
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 6d3e2a9

Please sign in to comment.