Fix adjust_text

Author: has2k1

plotnine/geoms/geom_text.py

@@ -252,8 +252,8 @@ def draw_group(
             if params["path_effects"]:
                 text_elem.set_path_effects(params["path_effects"])
 
-        _adjust = params["adjust_text"]
-        if _adjust:
+        # TODO: Do adjust text per panel
+        if _adjust := params["adjust_text"]:
             from adjustText import adjust_text
 
             if params["zorder"] == 1:
@@ -263,10 +263,20 @@ def draw_group(
                     PlotnineWarning,
                 )
 
-            arrowprops = _adjust.pop("arrowprops", {})
+            _adjust = _adjust.copy()
+            arrowprops = _adjust.pop("arrowprops", {}).copy()
             if "color" not in arrowprops:
                 arrowprops["color"] = color[0]
 
+            # The head_length, tail_length and tail_width of the arrow are
+            # specified on the same scale as the fontsize, but their default
+            # values are in the [0, 1] range. The true values are obtained by
+            # multiplying by the mutation_scale. The default value of
+            # mutation_scale is 1, so the arrow is effectively invisible.
+            # A good default for this usecase is the size of text.
+            if "mutation_scale" not in arrowprops:
+                arrowprops["mutation_scale"] = data["size"].mean()
+
             adjust_text(texts, ax=ax, arrowprops=arrowprops, **_adjust)
 
     @staticmethod

tests/baseline_images/test_geom_text_label/adjust_label.png

@@ -39,7 +39,7 @@
 )
 
 adjust_text = {
-    "expand_points": (2, 2),
+    "expand": (2, 2),
     "arrowprops": {"arrowstyle": "->", "color": "red"},
 }
 
@@ -88,7 +88,7 @@ def test_label_aesthetics():
     assert p == "label_aesthetics"
 
 
-@pytest.mark.skipif(is_CI, reason="Sudden small difference on GHA")
+# @pytest.mark.skipif(is_CI, reason="Sudden small difference on GHA")
 def test_adjust_text():
     p = (
         ggplot(mtcars.tail(2), aes("mpg", "disp", label="name"))
@@ -98,7 +98,7 @@ def test_adjust_text():
     assert p == "adjust_text"
 
 
-@pytest.mark.skipif(is_CI, reason="Sudden small difference on GHA")
+# @pytest.mark.skipif(is_CI, reason="Sudden small difference on GHA")
 def test_adjust_label():
     p = (
         ggplot(mtcars.tail(2), aes("mpg", "disp", label="name"))
@@ -108,7 +108,7 @@ def test_adjust_label():
     assert p == "adjust_label"
 
 
-@pytest.mark.skipif(is_CI, reason="Sudden small difference on GHA")
+# @pytest.mark.skipif(is_CI, reason="Sudden small difference on GHA")
 def test_adjust_text_default_color():
     adjust_text2 = adjust_text.copy()
     del adjust_text2["arrowprops"]["color"]