From b0bdee2fe51c11355fe568bbb07bb068b6dc5098 Mon Sep 17 00:00:00 2001 From: Keith Beattie Date: Tue, 21 Apr 2020 23:22:34 -0700 Subject: [PATCH] Import six directly from official module Use full name for scikit-learn to avoid sklearn-0.0 package --- mlrose/neural.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mlrose/neural.py b/mlrose/neural.py index 16c8971a..2c4582c4 100644 --- a/mlrose/neural.py +++ b/mlrose/neural.py @@ -7,9 +7,9 @@ from abc import abstractmethod import numpy as np +import six from sklearn.base import BaseEstimator, ClassifierMixin, RegressorMixin from sklearn.metrics import mean_squared_error, log_loss -from sklearn.externals import six from .activation import identity, relu, sigmoid, softmax, tanh from .algorithms import random_hill_climb, simulated_annealing, genetic_alg from .opt_probs import ContinuousOpt diff --git a/setup.py b/setup.py index 9e8eec20..a5e0ca0c 100644 --- a/setup.py +++ b/setup.py @@ -36,6 +36,6 @@ def readme(): "Topic :: Software Development :: Libraries", "Topic :: Software Development :: Libraries :: Python Modules"], packages=['mlrose'], - install_requires=['numpy', 'scipy', 'sklearn'], + install_requires=['numpy', 'six', 'scikit-learn', 'scipy'], python_requires='>=3', zip_safe=False)