Permalink
Browse files

Get Jenkins tests running again by installing pyramid_zcml.

  • Loading branch information...
1 parent fc62f14 commit a71425741ddfa12e58d095299aa8d4e686ecd76f @tseaver tseaver committed Apr 2, 2012
Showing with 12 additions and 5 deletions.
  1. +3 −0 setup.cfg
  2. +6 −3 setup.py
  3. +3 −2 tox.ini
View
@@ -7,3 +7,6 @@ where=pyramid_who
nocapture=1
cover-package=pyramid_who
cover-erase=1
+
+[aliases]
+dev = develop easy_install pyramid_who[zcml]
View
@@ -43,13 +43,16 @@
include_package_data=True,
zip_safe=False,
tests_require = ['pyramid',
+ 'pyramid_zcml',
'repoze.who',
],
install_requires=['pyramid',
'repoze.who',
],
test_suite="pyramid_who",
entry_points = """\
- """
- )
-
+ """,
+ extras_require = {
+ 'zcml': 'pyramid_zcml',
+ },
+)
View
@@ -7,6 +7,7 @@ commands =
python setup.py test -q
deps =
pyramid
+ pyramid_zcml
repoze.who
[testenv:jython]
@@ -17,12 +18,12 @@ commands =
basepython =
python2.6
commands =
- python setup.py nosetests --with-xunit --with-xcoverage
+ nosetests --with-xunit --with-xcoverage
deps =
pyramid
repoze.who
nose
- coverage==3.4
+ coverage
nosexcover
# we separate coverage into its own testenv because a) "last run wins" wrt

0 comments on commit a714257

Please sign in to comment.