Merge branch 'main' into peakheights

fooof-tools · Nov 28, 2024 · 3927fe2 · 3927fe2
2 parents 9df44bd + cbbec68
commit 3927fe2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
       MODULE_NAME: specparam
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/setup.py b/setup.py
@@ -45,6 +45,7 @@
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     platforms = 'any',
     project_urls = {

diff --git a/specparam/plts/settings.py b/specparam/plts/settings.py
@@ -2,13 +2,15 @@
 
 from collections import OrderedDict
 
-import matplotlib.pyplot as plt
+from specparam.core.modutils import safe_import
+
+plt = safe_import('.pyplot', 'matplotlib')
 
 ###################################################################################################
 ###################################################################################################
 
 # Define list of default plot colors
-DEFAULT_COLORS = plt.rcParams['axes.prop_cycle'].by_key()['color']
+DEFAULT_COLORS = plt.rcParams['axes.prop_cycle'].by_key()['color'] if plt else None
 
 # Define default figure sizes
 PLT_FIGSIZES = {'spectral' : (8.5, 6.5),

diff --git a/specparam/plts/style.py b/specparam/plts/style.py
@@ -3,12 +3,13 @@
 from itertools import cycle
 from functools import wraps
 
-import matplotlib.pyplot as plt
-
+from specparam.core.modutils import safe_import
 from specparam.plts.settings import (AXIS_STYLE_ARGS, LINE_STYLE_ARGS, COLLECTION_STYLE_ARGS,
                                      CUSTOM_STYLE_ARGS, STYLE_ARGS, TICK_LABELSIZE, TITLE_FONTSIZE,
                                      LABEL_SIZE, LEGEND_SIZE, LEGEND_LOC)
 
+plt = safe_import('.pyplot', 'matplotlib')
+
 ###################################################################################################
 ###################################################################################################