Skip to content
Browse files

- Drop install dependency on pyramid_zcml.

- Add a tox.ini for Jenkins testing.

- Fix tests for Pyramid 1.1.
  • Loading branch information...
1 parent 7ae145e commit 414bdff20ac7d08dd211a575c4e53f37d49c8bd0 @mcdonc mcdonc committed Jul 22, 2011
Showing with 50 additions and 5 deletions.
  1. +4 −0 .gitignore
  2. +6 −0 CHANGES.txt
  3. +1 −2 pyramid_handlers/tests.py
  4. +3 −3 setup.py
  5. +36 −0 tox.ini
View
4 .gitignore
@@ -2,5 +2,9 @@ env26/
*.egg
*.egg-info
*.pyc
+*$py.class
.coverage
dist/
+.tox/
+nosetests.xml
+coverage.xml
View
6 CHANGES.txt
@@ -5,6 +5,12 @@ Next release
- Add example of ``__action_decorator__`` in documentation.
+- Drop install dependency on pyramid_zcml.
+
+- Add a tox.ini for Jenkins testing.
+
+- Fix tests for Pyramid 1.1.
+
0.1 (2011-01-18)
----------------
View
3 pyramid_handlers/tests.py
@@ -472,8 +472,7 @@ def two(self):
route_action = actions[0]
route_discriminator = route_action['discriminator']
- self.assertEqual(route_discriminator,
- ('route', 'name', False, None, None, None, None,None))
+ self.assertEqual(route_discriminator[:2], ('route', 'name'))
self._assertRoute('name', '/:action')
view_action = actions[1]
View
6 setup.py
@@ -25,13 +25,13 @@
README = CHANGES = ''
install_requires=[
- 'pyramid>=1.0a10', 'pyramid_zcml',
+ 'pyramid>=1.0a10',
]
if platform.system() == 'Java':
- tests_require = install_requires
+ tests_require = install_requires + ['pyramid_zcml']
else:
- tests_require= install_requires + ['Sphinx', 'docutils',
+ tests_require= install_requires + ['pyramid_zcml', 'Sphinx', 'docutils',
'repoze.sphinx.autointerface']
setup(name='pyramid_handlers',
View
36 tox.ini
@@ -0,0 +1,36 @@
+[tox]
+envlist =
+ py25,py26,py27,jython,pypy,cover
+
+[testenv]
+commands =
+ python setup.py test -q
+deps =
+ pyramid
+ pyramid_zcml
+ Sphinx
+ repoze.sphinx.autointerface
+
+[testenv:jython]
+commands =
+ jython setup.py test -q
+
+[testenv:cover]
+basepython =
+ python2.6
+commands =
+ python setup.py nosetests --with-xunit --with-xcoverage
+deps =
+ pyramid
+ pyramid_zcml
+ Sphinx
+ repoze.sphinx.autointerface
+ nose
+ 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 414bdff

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