Merge pull request #191 from StingraySoftware/update_stingray_reqs

Update stingray requirements

Author: matteobachetti

hendrics/efsearch.py

@@ -26,7 +26,6 @@
 from astropy import log
 from astropy.logger import AstropyUserWarning
 from astropy.table import Table, vstack
-from astropy.utils.introspection import minversion
 
 from .base import (
     HENDRICS_STAR_VALUE,
@@ -56,7 +55,6 @@
 )
 
 try:
-    import matplotlib as mpl
     import matplotlib.pyplot as plt
 
     HAS_MPL = True
@@ -157,16 +155,8 @@ def find_nearest_contour(cs, x, y, indices=None, pixel=True):
     if indices is not None:  # pragma: no cover
         warnings.warn("Since Matplotlib 3.8, indices are not usable anymore. Ignoring.")
 
-    MATPLOTLIB_LT_3_8 = not minversion(mpl, "3.8.dev")
-    if MATPLOTLIB_LT_3_8:
-        paths_list = []
-        trans_list = []
-        for con in cs.collections:
-            trans_list.append(con.get_transform())
-            paths_list.append(con.get_paths())
-    else:
-        paths_list = [cs.get_paths()]
-        trans_list = [cs.get_transforms()]
+    paths_list = [cs.get_paths()]
+    trans_list = [cs.get_transforms()]
 
     d2min = np.inf
     conmin = None

pyproject.toml

@@ -37,8 +37,8 @@ dependencies = [
     "numpy>=1.17",
     "astropy>=4.0",
     "scipy>=1.1.0",
-    "matplotlib>=3.0,!=3.4.00,!=3.8.0",
-    "stingray>=2.2.3",
+    "matplotlib>=3.8.0",
+    "stingray>=2.3.2",
     "tqdm",
     "pyyaml",
     "pyparsing<3.2.2; python_version<'3.10'",
@@ -209,7 +209,6 @@ filterwarnings = [
     "ignore:SIMON says. Number of segments used in averaging:UserWarning",
     "ignore:.*deprecated alias for.*:DeprecationWarning",
     "ignore:.*namespace is deprecated.*:DeprecationWarning",
-    "ignore:.*Matplotlib 3.8",
 ]
 
 [tool.towncrier]

requirements.txt

@@ -2,5 +2,5 @@ numpy
 scipy
 astropy
 matplotlib
-stingray >= 1.1
+stingray >= 2.3.2
 sphinx-astropy

tox.ini

@@ -50,7 +50,6 @@ deps =
     astropy5: astropy>=5.0.0,<6.0.0
 
     oldestdeps: numpy<1.25
-    oldestdeps: matplotlib<3.8
     devdeps: numpy>=0.0.dev
     devdeps: scipy>=0.0.dev
     devdeps: matplotlib>=0.0.dev