Merge branch 'hotfix/ci' into maint/numpy-2.0

src/python_spectrometer/core.py

@@ -13,7 +13,6 @@ from typing import (Any, Callable, Dict, Generator, Iterator, List,
 from unittest import mock
 
 import dill
-import matplotlib.pyplot as plt
 import numpy as np
 from matplotlib import colors
 from qutil import io
@@ -981,7 +980,6 @@ class Spectrometer:
         --------
         :meth:`recall_from_disk`
         """
-        # shelve writes three files, .dat, .bak, and .dir. Only need to check for one
         if file is None:
             file = self._objfile
         file = io.check_path_length(

tests/test_serialization.py

 import os
 import pathlib
+import random
+import string
 
 import pytest
 
@@ -11,8 +13,9 @@ def spectrometer(monkeypatch, request) -> Spectrometer:
     # patch input to answer overwrite queries with "yes"
     monkeypatch.setattr('builtins.input', lambda: 'y')
 
-    speck = Spectrometer(daq.QoptColoredNoise(), savepath=os.curdir,
+    speck = Spectrometer(daq.QoptColoredNoise(), savepath=pathlib.Path(os.getcwd(), 'data'),
                          plot_cumulative=True, relative_paths=request.param)
+    speck.savepath.mkdir(parents=True, exist_ok=True)
     cwd = os.getcwd()
     os.chdir(speck.savepath)
 
@@ -28,12 +31,18 @@ def spectrometer(monkeypatch, request) -> Spectrometer:
 
 @pytest.fixture
 def serialized(spectrometer: Spectrometer) -> pathlib.Path:
-    spectrometer.serialize_to_disk('blub')
+    stem = ''.join(random.choices(string.ascii_letters, k=10))
+    spectrometer.serialize_to_disk(stem)
 
-    yield spectrometer.savepath / 'blub'
+    yield spectrometer.savepath / stem
 
-    for ext in ['.bak', '.dat', '.dir', '_files.txt']:
-        os.remove(spectrometer.savepath / f'blub{ext}')
+    exts = ['_files.txt']
+    if (spectrometer.savepath / stem).is_file():
+        os.remove(spectrometer.savepath / stem)
+    else:
+        exts.extend(['.bak', '.dat', '.dir'])
+    for ext in exts:
+        os.remove(spectrometer.savepath / f'{stem}{ext}')
 
 
 def test_saving(spectrometer: Spectrometer):
@@ -44,7 +53,13 @@ def test_saving(spectrometer: Spectrometer):
 
 def test_serialization(spectrometer: Spectrometer):
     spectrometer.serialize_to_disk('blub')
-    for ext in ['.bak', '.dat', '.dir', '_files.txt']:
+
+    exts = ['_files.txt']
+    if (spectrometer.savepath / 'blub').is_file():
+        assert os.path.exists(spectrometer.savepath / 'blub')
+    else:
+        exts.extend(['.bak', '.dat', '.dir'])
+    for ext in exts:
         assert os.path.exists(spectrometer.savepath / f'blub{ext}')