Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

scikit-learn: depend on joblib directly #207

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

scikit-learn: depend on joblib directly #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion talon/signature/learning/classifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down