Merge pull request #154 from lvgig/develop

V 1.1.0 changes into main

Author: davidhopkinson26

.ruff.toml

@@ -3,7 +3,7 @@
 # McCabe complexity (`C901`) by default.
 select = ["E", "F", "W", "I", "UP", "ASYNC", "YTT", "A", "COM", "C4", "T10", "EM", 
 "FA", "ISC", "PIE", "PYI", "Q", "RSE", "RET", "SLOT", "SIM", "TID", "TCH", "INT", 
-"PD", "PGH", "PLC", "PLE", "PLW", "FLY", "NPY", "PERF"]
+"PD", "PGH", "PLC", "PLE", "PLW", "FLY", "NPY", "PERF", "B", "DTZ"]
 
 # ignore E501 - linelength limit (covered by black except in docstrings) 
 # and PD901 - use of df variable name

CHANGELOG.rst

@@ -16,6 +16,31 @@ Subsections for each version can be one of the following;
 
 Each individual change should have a link to the pull request after the description of the change.
 
+1.1.0 (2023-12-19)
+------------------
+
+Added
+^^^^^
+- added flake8_bugbear (B) to ruff rules `#131 <https://github.com/lvgig/tubular/pull/131>`_
+- added flake8_datetimez (DTZ) to ruff rules `#132 <https://github.com/lvgig/tubular/pull/132>`_
+- added option to avoid passing unseen levels to rare in GroupRareLevelsTransformer `#141 <https://github.com/lvgig/tubular/pull/141>`_
+
+Changed
+^^^^^^^
+- minor changes to comply with flake8_bugbear (B) ruff rules `#131 <https://github.com/lvgig/tubular/pull/131>`_
+- minor changes to comply with flake8_datetimez (DTZ) ruff rules `#132 <https://github.com/lvgig/tubular/pull/132>`_
+- BaseMappingTransformerMixin chnaged to use Dataframe.replace rather than looping over columns `#135 <https://github.com/lvgig/tubular/pull/135>`_
+- MeanResponseTransformer.map_imputer_values() added to decouple from BaseMappingTransformerMixin `#135 <https://github.com/lvgig/tubular/pull/135>`_
+- BaseDateTransformer added to standardise datetime data handling `#148 <https://github.com/lvgig/tubular/pull/148>`_
+
+Removed
+^^^^^^^
+- removed some unnescessary implementation tests `#130 <https://github.com/lvgig/tubular/pull/130>`_
+- ReturnKeyDict class removed `#135 <https://github.com/lvgig/tubular/pull/135>`_
+
+
+
+
 1.0.0 (2023-07-24)
 ------------------
 

examples/nominal/GroupRareLevelsTransformer.ipynb

@@ -14,31 +14,6 @@
 class TestInit:
     """Tests for BaseTransformer.__init__()."""
 
-    def test_arguments(self):
-        """Test that init has expected arguments."""
-        ta.functions.test_function_arguments(
-            func=BaseTransformer.__init__,
-            expected_arguments=["self", "columns", "copy", "verbose"],
-            expected_default_values=(None, True, False),
-        )
-
-    def test_default_attributes_set_in_init(self):
-        """Test correct default values for attributes set in init."""
-        x = BaseTransformer()
-
-        expected_attributes = {
-            "version_": tubular._version.__version__,
-            "verbose": False,
-            "columns": None,
-            "copy": True,
-        }
-
-        ta.classes.test_object_attributes(
-            obj=x,
-            expected_attributes=expected_attributes,
-            msg="Default attributes set in init",
-        )
-
     def test_attributes_set_from_passed_values(self):
         """Test attributes set from values passed in init have the correct values."""
         expected_attributes = {
@@ -67,30 +42,6 @@ def test_columns_str_to_list(self):
             msg="String put in list for columns",
         )
 
-    def test_class_methods(self):
-        """Test that BaseTransformer has fit and transform methods."""
-        x = BaseTransformer()
-
-        ta.classes.test_object_method(obj=x, expected_method="fit", msg="fit")
-
-        ta.classes.test_object_method(
-            obj=x,
-            expected_method="transform",
-            msg="transform",
-        )
-
-        ta.classes.test_object_method(
-            obj=x,
-            expected_method="columns_set_or_check",
-            msg="columns_set_or_check",
-        )
-
-        ta.classes.test_object_method(
-            obj=x,
-            expected_method="columns_check",
-            msg="columns_check",
-        )
-
     def test_verbose_non_bool_error(self):
         """Test an error is raised if verbose is not specified as a bool."""
         with pytest.raises(TypeError, match="BaseTransformer: verbose must be a bool"):
@@ -130,14 +81,6 @@ def test_columns_non_string_error(self):
 class TestFit:
     """Tests for BaseTransformer.fit()."""
 
-    def test_arguments(self):
-        """Test that fit has expected arguments."""
-        ta.functions.test_function_arguments(
-            func=BaseTransformer.fit,
-            expected_arguments=["self", "X", "y"],
-            expected_default_values=(None,),
-        )
-
     def test_fit_returns_self(self):
         """Test fit returns self?."""
         df = d.create_df_1()
@@ -223,13 +166,6 @@ def test_unexpected_kwarg_error(self):
 class TestTransform:
     """Tests for BaseTransformer.transform()."""
 
-    def test_arguments(self):
-        """Test that transform has expected arguments."""
-        ta.functions.test_function_arguments(
-            func=BaseTransformer.transform,
-            expected_arguments=["self", "X"],
-        )
-
     def test_columns_check_called(self, mocker):
         """Test that self.columns_check is called during transform."""
         df = d.create_df_1()
@@ -305,13 +241,6 @@ def test_X_returned(self, df, expected):
 class TestColumnsCheck:
     """Tests for columns_check method."""
 
-    def test_arguments(self):
-        """Test that columns_check has expected arguments."""
-        ta.functions.test_function_arguments(
-            func=BaseTransformer.columns_check,
-            expected_arguments=["self", "X"],
-        )
-
     def test_non_pd_df_error(self):
         """Test an error is raised if X is not passed as a pd.DataFrame."""
         x = BaseTransformer(columns="a")
@@ -360,13 +289,6 @@ def test_columns_not_in_X_error(self):
 class TestColumnsSetOrCheck:
     """Tests for columns_set_or_check method."""
 
-    def test_arguments(self):
-        """Test that columns_set_or_check has expected arguments."""
-        ta.functions.test_function_arguments(
-            func=BaseTransformer.columns_set_or_check,
-            expected_arguments=["self", "X"],
-        )
-
     def test_non_pd_df_error(self):
         """Test an error is raised if X is not passed as a pd.DataFrame."""
         x = BaseTransformer(columns="a")
@@ -434,13 +356,6 @@ def test_check_is_fitted_call(self):
 class TestCombineXy:
     """Tests for the BaseTransformer._combine_X_y method."""
 
-    def test_arguments(self):
-        """Test that columns_check has expected arguments."""
-        ta.functions.test_function_arguments(
-            func=BaseTransformer._combine_X_y,
-            expected_arguments=["self", "X", "y"],
-        )
-
     def test_X_not_DataFrame_error(self):
         """Test an exception is raised if X is not a pd.DataFrame."""
         x = BaseTransformer(columns=["a"])
@@ -510,13 +425,6 @@ def test_output_same_indexes(self):
 class TestCheckWeightsColumn:
     "tests for check_weights_column method."
 
-    def test_arguments(self):
-        """Test that columns_set_or_check has expected arguments."""
-        ta.functions.test_function_arguments(
-            func=BaseTransformer.check_weights_column,
-            expected_arguments=["X", "weights_column"],
-        )
-
     def test_weight_not_in_X_error(self):
         """Test an error is raised if weight is not in X."""
         X = pd.DataFrame({"a": [1, 2], "b": [3, 4]})

tests/base/test_BaseTransformer.py

@@ -13,45 +13,6 @@
 class TestInit:
     """Tests for DataFrameMethodTransformer.init()."""
 
-    def test_arguments(self):
-        """Test that init has expected arguments."""
-        ta.functions.test_function_arguments(
-            func=DataFrameMethodTransformer.__init__,
-            expected_arguments=[
-                "self",
-                "new_column_name",
-                "pd_method_name",
-                "columns",
-                "pd_method_kwargs",
-                "drop_original",
-            ],
-            expected_default_values=({}, False),
-        )
-
-    def test_class_methods(self):
-        """Test that DataFrameMethodTransformer has transform method."""
-        x = DataFrameMethodTransformer(
-            new_column_name="a",
-            pd_method_name="sum",
-            columns=["b", "c"],
-        )
-
-        ta.classes.test_object_method(
-            obj=x,
-            expected_method="transform",
-            msg="transform",
-        )
-
-    def test_inheritance(self):
-        """Test that DataFrameMethodTransformer inherits from BaseTransformer."""
-        x = DataFrameMethodTransformer(
-            new_column_name="a",
-            pd_method_name="sum",
-            columns=["b", "c"],
-        )
-
-        ta.classes.assert_inheritance(x, tubular.base.BaseTransformer)
-
     def test_super_init_called(self, mocker):
         """Test that init calls BaseTransformer.init."""
         expected_call_args = {
@@ -213,13 +174,6 @@ def expected_df_2():
             },
         )
 
-    def test_arguments(self):
-        """Test that transform has expected arguments."""
-        ta.functions.test_function_arguments(
-            func=DataFrameMethodTransformer.transform,
-            expected_arguments=["self", "X"],
-        )
-
     def test_super_transform_called(self, mocker):
         """Test that BaseTransformer.transform called."""
         df = d.create_df_3()