Skip to content

Commit 2b49ea8

Browse files
authored
Merge pull request #19 from mkoeppe/master
More fixes for 'setup.py test', add tox.ini
2 parents b5b4dac + 745dfab commit 2b49ea8

File tree

4 files changed

+22
-3
lines changed

4 files changed

+22
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ js/node_modules/
1414
package-lock.json
1515
*.[1-9]
1616
*.print
17+
/.tox

README.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ Shorthand::
7373

7474
$ make test
7575

76+
If you have ``tox`` installed, you can also test the package like this::
77+
78+
$ tox
79+
7680
Documentation
7781
-------------
7882

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ def readfile(filename):
2727
# For the tests
2828
class SageTest(TestCommand):
2929
def run_tests(self):
30-
import os
31-
errno = os.system("sage -t --force-lib sage_widget_adapters")
30+
import os, sys
31+
errno = os.system("sage -t --force-lib --optional=sage sage_widget_adapters")
3232
if errno != 0:
3333
sys.exit(1)
34-
errno = os.system("sage -t --force-lib sage_combinat_widgets")
34+
errno = os.system("sage -t --force-lib --optional=sage sage_combinat_widgets")
3535
if errno != 0:
3636
sys.exit(1)
3737

tox.ini

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[tox]
2+
envlist = sage
3+
# "setup.py sdist" fails because "devDependencies" from js/package.json are not installed
4+
skipsdist = true
5+
6+
[testenv]
7+
whitelist_externals = sage
8+
passenv =
9+
SAGE_ROOT
10+
SAGE_LOCAL
11+
HOME
12+
13+
commands =
14+
sage setup.py test

0 commit comments

Comments
 (0)