Fix two depreciation/future warnings

Author: JAnns98

dabest/_dabest_object.py

@@ -486,10 +486,6 @@ def _check_errors(self, x, y, idx, experiment, experiment_label, x1_level):
             if x is None:
                 error_msg = "If `delta2` is True. `x` parameter cannot be None. String or list expected"
                 raise ValueError(error_msg)
-            
-            if self.__is_proportional:
-                mes1 = "Only mean_diff is supported for proportional data when `delta2` is True"
-                warnings.warn(message=mes1, category=UserWarning)
 
             # idx should not be specified
             if idx:

dabest/forest_plot.py

@@ -223,7 +223,7 @@ def get_kwargs(
         "widths": 0.5,
         "showextrema": False,
         "showmedians": False,
-        "vert": not horizontal,
+        "orientation": 'horizontal' if horizontal else 'vertical',
     }
     if violin_kwargs is None:
         violin_kwargs = default_violin_kwargs

dabest/misc_tools.py

@@ -259,7 +259,7 @@ def get_kwargs(
     # Violinplot kwargs.
     default_violinplot_kwargs = {
         "widths": 0.5,
-        "vert": 'vertical',
+        "orientation": 'vertical',
         "showextrema": False,
         "showmedians": False,
 

dabest/plot_tools.py

@@ -1317,7 +1317,7 @@ def slopegraph_plotter(
     # Jitter Kwargs 
     # With help from GitHub user: devMJBL
     jitter = slopegraph_kwargs.pop("jitter")
-    if jitter >= 1:
+    if jitter > 1:
         err0 = "Jitter value is too high. Defaulting to 1."
         warnings.warn(err0)
         jitter = 1
@@ -1447,7 +1447,7 @@ def extract_curve_data(dabest_object):
     data, difference, ci_low, ci_high = extract_curve_data(dabest_object)
 
     if horizontal:  
-        violinplot_kwargs.update({'vert': False, 'widths': 1})
+        violinplot_kwargs.update({'orientation': 'horizontal', 'widths': 1})
         position = max(rawdata_axes.get_yticks()) + 1
         half = "bottom"
         effsize_x, effsize_y = difference, [position]
@@ -1586,7 +1586,7 @@ def effect_size_curve_plotter(
     def plot_effect_size(tick, group, control, bootstrap, effsize, ci_low, ci_high):
         # Create the violinplot
         if horizontal:  
-            violinplot_kwargs.update({'vert': False, 'widths': 1})
+            violinplot_kwargs.update({'orientation': 'horizontal', 'widths': 1})
 
         v = contrast_axes.violinplot(
             bootstrap[~np.isinf(bootstrap)],
@@ -2112,14 +2112,15 @@ def barplotter(
         zorder=1,
         orient=orient,
     )
+
     bar2 = sns.barplot(
         data=plot_data,
         x=yvar if horizontal else xvar,
         y=xvar if horizontal else yvar,
+        hue=xvar if color_col is None else color_col,
         ax=rawdata_axes,
         order=all_plot_groups,
         palette=plot_palette_bar,
-        hue=color_col,
         dodge=False,
         zorder=1,
         orient=orient,

nbs/API/dabest_object.ipynb

@@ -591,10 +591,6 @@
     "            if x is None:\n",
     "                error_msg = \"If `delta2` is True. `x` parameter cannot be None. String or list expected\"\n",
     "                raise ValueError(error_msg)\n",
-    "            \n",
-    "            if self.__is_proportional:\n",
-    "                mes1 = \"Only mean_diff is supported for proportional data when `delta2` is True\"\n",
-    "                warnings.warn(message=mes1, category=UserWarning)\n",
     "\n",
     "            # idx should not be specified\n",
     "            if idx:\n",

nbs/API/forest_plot.ipynb

@@ -282,7 +282,7 @@
     "        \"widths\": 0.5,\n",
     "        \"showextrema\": False,\n",
     "        \"showmedians\": False,\n",
-    "        \"vert\": not horizontal,\n",
+    "        \"orientation\": 'horizontal' if horizontal else 'vertical',\n",
     "    }\n",
     "    if violin_kwargs is None:\n",
     "        violin_kwargs = default_violin_kwargs\n",

nbs/API/misc_tools.ipynb

@@ -313,7 +313,7 @@
     "    # Violinplot kwargs.\n",
     "    default_violinplot_kwargs = {\n",
     "        \"widths\": 0.5,\n",
-    "        \"vert\": 'vertical',\n",
+    "        \"orientation\": 'vertical',\n",
     "        \"showextrema\": False,\n",
     "        \"showmedians\": False,\n",
     "        \n",

nbs/API/plot_tools.ipynb

@@ -1367,7 +1367,7 @@
     "    # Jitter Kwargs \n",
     "    # With help from GitHub user: devMJBL\n",
     "    jitter = slopegraph_kwargs.pop(\"jitter\")\n",
-    "    if jitter >= 1:\n",
+    "    if jitter > 1:\n",
     "        err0 = \"Jitter value is too high. Defaulting to 1.\"\n",
     "        warnings.warn(err0)\n",
     "        jitter = 1\n",
@@ -1497,7 +1497,7 @@
     "    data, difference, ci_low, ci_high = extract_curve_data(dabest_object)\n",
     "\n",
     "    if horizontal:  \n",
-    "        violinplot_kwargs.update({'vert': False, 'widths': 1})\n",
+    "        violinplot_kwargs.update({'orientation': 'horizontal', 'widths': 1})\n",
     "        position = max(rawdata_axes.get_yticks()) + 1\n",
     "        half = \"bottom\"\n",
     "        effsize_x, effsize_y = difference, [position]\n",
@@ -1636,7 +1636,7 @@
     "    def plot_effect_size(tick, group, control, bootstrap, effsize, ci_low, ci_high):\n",
     "        # Create the violinplot\n",
     "        if horizontal:  \n",
-    "            violinplot_kwargs.update({'vert': False, 'widths': 1})\n",
+    "            violinplot_kwargs.update({'orientation': 'horizontal', 'widths': 1})\n",
     "            \n",
     "        v = contrast_axes.violinplot(\n",
     "            bootstrap[~np.isinf(bootstrap)],\n",
@@ -2162,14 +2162,15 @@
     "        zorder=1,\n",
     "        orient=orient,\n",
     "    )\n",
+    "\n",
     "    bar2 = sns.barplot(\n",
     "        data=plot_data,\n",
     "        x=yvar if horizontal else xvar,\n",
     "        y=xvar if horizontal else yvar,\n",
+    "        hue=xvar if color_col is None else color_col,\n",
     "        ax=rawdata_axes,\n",
     "        order=all_plot_groups,\n",
     "        palette=plot_palette_bar,\n",
-    "        hue=color_col,\n",
     "        dodge=False,\n",
     "        zorder=1,\n",
     "        orient=orient,\n",

nbs/tests/mpl_image_tests/test_05_forest_plot.py

@@ -319,7 +319,7 @@ def test_513_deltadelta_violinkwargs_forest():
                 labels=['Drug1', 'Drug2', 'Drug3'],
                 violin_kwargs={
                     "widths": 0.8, "showextrema": True, 
-                    "showmedians": True, "vert": True
+                    "showmedians": True, "orientation": 'vertical'
                 }
             )