Merge branch 'master' into fix_py_versions

Signed-off-by: Bernard Kleynhans <[email protected]>
fidelity · Sep 5, 2023 · 0751d08 · 0751d08
2 parents 57fb075 + 6001d64
commit 0751d08
Show file tree

Hide file tree

Showing 20 changed files with 1,854 additions and 209 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,6 +7,8 @@ on:
   pull_request:
     branches:
       - master
+  schedule:
+    - cron: '00 12 * * 1' # Runs every Monday at 8:00 AM EST
 
 jobs:
   Test:
@@ -28,6 +30,5 @@ jobs:
         run: |
           python3 -m pip install --upgrade pip
           pip install -e .
-          python3 -m unittest discover -v tests
+          PYTHONHASHSEED=0 python3 -m unittest discover -v tests
           python3 setup.py install
-  
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+-------------------------------------------------------------------------------
+April, 24, 2023 1.1.2
+-------------------------------------------------------------------------------
+
+- Updated all the test cases to replace experiments on boston housing with california housing data due to deprecation
+
 -------------------------------------------------------------------------------
 Feb, 09, 2022 1.1.1
 -------------------------------------------------------------------------------

diff --git a/README.md b/README.md
diff --git a/feature/_version.py b/feature/_version.py
@@ -2,4 +2,4 @@
 # Copyright FMR LLC <[email protected]>
 # SPDX-License-Identifier: GNU GPLv3
 
-__version__ = "1.1.1"
+__version__ = "1.1.2"
diff --git a/feature/base.py b/feature/base.py
@@ -8,7 +8,7 @@
 """
 
 import abc
-from typing import NoReturn, Tuple
+from typing import NoReturn, Tuple, Union
 
 import numpy as np
 import pandas as pd
@@ -66,12 +66,12 @@ class _BaseSupervisedSelector(_BaseSelector, metaclass=abc.ABCMeta):
     """
 
     @abc.abstractmethod
-    def fit(self, data: pd.DataFrame, labels: pd.Series) -> NoReturn:
+    def fit(self, data: pd.DataFrame, labels: Union[pd.Series, pd.DataFrame]) -> NoReturn:
         """Abstract method
         Fits the selector to the given data.
         """
 
-    def fit_transform(self, data: pd.DataFrame, labels: pd.Series) -> pd.DataFrame:
+    def fit_transform(self, data: pd.DataFrame, labels: Union[pd.Series, pd.DataFrame]) -> pd.DataFrame:
         """Fits the selector to the given and returns the transformed data.
         """
         self.fit(data, labels)

diff --git a/feature/selector.py b/feature/selector.py