diff --git a/.circleci/config.yml b/.circleci/config.yml index 497d82f..bd5451a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,7 +19,7 @@ jobs: conda update --yes --quiet conda conda create -n testenv --yes --quiet python=3 source activate testenv - conda install --yes pip numpy scipy scikit-learn matplotlib sphinx sphinx_rtd_theme numpydoc pillow keras pandas + conda install --yes pip numpy scipy scikit-learn matplotlib sphinx sphinx_rtd_theme numpydoc pillow keras pandas tensorflow imblearn pip install sphinx-gallery pip install . cd doc diff --git a/doc/change_log.rst b/doc/change_log.rst index ebc1222..8dcea6f 100644 --- a/doc/change_log.rst +++ b/doc/change_log.rst @@ -1,6 +1,10 @@ Change Log ========== +Version 1.1.0 + +* Support for imbalanced-learn resamplers by Matthias Gazzari + Version 1.0.9 * allows for vector targets, to support one-hot or multi-label encoding diff --git a/examples/plot_model_selection2.py b/examples/plot_model_selection2.py index 1405399..2a00932 100644 --- a/examples/plot_model_selection2.py +++ b/examples/plot_model_selection2.py @@ -10,9 +10,10 @@ # License: BSD import matplotlib.pyplot as plt -from keras.layers import Dense, LSTM, Conv1D -from keras.models import Sequential -from keras.wrappers.scikit_learn import KerasClassifier +from tensorflow.python.keras.layers import Dense, LSTM, Conv1D +from tensorflow.python.keras.models import Sequential +from tensorflow.python.keras.wrappers.scikit_learn import KerasClassifier + from sklearn.model_selection import GridSearchCV from seglearn.datasets import load_watch diff --git a/examples/plot_nn_training_curves.py b/examples/plot_nn_training_curves.py index 2aa3b59..29230d2 100644 --- a/examples/plot_nn_training_curves.py +++ b/examples/plot_nn_training_curves.py @@ -11,9 +11,9 @@ import matplotlib.pyplot as plt import numpy as np -from keras.layers import Dense, LSTM, Conv1D -from keras.models import Sequential -from keras.wrappers.scikit_learn import KerasClassifier +from tensorflow.python.keras.layers import Dense, LSTM, Conv1D +from tensorflow.python.keras.models import Sequential +from tensorflow.python.keras.wrappers.scikit_learn import KerasClassifier from pandas import DataFrame from sklearn.model_selection import train_test_split diff --git a/examples/plot_segment_rep.py b/examples/plot_segment_rep.py index 57f1de5..324f5bd 100644 --- a/examples/plot_segment_rep.py +++ b/examples/plot_segment_rep.py @@ -11,9 +11,9 @@ import matplotlib.image as mpimg import matplotlib.pyplot as plt -from keras.layers import Dense, LSTM, Conv1D -from keras.models import Sequential -from keras.wrappers.scikit_learn import KerasClassifier +from tensorflow.python.keras.layers import Dense, LSTM, Conv1D +from tensorflow.python.keras.models import Sequential +from tensorflow.python.keras.wrappers.scikit_learn import KerasClassifier from sklearn.model_selection import train_test_split from seglearn.datasets import load_watch diff --git a/seglearn/_version.py b/seglearn/_version.py index 64a2795..ff1068c 100644 --- a/seglearn/_version.py +++ b/seglearn/_version.py @@ -1 +1 @@ -__version__ = "1.0.10" \ No newline at end of file +__version__ = "1.1.0" \ No newline at end of file