merging conflicts(?)

.gitignore

@@ -3,6 +3,7 @@
 *.xlsx
 scratch/*
 forestplot/scratch/*
+examples/*
 
 # Created by https://www.toptal.com/developers/gitignore/api/python,jupyternotebooks
 # Edit at https://www.toptal.com/developers/gitignore?templates=python,jupyternotebooks

Makefile

@@ -19,6 +19,7 @@ lint:
 	python -m pyflakes tests/*.py $(SRC_FILES)
 	python -m pyflakes setup.py
 	black forestplot/*.py $(BLACK_OPTS)
+	black pyforestplot/*.py $(BLACK_OPTS)
 	black tests/*.py $(BLACK_OPTS)
 	black setup.py $(BLACK_OPTS)
 
@@ -27,6 +28,7 @@ prepack: # Prepare packaging for PyPi
 prepack:
 	@echo "+ $@"
 	@rm -rf dist/ forestplot.egg-info/
+	@rm -rf dist/ pyforestplot.egg-info/
 	@python setup.py sdist
 	twine check dist/*
 

tests/test_graph_utils.py

@@ -72,24 +72,6 @@ def test_draw_ref_xline():
     ax = draw_ref_xline(ax, dataframe=input_df, annoteheaders=None, right_annoteheaders=None)
     assert isinstance(ax, Axes)
 
-    # Default is x = 0 line
-    # assert len(ax.get_lines()) == 1
-    # refline = ax.get_lines()[0]
-    # x0, x1 = refline.get_xdata()
-    # assert x0 == 0
-    # assert x1 == 0
-
-    # Add second x = 1 line
-    # ax = draw_ref_xline(ax, xline=1, dataframe=input_df, annoteheaders=None, right_annoteheaders=None)
-    # assert isinstance(ax, Axes)
-    # assert len(ax.get_lines()) == 2  # two lines now
-
-    # Assert second line is at x = 1
-    # refline = ax.get_lines()[1]
-    # x0, x1 = refline.get_xdata()
-    # assert x0 == 1
-    # assert x1 == 1
-
 
 def test_right_flush_yticklabels():
     _, ax = plt.subplots()

tests/test_plot.py

@@ -5,7 +5,7 @@
 from matplotlib.pyplot import Axes
 
 dataname = "sleep"
-data = f"https://raw.githubusercontent.com/lsys/forestplot/main/examples/data/{dataname}.csv"
+data = f"https://raw.githubusercontent.com/lsys/pyforestplot/main/examples/data/{dataname}.csv"
 df = pd.read_csv(data).assign(n=lambda df: df["n"].map(str))
 
 # fmt: off