diff --git a/.gitignore b/.gitignore index af985ab..002f03e 100644 --- a/.gitignore +++ b/.gitignore @@ -48,4 +48,7 @@ tramp *_archive # Trial temp -_trial_temp \ No newline at end of file +_trial_temp + +# OSX +.DS_Store \ No newline at end of file diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index 8bd9591..fa94f58 --- a/setup.py +++ b/setup.py @@ -18,8 +18,10 @@ setup(name='talon', "regex>=1", "html2text", "nose>=1.2.1", + "numpy", "mock", "coverage", - "scikit-learn", + "scipy", + "scikit-learn==0.16.1", # pickled versions of classifier, else rebuild ] ) diff --git a/talon/signature/data/classifier b/talon/signature/data/classifier index 405e6cd..b7d72eb 100644 Binary files a/talon/signature/data/classifier and b/talon/signature/data/classifier differ diff --git a/talon/signature/data/classifier_01.npy b/talon/signature/data/classifier_01.npy index 2934424..11d1302 100644 Binary files a/talon/signature/data/classifier_01.npy and b/talon/signature/data/classifier_01.npy differ diff --git a/talon/signature/data/classifier_02.npy b/talon/signature/data/classifier_02.npy index 7c6997d..0f965ba 100644 Binary files a/talon/signature/data/classifier_02.npy and b/talon/signature/data/classifier_02.npy differ diff --git a/talon/signature/data/classifier_03.npy b/talon/signature/data/classifier_03.npy index 97d9aa3..5a35962 100644 Binary files a/talon/signature/data/classifier_03.npy and b/talon/signature/data/classifier_03.npy differ diff --git a/tests/text_quotations_test.py b/tests/text_quotations_test.py index 0a87e56..fcf5fcd 100644 --- a/tests/text_quotations_test.py +++ b/tests/text_quotations_test.py @@ -618,7 +618,7 @@ def test_standard_replies(): with open(filename) as f: message = email.message_from_file(f) body = email.iterators.typed_subpart_iterator(message, subtype='plain').next() - text = ''.join(email.iterators.body_line_iterator(body)) + text = ''.join(email.iterators.body_line_iterator(body, True)) stripped_text = quotations.extract_from_plain(text) reply_text_fn = filename[:-4] + '_reply_text'