Skip to content

Commit cc64db0

Browse files
committed
OK, just gonna make nose a requirement. Deal with it.
1 parent 9c0f370 commit cc64db0

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
lib/MIDIUtil-0.87/
22
pygal==0.13.0
33
requests==1.2.3
4+
nose==1.3.4

test_datamapper.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,8 @@
1212
from criterionfunctions import get_nearness_function, create_combined_criterion, record_length
1313
from dataparser import DataParser
1414
import crnparsers
15-
16-
try:
17-
from nose.plugins.skip import SkipTest
18-
from nose.tools import assert_raises # @UnresolvedImport (Eclipse)
19-
except: # No big deal if we don't have it
20-
assert_raises = None # We'll test for it later
21-
pass
15+
from nose.plugins.skip import SkipTest
16+
from nose.tools import assert_raises # @UnresolvedImport (Eclipse)
2217

2318
pp = pprint.PrettyPrinter().pprint
2419

@@ -76,8 +71,7 @@ def test_ts_range():
7671
assert(ts.ts_range == (1, 5))
7772

7873
def test_DOC_rejects_bad_starter_coll():
79-
if assert_raises: # requires nose
80-
assert_raises(TypeError, DataObjectCollection, 1) # 1 is totally not a collection
74+
assert_raises(TypeError, DataObjectCollection, 1) # 1 is totally not a collection
8175

8276
def test_resample():
8377
ts = TimeSeries([0, 1, 2, 3, 4, 5, 6])

0 commit comments

Comments
 (0)