Skip to content

Commit 39d9b00

Browse files
authored
Merge branch 'v0.2.8' into dev-lqrt
2 parents 1e4172e + 7015b81 commit 39d9b00

5 files changed

Lines changed: 15 additions & 8 deletions

File tree

dabest/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
from ._stats_tools import effsize as effsize
2424
from ._classes import TwoGroupsEffectSize
2525

26-
__version__ = "0.2.7"
26+
__version__ = "0.2.8"

dabest/_classes.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,6 +1239,12 @@ def plot(self, color_col=None,
12391239
pyplot.violinplot` command here, as a dict. If None, the following
12401240
keywords are passed to violinplot : {'widths':0.5, 'vert':True,
12411241
'showextrema':False, 'showmedians':False}.
1242+
slopegraph_kwargs : dict, default None
1243+
This will change the appearance of the lines used to join each pair
1244+
of observations when `show_pairs=True`. Pass any keyword arguments
1245+
accepted by matplotlib `plot()` function here, as a dict.
1246+
If None, the following keywords are
1247+
passed to plot() : {'linewidth':1, 'alpha':0.5}.
12421248
reflines_kwargs : dict, default None
12431249
This will change the appearance of the zero reference lines. Pass
12441250
any keyword arguments accepted by the matplotlib Axes `hlines`

dabest/plotter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def EffectSizeDataFramePlotter(EffectSizeDataFrame, **plot_kwargs):
130130
if plot_kwargs["slopegraph_kwargs"] is None:
131131
slopegraph_kwargs = default_slopegraph_kwargs
132132
else:
133-
slopegraph_kwargs = merge_two_dicts(slopegraph_kwargs,
133+
slopegraph_kwargs = merge_two_dicts(default_slopegraph_kwargs,
134134
plot_kwargs["slopegraph_kwargs"])
135135

136136

@@ -697,7 +697,7 @@ def EffectSizeDataFramePlotter(EffectSizeDataFrame, **plot_kwargs):
697697
else:
698698
contrast_ylim_high, contrast_ylim_low = contrast_axes_ylim
699699
if contrast_ylim_low < 0 < contrast_ylim_high:
700-
contrast_axes.axhline(y=0, lw=0.75, color=ytick_color)
700+
contrast_axes.axhline(y=0, **reflines_kwargs)
701701

702702
# Compute the end of each x-axes line.
703703
rightend_ticks = np.array([len(i)-1 for i in idx]) + np.array(ticks_to_skip)

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
# The short X.Y version.
7878
version = '0.2'
7979
# The full version, including alpha/beta/rc tags.
80-
release = '0.2.7'
80+
release = '0.2.8'
8181

8282
# The language for content autogenerated by Sphinx. Refer to documentation
8383
# for a list of supported languages.

setup.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,21 @@
3434
author_email='joseshowh@gmail.com',
3535
maintainer='Joses W. Ho',
3636
maintainer_email='joseshowh@gmail.com',
37-
version='0.2.7',
37+
version='0.2.8',
3838
description=DESCRIPTION,
3939
long_description=LONG_DESCRIPTION,
4040
packages=find_packages(),
4141
install_requires=[
4242
'numpy~=1.15',
4343
'scipy~=1.2',
44-
'pandas==0.24',
44+
'pandas~=0.25,!=0.25.2',
45+
4546
'matplotlib~=3.0',
4647
'seaborn~=0.9',
4748
'lqrt>=0.3.2'
4849
],
49-
extras_require={'dev': ['pytest==5.2', 'pytest-mpl==0.10']},
50-
python_requires='>=3.5',
50+
extras_require={'dev': ['pytest~=5.2', 'pytest-mpl~=0.10']},
51+
python_requires='~=3.5',
5152
url='https://acclab.github.io/DABEST-python-docs',
5253
download_url='https://www.github.com/ACCLAB/DABEST-python',
5354
license='BSD 3-clause Clear License'

0 commit comments

Comments
 (0)