diff --git a/.travis.yml b/.travis.yml index 44026ea1..a03dacdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: # Useful for debugging any issues with conda - conda info -a - - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy nose cython scikit-learn + - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy nose cython scikit-learn six joblib - source activate test-environment - make all diff --git a/appveyor.yml b/appveyor.yml index 36d257b8..e069f877 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,7 +37,7 @@ install: - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - "pip --version" - - "%CMD_IN_ENV% pip install --timeout=60 numpy scipy cython nose scikit-learn wheel" + - "%CMD_IN_ENV% pip install --timeout=60 numpy scipy cython nose scikit-learn wheel six joblib" - "%CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst" - ps: "ls dist" diff --git a/benchmarks/bench_amazon7.py b/benchmarks/bench_amazon7.py index e46474cf..64e3d1f9 100644 --- a/benchmarks/bench_amazon7.py +++ b/benchmarks/bench_amazon7.py @@ -1,6 +1,6 @@ import sys -from sklearn.externals import joblib +import joblib from lightning.classification import SDCAClassifier diff --git a/doc/sphinxext/gen_rst.py b/doc/sphinxext/gen_rst.py index 7592a8d8..f2df15c9 100644 --- a/doc/sphinxext/gen_rst.py +++ b/doc/sphinxext/gen_rst.py @@ -20,7 +20,7 @@ import posixpath import subprocess import warnings -from sklearn.externals import six +import six # Try Python 2 first, otherwise load from Python 3 @@ -67,7 +67,7 @@ def execfile(filename, global_vars=None, local_vars=None): pass -from sklearn.externals import joblib +import joblib ############################################################################### # A tee object to redict streams to multiple outputs diff --git a/lightning/impl/adagrad.py b/lightning/impl/adagrad.py index f2443547..a7d25cc4 100644 --- a/lightning/impl/adagrad.py +++ b/lightning/impl/adagrad.py @@ -5,7 +5,7 @@ from sklearn.utils import check_random_state from sklearn.preprocessing import LabelBinarizer -from sklearn.externals.six.moves import xrange +from six.moves import xrange from .base import BaseClassifier, BaseRegressor from .dataset_fast import get_dataset diff --git a/lightning/impl/datasets/samples_generator.py b/lightning/impl/datasets/samples_generator.py index a3f4278d..57b8f78c 100644 --- a/lightning/impl/datasets/samples_generator.py +++ b/lightning/impl/datasets/samples_generator.py @@ -1,6 +1,6 @@ import numpy as np import scipy.sparse as sp -from sklearn.externals.six.moves import xrange +from six.moves import xrange from sklearn.utils.extmath import safe_sparse_dot from sklearn.utils import check_random_state diff --git a/lightning/impl/dual_cd.py b/lightning/impl/dual_cd.py index b5b3379e..89971f78 100644 --- a/lightning/impl/dual_cd.py +++ b/lightning/impl/dual_cd.py @@ -14,7 +14,7 @@ from sklearn.preprocessing import LabelBinarizer from sklearn.preprocessing import add_dummy_feature -from sklearn.externals.six.moves import xrange +from six.moves import xrange from .base import BaseClassifier, BaseRegressor from .dataset_fast import get_dataset diff --git a/lightning/impl/fista.py b/lightning/impl/fista.py index 00d0aa15..2922d61b 100644 --- a/lightning/impl/fista.py +++ b/lightning/impl/fista.py @@ -4,7 +4,7 @@ import numpy as np from sklearn.utils.extmath import safe_sparse_dot -from sklearn.externals.six.moves import xrange +from six.moves import xrange from .base import BaseClassifier, BaseRegressor diff --git a/lightning/impl/primal_cd.py b/lightning/impl/primal_cd.py index 063f701b..6b4f0d9c 100644 --- a/lightning/impl/primal_cd.py +++ b/lightning/impl/primal_cd.py @@ -12,8 +12,8 @@ import numpy as np -from sklearn.externals.joblib import Parallel, delayed -from sklearn.externals.six.moves import xrange +from joblib import Parallel, delayed +from six.moves import xrange from .base import BaseClassifier from .base import BaseRegressor diff --git a/lightning/impl/primal_newton.py b/lightning/impl/primal_newton.py index b9df5581..89b574af 100644 --- a/lightning/impl/primal_newton.py +++ b/lightning/impl/primal_newton.py @@ -18,7 +18,7 @@ from sklearn.preprocessing import LabelBinarizer from sklearn.utils import check_random_state from sklearn.metrics.pairwise import pairwise_kernels -from sklearn.externals.six.moves import xrange +from six.moves import xrange from .base import BaseClassifier diff --git a/lightning/impl/randomkit/tests/test_random.py b/lightning/impl/randomkit/tests/test_random.py index 152f066d..c2916577 100644 --- a/lightning/impl/randomkit/tests/test_random.py +++ b/lightning/impl/randomkit/tests/test_random.py @@ -3,7 +3,7 @@ from numpy.testing import (assert_almost_equal, assert_array_equal, assert_equal) from lightning.impl.randomkit import RandomState -from sklearn.externals.six.moves import xrange +from six.moves import xrange def test_randint(): diff --git a/lightning/impl/sag.py b/lightning/impl/sag.py index 5f00cefb..a6fd91e8 100644 --- a/lightning/impl/sag.py +++ b/lightning/impl/sag.py @@ -5,7 +5,7 @@ import numpy as np -from sklearn.externals.six.moves import xrange +from six.moves import xrange from .base import BaseClassifier, BaseRegressor from .dataset_fast import get_dataset diff --git a/lightning/impl/sdca.py b/lightning/impl/sdca.py index 1d7bd1a0..5c4ca24e 100644 --- a/lightning/impl/sdca.py +++ b/lightning/impl/sdca.py @@ -5,7 +5,7 @@ from sklearn.utils import check_random_state from sklearn.preprocessing import LabelBinarizer -from sklearn.externals.six.moves import xrange +from six.moves import xrange from .base import BaseClassifier, BaseRegressor from .dataset_fast import get_dataset diff --git a/lightning/impl/sgd.py b/lightning/impl/sgd.py index 32c8b066..2930e220 100644 --- a/lightning/impl/sgd.py +++ b/lightning/impl/sgd.py @@ -16,7 +16,7 @@ from sklearn.utils import check_random_state from sklearn.utils.extmath import safe_sparse_dot from sklearn.utils.validation import assert_all_finite -from sklearn.externals.six.moves import xrange +from six.moves import xrange from .base import BaseClassifier from .base import BaseRegressor diff --git a/lightning/impl/svrg.py b/lightning/impl/svrg.py index c6055d26..a0a1799f 100644 --- a/lightning/impl/svrg.py +++ b/lightning/impl/svrg.py @@ -4,7 +4,7 @@ import numpy as np from sklearn.preprocessing import LabelBinarizer -from sklearn.externals.six.moves import xrange +from six.moves import xrange from .base import BaseClassifier, BaseRegressor from .dataset_fast import get_dataset diff --git a/lightning/impl/tests/test_dataset.py b/lightning/impl/tests/test_dataset.py index f0912865..95036141 100644 --- a/lightning/impl/tests/test_dataset.py +++ b/lightning/impl/tests/test_dataset.py @@ -5,7 +5,7 @@ from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_equal -from sklearn.externals.six.moves import xrange +from six.moves import xrange from sklearn.datasets.samples_generator import make_classification from sklearn.utils import check_random_state diff --git a/lightning/impl/tests/test_dual_cd.py b/lightning/impl/tests/test_dual_cd.py index 443a362a..5ef99785 100644 --- a/lightning/impl/tests/test_dual_cd.py +++ b/lightning/impl/tests/test_dual_cd.py @@ -3,7 +3,7 @@ from sklearn.metrics.pairwise import linear_kernel from sklearn.datasets.samples_generator import make_regression -from sklearn.externals.six.moves import xrange +from six.moves import xrange from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_greater diff --git a/lightning/impl/tests/test_penalty.py b/lightning/impl/tests/test_penalty.py index 744e903a..957d0208 100644 --- a/lightning/impl/tests/test_penalty.py +++ b/lightning/impl/tests/test_penalty.py @@ -2,7 +2,7 @@ from sklearn.utils.testing import (assert_almost_equal, assert_array_almost_equal) -from sklearn.externals.six.moves import xrange +from six.moves import xrange from lightning.impl.penalty import project_l1_ball, project_simplex diff --git a/lightning/impl/tests/test_primal_cd.py b/lightning/impl/tests/test_primal_cd.py index 3760586e..edfc076b 100644 --- a/lightning/impl/tests/test_primal_cd.py +++ b/lightning/impl/tests/test_primal_cd.py @@ -11,7 +11,7 @@ from sklearn.datasets import load_digits from sklearn.metrics.pairwise import pairwise_kernels from sklearn.preprocessing import LabelBinarizer -from sklearn.externals.six.moves import xrange +from six.moves import xrange from lightning.impl.datasets.samples_generator import make_classification from lightning.impl.primal_cd import CDClassifier, CDRegressor diff --git a/setup.py b/setup.py index 711fa02d..d4b86d97 100644 --- a/setup.py +++ b/setup.py @@ -42,6 +42,10 @@ def configuration(parent_package='', top_path=None): setup(configuration=configuration, name=DISTNAME, maintainer=MAINTAINER, + install_requires=[ + 'six', + 'scikit-learn' + ], include_package_data=True, scripts=["bin/lightning_train", "bin/lightning_predict"],