Merge pull request #85 from LSYS/patch

* Fixes #82 
* Fixes #74

Author: LSYS

README.md

@@ -136,14 +136,14 @@ plt.savefig("plot.png", bbox_inches="tight")
 ```python
 fp.forestplot(df,  # the dataframe with results data
               estimate="r",  # col containing estimated effect size 
-              moerror="moerror",  # columns containing conf. int. margin of error
+              ll="ll", hl="hl",  # columns containing conf. int. lower and higher limits              
               varlabel="label",  # column containing variable label
               capitalize="capitalize",  # Capitalize labels
               groupvar="group",  # Add variable groupings 
               # group ordering
               group_order=["labor factors", "occupation", "age", "health factors", 
                            "family factors", "area of residence", "other factors"],
-              sort=True,  # sort in ascending order (sorts within group if group is specified)               
+              sort=True  # sort in ascending order (sorts within group if group is specified)               
               )
 ```
 <p align="left"><img width="75%" src="https://raw.githubusercontent.com/LSYS/forestplot/main/docs/images/group-grouporder-sort.png"></p>

forestplot/__init__.py

@@ -1,5 +1,5 @@
 """State version and import user-facing functions."""
-VERSION = (0, 3, 0)
+VERSION = (0, 3, 2)
 
 __version__ = ".".join(map(str, VERSION))
 

forestplot/graph_utils.py

@@ -175,10 +175,16 @@ def right_flush_yticklabels(
             dataframe[yticklabel], fontfamily=fontfamily, fontsize=fontsize, ha="right"
         )
     yax = ax.get_yaxis()
-    pad = max(
-        T.label.get_window_extent(renderer=fig.canvas.get_renderer()).width
-        for T in yax.majorTicks
-    )
+    try:
+        pad = max(
+            T.label.get_window_extent(renderer=fig.canvas.get_renderer()).width
+            for T in yax.majorTicks
+        )
+    except AttributeError:
+        pad = max(
+            T.label1.get_window_extent(renderer=fig.canvas.get_renderer()).width
+            for T in yax.majorTicks
+        )
     if flush:
         yax.set_tick_params(pad=pad)
 
@@ -683,7 +689,10 @@ def draw_tablelines(
             Matplotlib Axes object.
     """
     first_yticklab = ax.get_yaxis().majorTicks[-1]
-    bbox_disp = first_yticklab.label.get_window_extent()
+    try:
+        bbox_disp = first_yticklab.label.get_window_extent()
+    except AttributeError:
+        bbox_disp = first_yticklab.label1.get_window_extent()
     (x0, _), (x1, _) = ax.transData.inverted().transform(bbox_disp)
     upper_lw, lower_lw = 2, 1.3
     nrows = len(dataframe)

setup.py

@@ -10,7 +10,7 @@
 install_requires = ["pandas", "numpy", "matplotlib", "matplotlib-inline<=0.1.3"]
 setup(
     name="forestplot",
-    version="0.3.0",
+    version="0.3.2",
     license="MIT",
     author="Lucas Shen",
     author_email="lucas@lucasshen.com",