Merge pull request #85 from boschresearch/deprecation-fixes

Deprecation fixes

src/pylife/strength/failure_probability.py

@@ -153,4 +153,8 @@ def pf_arbitrary_load(self, load_values, load_pdf):
 
         strength_cdf = norm.cdf(load_values, loc=self.s_50, scale=self.s_std)
 
-        return np.trapz(load_pdf * strength_cdf, x = load_values)
+
+        # TODO: remove this once we drop python 3.8 support
+        trapezoid = np.trapezoid if hasattr(np, 'trapezoid') else np.trapz
+
+        return trapezoid(load_pdf * strength_cdf, x = load_values)

src/pylife/strength/meanstress.py

@@ -239,10 +239,18 @@ def _check_if_R_index(self, check_func):
         if isinstance(self._obj.index, pd.IntervalIndex):
             return check_func(self._obj.index)
 
-        all_but_R = filter(lambda n: n != 'R', map(lambda n: n or 0, self._obj.index.names))
-        return (self._obj.index.to_frame(index=False).groupby(list(all_but_R))
-                .apply(lambda g: check_func(g.set_index('R').index))
-                .any())
+        all_but_R = [n or 0 for n in self._obj.index.names if n != 'R']
+
+        # TODO: remove once we drop python 3.8 support
+        include_groups = {} if pd.__version__ < "2.2" else {'include_groups': False}
+
+        return (
+            self
+            ._obj.index.to_frame(index=False)
+            .groupby(all_but_R)
+            .apply(lambda g: check_func(g.set_index('R').index), **include_groups)
+            .any()
+        )
 
 
 class _SegmentTransformer:

tests/utils/test_histogram.py

@@ -209,7 +209,7 @@ def test_combine_test_big_bin():
     hist1 = pd.Series([1, 2], index=pd.IntervalIndex.from_tuples([(0.0, 0.5), (0.5, 1.0)]))
     hist2 = pd.Series([4], index=pd.IntervalIndex.from_tuples([(0.0, 1.0)]))
 
-    result = hi.combine_histogram([hist1, hist2], method=sum)
+    result = hi.combine_histogram([hist1, hist2], method="sum")
 
     expected = pd.Series(
         [1, 4, 2],