Merge pull request #8 from maxmekiska/development

fix: removed dead pandas imports, added tensorflow requirement

Author: maxmekiska

CHANGELOG.md

@@ -88,4 +88,9 @@ activation function type
 - removed internal hyperparameter tuning
 - removed encoder-decoder architectures
 - improved layer configuration via dictionary input
-- split data argument into target and feature numpy arrays
+- split data argument into target and feature numpy arrays
+ 
+### 2.0.1
+
+- bug: removed dead pandas imports 
+- chore: added tensorflow as base requirement

imbrium/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 
 from imbrium.predictors.multivarhybrid import HybridMulti
 from imbrium.predictors.multivarpure import PureMulti

imbrium/blueprints/abstract_multivariate.py

@@ -1,7 +1,6 @@
 from abc import ABC, abstractmethod
 
 from numpy import array
-from pandas import DataFrame
 
 
 class MultiVariateMultiStep(ABC):
@@ -76,7 +75,7 @@ def show_performance(self):
         pass
 
     @abstractmethod
-    def predict(self, data: array) -> DataFrame:
+    def predict(self, data: array) -> array:
         pass
 
     @abstractmethod

imbrium/blueprints/abstract_univariate.py

@@ -1,7 +1,6 @@
 from abc import ABC, abstractmethod
 
 from numpy import array
-from pandas import DataFrame
 
 
 class UniVariateMultiStep(ABC):
@@ -76,7 +75,7 @@ def show_performance(self):
         pass
 
     @abstractmethod
-    def predict(self, data: array) -> DataFrame:
+    def predict(self, data: array) -> array:
         pass
 
     @abstractmethod

imbrium/utils/transformer.py

@@ -14,10 +14,10 @@ def data_prep_uni(data: array) -> array:
 
 
 def data_prep_multi(target: array, features: array) -> array:
-    """Extract features and convert DataFrame to an array.
+    """Prepare target and feature numpy arrays for mulitvariate model intake.
     Parameters:
-        data (array): DataFrame containing multi-feature data.
-        features (list): All features that should be considered.
+        target (array): Array containing multi-feature data.
+        features (array): All features that should be considered.
     Returns:
         data (array): Array containing sequences of selected features.
     """

setup.py

@@ -13,11 +13,12 @@
     long_description=long_description,
     long_description_content_type="text/markdown",
     name="imbrium",
-    version="2.0.0",
+    version="2.0.1",
     packages=find_packages(include=["imbrium", "imbrium.*"]),
     install_requires=[
         "setuptools >= 41.0.0",
-        "keras-core==0.1.5",
+        "keras-core >=0.1.5, <0.2.0",
+        "tensorflow >=2.13.0, <2.14.0",
     ],
     classifiers=[
         "Programming Language :: Python :: 3.8",

tox.ini

@@ -23,7 +23,6 @@ deps =
   pytest==7.2.0
   pytest-cov
   coverage
-  tensorflow
   pandas
 commands =
   coverage run --source=imbrium -m pytest -vv