ruff 0.8.0 and fix some tests (#1240)

* ruff0.8.0

* better tests

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
           - --exclude=docs/
           - --exclude=scripts/
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.8.0
     hooks:
       - id: ruff
         types_or: [python, pyi, jupyter]

pymc_marketing/__init__.py

@@ -16,4 +16,4 @@
 from pymc_marketing import clv, mmm
 from pymc_marketing.version import __version__
 
-__all__ = ["clv", "mmm", "__version__"]
+__all__ = ["__version__", "clv", "mmm"]

pymc_marketing/clv/__init__.py

@@ -35,16 +35,16 @@
 )
 
 __all__ = (
-    "BetaGeoModel",
     "BetaGeoBetaBinomModel",
-    "ParetoNBDModel",
+    "BetaGeoModel",
     "GammaGammaModel",
     "GammaGammaModelIndividual",
+    "ParetoNBDModel",
     "ShiftedBetaGeoModelIndividual",
     "customer_lifetime_value",
     "plot_customer_exposure",
-    "plot_frequency_recency_matrix",
     "plot_expected_purchases",
+    "plot_frequency_recency_matrix",
     "plot_probability_alive_matrix",
     "rfm_segments",
     "rfm_summary",

pymc_marketing/clv/distributions.py

@@ -23,7 +23,7 @@
 from pytensor.graph import vectorize_graph
 from pytensor.tensor.random.op import RandomVariable
 
-__all__ = ["ContContract", "ContNonContract", "ParetoNBD", "BetaGeoBetaBinom"]
+__all__ = ["BetaGeoBetaBinom", "ContContract", "ContNonContract", "ParetoNBD"]
 
 
 class ContNonContractRV(RandomVariable):

pymc_marketing/clv/models/__init__.py

@@ -25,11 +25,11 @@
 from pymc_marketing.clv.models.shifted_beta_geo import ShiftedBetaGeoModelIndividual
 
 __all__ = (
-    "CLVModel",
     "BetaGeoBetaBinomModel",
+    "BetaGeoModel",
+    "CLVModel",
     "GammaGammaModel",
     "GammaGammaModelIndividual",
-    "BetaGeoModel",
     "ParetoNBDModel",
     "ShiftedBetaGeoModelIndividual",
 )

pymc_marketing/clv/plotting.py

@@ -25,9 +25,9 @@
 
 __all__ = [
     "plot_customer_exposure",
+    "plot_expected_purchases",
     "plot_frequency_recency_matrix",
     "plot_probability_alive_matrix",
-    "plot_expected_purchases",
 ]
 
 

pymc_marketing/clv/utils.py

@@ -22,11 +22,11 @@
 from numpy import datetime64
 
 __all__ = [
-    "to_xarray",
     "customer_lifetime_value",
     "rfm_segments",
     "rfm_summary",
     "rfm_train_test_split",
+    "to_xarray",
 ]
 
 

pymc_marketing/mmm/__init__.py

@@ -52,39 +52,39 @@
 from pymc_marketing.mmm.validating import validation_method_X, validation_method_y
 
 __all__ = [
-    "MediaTransformation",
-    "MediaConfigList",
-    "MediaConfig",
+    "MMM",
     "AdstockTransformation",
     "BaseValidateMMM",
     "DelayedAdstock",
     "GeometricAdstock",
     "HillSaturation",
     "HillSaturationSigmoid",
-    "LogisticSaturation",
     "InverseScaledLogisticSaturation",
-    "MMM",
+    "LinearTrend",
+    "LogisticSaturation",
     "MMMModelBuilder",
+    "MediaConfig",
+    "MediaConfigList",
+    "MediaTransformation",
     "MichaelisMentenSaturation",
     "MonthlyFourier",
     "RootSaturation",
     "SaturationTransformation",
     "TanhSaturation",
     "TanhSaturationBaselined",
-    "saturation_from_dict",
-    "register_saturation_transformation",
     "WeibullCDFAdstock",
     "WeibullPDFAdstock",
-    "adstock_from_dict",
-    "register_adstock_transformation",
     "YearlyFourier",
+    "adstock_from_dict",
     "base",
     "mmm",
     "preprocessing",
     "preprocessing_method_X",
     "preprocessing_method_y",
+    "register_adstock_transformation",
+    "register_saturation_transformation",
+    "saturation_from_dict",
     "validating",
     "validation_method_X",
     "validation_method_y",
-    "LinearTrend",
 ]

pymc_marketing/mmm/base.py

@@ -46,7 +46,7 @@
 )
 from pymc_marketing.model_builder import ModelBuilder
 
-__all__ = ["MMMModelBuilder", "BaseValidateMMM"]
+__all__ = ["BaseValidateMMM", "MMMModelBuilder"]
 
 from pydantic import Field, validate_call
 

pymc_marketing/mmm/mmm.py

@@ -55,7 +55,7 @@
 from pymc_marketing.model_config import parse_model_config
 from pymc_marketing.prior import Prior
 
-__all__ = ["BaseMMM", "MMM"]
+__all__ = ["MMM", "BaseMMM"]
 
 
 class BaseMMM(BaseValidateMMM):

pymc_marketing/mmm/preprocessing.py

@@ -22,11 +22,11 @@
 from sklearn.preprocessing import MaxAbsScaler, StandardScaler
 
 __all__ = [
-    "preprocessing_method_X",
-    "preprocessing_method_y",
-    "MaxAbsScaleTarget",
     "MaxAbsScaleChannels",
+    "MaxAbsScaleTarget",
     "StandardizeControls",
+    "preprocessing_method_X",
+    "preprocessing_method_y",
 ]
 
 

pymc_marketing/mmm/validating.py

@@ -19,12 +19,12 @@
 import pandas as pd
 
 __all__ = [
-    "validation_method_X",
-    "validation_method_y",
+    "ValidateChannelColumns",
     "ValidateControlColumns",
-    "ValidateTargetColumn",
     "ValidateDateColumn",
-    "ValidateChannelColumns",
+    "ValidateTargetColumn",
+    "validation_method_X",
+    "validation_method_y",
 ]
 
 

tests/mmm/components/test_adstock.py

@@ -87,10 +87,7 @@ def test_default_prefix(adstock) -> None:
 
 
 def test_adstock_no_negative_lmax():
-    with pytest.raises(
-        ValidationError,
-        match="1 validation error for __init__\\nl_max\\n  Input should be greater than 0",
-    ):
+    with pytest.raises(ValidationError, match=".*Input should be greater than 0.*"):
         DelayedAdstock(l_max=-1)
 
 

tests/test_prior.py

@@ -576,10 +576,7 @@ def test_cant_reset_distribution() -> None:
 
 
 def test_nonstring_distribution() -> None:
-    with pytest.raises(
-        ValidationError,
-        match="1 validation error for __init__\\n1\\n  Input should be a valid string",
-    ):
+    with pytest.raises(ValidationError, match=".*Input should be a valid string.*"):
         Prior(pm.Normal)
 
 
@@ -590,10 +587,7 @@ def test_change_the_transform() -> None:
 
 
 def test_nonstring_transform() -> None:
-    with pytest.raises(
-        ValidationError,
-        match="1 validation error for __init__\\ntransform\\n  Input should be a valid string",
-    ):
+    with pytest.raises(ValidationError, match=".*Input should be a valid string.*"):
         Prior("Normal", transform=pm.math.log)