From 38b205bfe39237c7e2cf0c2df5f103dcea8203a7 Mon Sep 17 00:00:00 2001 From: Tom Milligan Date: Tue, 26 May 2020 11:27:52 +0100 Subject: [PATCH] scikit-learn: depend on joblib directly --- setup.py | 8 +++++++- talon/signature/learning/classifier.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index f55fc3b7..2b331d64 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,12 @@ def finalize_options(self): 'talon.signature', 'talon.signature.*', ]) - for not_required in ['numpy', 'scipy', 'scikit-learn==0.16.1']: + for not_required in [ + 'numpy', + 'scipy', + 'scikit-learn==0.16.1', + 'joblib', + ]: dist.install_requires.remove(not_required) @@ -49,6 +54,7 @@ def finalize_options(self): "numpy", "scipy", "scikit-learn==0.16.1", # pickled versions of classifier, else rebuild + 'joblib', 'chardet>=1.0.1', 'cchardet>=0.3.5', 'cssselect', diff --git a/talon/signature/learning/classifier.py b/talon/signature/learning/classifier.py index 0519713d..eae9a2d6 100644 --- a/talon/signature/learning/classifier.py +++ b/talon/signature/learning/classifier.py @@ -7,8 +7,8 @@ from __future__ import absolute_import +import joblib from numpy import genfromtxt -from sklearn.externals import joblib from sklearn.svm import LinearSVC