Merge branch 'main' into 0.9.X

Author: SvenKlaassen

doubleml/rdd/_utils.py

@@ -6,7 +6,4 @@ def _is_rdrobust_available():
         rdrobust = importlib.import_module("rdrobust")
         return rdrobust
     except ImportError:
-        msg = (
-            "rdrobust is not installed. "
-            "Please install it using 'pip install DoubleML[rdd]'")
-        raise ImportError(msg)
+        return None

doubleml/rdd/rdd.py

@@ -108,6 +108,11 @@ def __init__(self,
                  fs_kernel="triangular",
                  **kwargs):
 
+        if rdrobust is None:
+            msg = ("rdrobust is not installed. "
+                   "Please install it using 'pip install DoubleML[rdd]'")
+            raise ImportError(msg)
+
         self._check_data(obj_dml_data, cutoff)
         self._dml_data = obj_dml_data
 

doubleml/rdd/tests/conftest.py

@@ -38,6 +38,11 @@ def _predict_dummy(data: DoubleMLData, cutoff, alpha, n_rep, p, fs_specification
         dml_rdflex.fit(n_iterations=1)
         ci_manual = dml_rdflex.confint(level=1-alpha)
 
+        if rdrobust is None:
+            msg = ("rdrobust is not installed. "
+                   "Please install it using 'pip install DoubleML[rdd]'")
+            raise ImportError(msg)
+
         rdrobust_model = rdrobust.rdrobust(
             y=data.y,
             x=data.s,

doubleml/rdd/tests/test_rdd_classifier.py

@@ -21,9 +21,8 @@
 )
 dml_data = dml.DoubleMLData(df, y_col='y', d_cols='d', s_col='score')
 
-dml_rdflex = RDFlex(dml_data, ml_g=LogisticRegression(), ml_m=LogisticRegression(), fuzzy=True)
-
 
 @pytest.mark.ci_rdd
 def test_rdd_classifier():
+    dml_rdflex = RDFlex(dml_data, ml_g=LogisticRegression(), ml_m=LogisticRegression(), fuzzy=True)
     dml_rdflex.fit()

doubleml/rdd/tests/test_rdd_default_values.py

@@ -18,8 +18,6 @@
 )
 dml_data = dml.DoubleMLData(df, y_col='y', d_cols='d', s_col='score')
 
-dml_rdflex = RDFlex(dml_data, ml_g=Lasso(), ml_m=LogisticRegression())
-
 
 def _assert_resampling_default_settings(dml_obj):
     assert dml_obj.n_folds == 5
@@ -32,4 +30,5 @@ def _assert_resampling_default_settings(dml_obj):
 
 @pytest.mark.ci_rdd
 def test_rdd_defaults():
+    dml_rdflex = RDFlex(dml_data, ml_g=Lasso(), ml_m=LogisticRegression())
     _assert_resampling_default_settings(dml_rdflex)

doubleml/rdd/tests/test_rdd_not_installed.py

@@ -1,11 +1,12 @@
 import pytest
 from unittest.mock import patch
 
-from doubleml.rdd._utils import _is_rdrobust_available
+import doubleml as dml
 
 
+@pytest.mark.ci
 def test_rdrobust_import_error():
-    with patch('importlib.import_module', side_effect=ImportError):
+    with patch('doubleml.rdd.rdd.rdrobust', None):
         msg = r"rdrobust is not installed. Please install it using 'pip install DoubleML\[rdd\]'"
         with pytest.raises(ImportError, match=msg):
-            _is_rdrobust_available()
+            dml.rdd.RDFlex(None, None)

doubleml/rdd/tests/test_rdd_return_types.py

@@ -18,8 +18,6 @@
 )
 dml_data = dml.DoubleMLData(df, y_col='y', d_cols='d', s_col='score')
 
-dml_rdflex = RDFlex(dml_data, ml_g=Lasso(), ml_m=LogisticRegression())
-
 
 def _assert_return_types(dml_obj):
     assert isinstance(dml_obj.n_folds, int)
@@ -52,5 +50,7 @@ def _assert_return_types_after_fit(dml_obj):
 
 @pytest.mark.ci_rdd
 def test_rdd_returntypes():
+    dml_rdflex = RDFlex(dml_data, ml_g=Lasso(), ml_m=LogisticRegression())
+
     _assert_return_types(dml_rdflex)
     _assert_return_types_after_fit(dml_rdflex)