pyobs-sbig 2.0.0.dev7__tar.gz → 2.0.0.dev9__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/.github/dependabot.yml +5 -0
- pyobs_sbig-2.0.0.dev9/.github/workflows/dependabot-automerge.yml +24 -0
- pyobs_sbig-2.0.0.dev9/.github/workflows/pyrefly.yml +26 -0
- pyobs_sbig-2.0.0.dev9/.github/workflows/pytest.yml +28 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/PKG-INFO +3 -3
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/pyproject.toml +9 -3
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/pyobs_sbig/gui.py +36 -13
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/pyobs_sbig/sbig6303e.py +1 -1
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/pyobs_sbig/sbigcamera.py +121 -104
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/pyobs_sbig/sbigfiltercamera.py +36 -38
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/pyobs_sbig/sbigudrv.pyx +17 -0
- pyobs_sbig-2.0.0.dev9/tests/test_import.py +35 -0
- pyobs_sbig-2.0.0.dev9/tests/test_sbigcamera.py +90 -0
- pyobs_sbig-2.0.0.dev9/tests/test_sbigfiltercamera.py +55 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/uv.lock +66 -6
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/.github/workflows/pypi.yml +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/.github/workflows/ruff.yml +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/.pre-commit-config.yaml +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/.readthedocs.yml +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/CHANGELOG.rst +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/CMakeLists.txt +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/LICENSE +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/README.md +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/docs/Makefile +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/docs/make.bat +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/docs/requirements.txt +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/docs/source/_static/pyobs.gif +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/docs/source/conf.py +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/docs/source/index.rst +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/lib/libsbigudrv.so +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/pyobs_sbig/__init__.py +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/pyobs_sbig/sbigudrv.pxd +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/sbigudrv/csbigcam.cpp +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/sbigudrv/csbigcam.h +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/sbigudrv/csbigimg.cpp +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/sbigudrv/csbigimg.h +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/sbigudrv/lpardrv.h +0 -0
- {pyobs_sbig-2.0.0.dev7 → pyobs_sbig-2.0.0.dev9}/src/sbigudrv/sbigudrv.h +0 -0
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
name: Dependabot auto-merge
|
|
2
|
+
|
|
3
|
+
on: pull_request
|
|
4
|
+
|
|
5
|
+
permissions:
|
|
6
|
+
contents: write
|
|
7
|
+
pull-requests: write
|
|
8
|
+
|
|
9
|
+
jobs:
|
|
10
|
+
dependabot:
|
|
11
|
+
runs-on: ubuntu-latest
|
|
12
|
+
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
|
|
13
|
+
steps:
|
|
14
|
+
- name: Fetch Dependabot metadata
|
|
15
|
+
id: metadata
|
|
16
|
+
uses: dependabot/fetch-metadata@v2
|
|
17
|
+
with:
|
|
18
|
+
compat-lookup: true
|
|
19
|
+
- name: Enable auto-merge for patch and minor updates
|
|
20
|
+
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' }}
|
|
21
|
+
run: gh pr merge --auto --merge "$PR_URL"
|
|
22
|
+
env:
|
|
23
|
+
PR_URL: ${{ github.event.pull_request.html_url }}
|
|
24
|
+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
name: pyrefly
|
|
2
|
+
on: push
|
|
3
|
+
|
|
4
|
+
jobs:
|
|
5
|
+
pyrefly:
|
|
6
|
+
runs-on: ubuntu-latest
|
|
7
|
+
timeout-minutes: 10
|
|
8
|
+
|
|
9
|
+
steps:
|
|
10
|
+
- name: Check out repository code
|
|
11
|
+
uses: actions/checkout@v4
|
|
12
|
+
|
|
13
|
+
- name: Set up Python
|
|
14
|
+
uses: astral-sh/setup-uv@v5
|
|
15
|
+
with:
|
|
16
|
+
enable-cache: true
|
|
17
|
+
python-version: "3.13"
|
|
18
|
+
|
|
19
|
+
- name: Install system dependencies
|
|
20
|
+
run: sudo apt-get install -y libcfitsio-dev
|
|
21
|
+
|
|
22
|
+
- name: Install packages
|
|
23
|
+
run: uv sync --all-extras --dev
|
|
24
|
+
|
|
25
|
+
- name: Run pyrefly
|
|
26
|
+
run: uv run pyrefly check
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
name: PyTest
|
|
2
|
+
on: push
|
|
3
|
+
|
|
4
|
+
jobs:
|
|
5
|
+
test:
|
|
6
|
+
runs-on: ubuntu-latest
|
|
7
|
+
timeout-minutes: 10
|
|
8
|
+
|
|
9
|
+
steps:
|
|
10
|
+
- name: Check out repository code
|
|
11
|
+
uses: actions/checkout@v4
|
|
12
|
+
|
|
13
|
+
- name: Set up Python
|
|
14
|
+
uses: astral-sh/setup-uv@v5
|
|
15
|
+
with:
|
|
16
|
+
enable-cache: true
|
|
17
|
+
python-version: "3.13"
|
|
18
|
+
|
|
19
|
+
- name: Install system dependencies
|
|
20
|
+
run: sudo apt-get install -y libcfitsio-dev
|
|
21
|
+
|
|
22
|
+
- name: Install packages
|
|
23
|
+
run: uv sync --all-extras --dev
|
|
24
|
+
|
|
25
|
+
- name: Run tests
|
|
26
|
+
run: uv run pytest tests
|
|
27
|
+
env:
|
|
28
|
+
CI: true
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: pyobs-sbig
|
|
3
|
-
Version: 2.0.0.
|
|
3
|
+
Version: 2.0.0.dev9
|
|
4
4
|
Summary: pyobs module for SBIG cameras
|
|
5
5
|
Author-Email: Tim-Oliver Husser <thusser@uni-goettingen.de>
|
|
6
6
|
License-Expression: MIT
|
|
7
7
|
Requires-Python: >=3.11
|
|
8
8
|
Requires-Dist: astropy<8,>=7.0.1
|
|
9
9
|
Requires-Dist: numpy<3,>=2.2.5
|
|
10
|
-
Requires-Dist: pyobs-core<3,>=2.0.0.
|
|
10
|
+
Requires-Dist: pyobs-core<3,>=2.0.0.dev82
|
|
11
11
|
Provides-Extra: gui
|
|
12
|
-
Requires-Dist: pyobs-core[gui]<3,>=2.0.0.
|
|
12
|
+
Requires-Dist: pyobs-core[gui]<3,>=2.0.0.dev82; extra == "gui"
|
|
13
13
|
Requires-Dist: qasync>=0.28.0; extra == "gui"
|
|
14
14
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "pyobs-sbig"
|
|
3
|
-
version = "2.0.0.
|
|
3
|
+
version = "2.0.0.dev9"
|
|
4
4
|
description = "pyobs module for SBIG cameras"
|
|
5
5
|
authors = [{ name = "Tim-Oliver Husser", email = "thusser@uni-goettingen.de" }]
|
|
6
6
|
requires-python = ">=3.11"
|
|
@@ -8,12 +8,12 @@ license = "MIT"
|
|
|
8
8
|
dependencies = [
|
|
9
9
|
"astropy>=7.0.1,<8",
|
|
10
10
|
"numpy>=2.2.5,<3",
|
|
11
|
-
"pyobs-core>=2.0.0.
|
|
11
|
+
"pyobs-core>=2.0.0.dev82,<3",
|
|
12
12
|
]
|
|
13
13
|
|
|
14
14
|
[project.optional-dependencies]
|
|
15
15
|
gui = [
|
|
16
|
-
"pyobs-core[gui]>=2.0.0.
|
|
16
|
+
"pyobs-core[gui]>=2.0.0.dev82,<3",
|
|
17
17
|
"qasync>=0.28.0",
|
|
18
18
|
]
|
|
19
19
|
|
|
@@ -24,6 +24,8 @@ dev = [
|
|
|
24
24
|
"pyrefly>=1.1.1",
|
|
25
25
|
"pre-commit>=4.2.0,<5",
|
|
26
26
|
"cython>=3.0.0,<4",
|
|
27
|
+
"pytest>=8.0.0",
|
|
28
|
+
"pytest-asyncio>=0.24.0",
|
|
27
29
|
]
|
|
28
30
|
|
|
29
31
|
[project.scripts]
|
|
@@ -62,3 +64,7 @@ select = ["E", "F", "W", "I", "UP", "G"]
|
|
|
62
64
|
[tool.pyrefly]
|
|
63
65
|
python-version = "3.11"
|
|
64
66
|
ignore-missing-imports = ["PySide6.*", "qasync.*"]
|
|
67
|
+
project-excludes = ["src/pyobs_sbig/gui.py"]
|
|
68
|
+
|
|
69
|
+
[tool.pytest.ini_options]
|
|
70
|
+
asyncio_mode = "strict"
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import asyncio
|
|
2
2
|
import sys
|
|
3
|
+
import time
|
|
3
4
|
|
|
4
5
|
import qasync # type: ignore
|
|
5
6
|
from astropy.io import fits
|
|
@@ -54,26 +55,45 @@ class MainWindow(QtWidgets.QMainWindow):
|
|
|
54
55
|
|
|
55
56
|
@qasync.asyncSlot() # type: ignore
|
|
56
57
|
async def _expose_clicked(self) -> None:
|
|
58
|
+
# get current binning from the widget
|
|
59
|
+
binning = self.binning_widget._binnings[self.binning_widget.combo_binnings.currentIndex()]
|
|
60
|
+
|
|
57
61
|
# init image
|
|
58
62
|
self._img.image_can_close = False
|
|
59
63
|
|
|
60
|
-
|
|
61
|
-
self._cam.exposure_time = self.exposure_time.value
|
|
62
|
-
self._cam.window = self.window_widget.values
|
|
63
|
-
self._cam.binning = (1, 1)
|
|
64
|
-
|
|
65
|
-
# start exposure
|
|
66
|
-
self._cam.start_exposure(self._img, False)
|
|
64
|
+
loop = asyncio.get_running_loop()
|
|
67
65
|
|
|
68
|
-
#
|
|
69
|
-
|
|
70
|
-
|
|
66
|
+
# set exposure time, window and binning, then start the exposure off the Qt thread
|
|
67
|
+
def _start() -> None:
|
|
68
|
+
self._cam.exposure_time = self.exposure_time.value
|
|
69
|
+
self._cam.window = self.window_widget.values
|
|
70
|
+
self._cam.binning = binning
|
|
71
|
+
self._cam.start_exposure(self._img, False)
|
|
72
|
+
|
|
73
|
+
self.abort_exposure.clear()
|
|
74
|
+
await loop.run_in_executor(None, _start)
|
|
75
|
+
|
|
76
|
+
# wait for it off the Qt thread, checking the abort event
|
|
77
|
+
def _wait() -> bool:
|
|
78
|
+
while not self._cam.has_exposure_finished():
|
|
79
|
+
if self.abort_exposure.is_set():
|
|
80
|
+
return True
|
|
81
|
+
time.sleep(0.01)
|
|
82
|
+
return False
|
|
83
|
+
|
|
84
|
+
aborted = await loop.run_in_executor(None, _wait)
|
|
85
|
+
|
|
86
|
+
if aborted:
|
|
87
|
+
# abort the exposure in the camera
|
|
88
|
+
await loop.run_in_executor(None, self._cam.end_exposure)
|
|
89
|
+
self._img.image_can_close = True
|
|
90
|
+
self.expose.set_exposures_left()
|
|
91
|
+
return
|
|
71
92
|
|
|
72
93
|
# finish exposure
|
|
73
|
-
self._cam.end_exposure
|
|
94
|
+
await loop.run_in_executor(None, self._cam.end_exposure)
|
|
74
95
|
|
|
75
96
|
# wait for readout
|
|
76
|
-
loop = asyncio.get_running_loop()
|
|
77
97
|
await loop.run_in_executor(None, self._cam.readout, self._img, False)
|
|
78
98
|
|
|
79
99
|
# finalize image
|
|
@@ -89,7 +109,10 @@ class MainWindow(QtWidgets.QMainWindow):
|
|
|
89
109
|
@qasync.asyncSlot() # type: ignore
|
|
90
110
|
async def _abort_clicked(self) -> None:
|
|
91
111
|
self.abort_exposure.set()
|
|
92
|
-
|
|
112
|
+
|
|
113
|
+
def closeEvent(self, event) -> None: # type: ignore[override]
|
|
114
|
+
self._cam.close()
|
|
115
|
+
super().closeEvent(event)
|
|
93
116
|
|
|
94
117
|
|
|
95
118
|
async def async_main(app: QtWidgets.QApplication) -> None:
|
|
@@ -18,7 +18,7 @@ class Sbig6303eCamera(SbigFilterCamera):
|
|
|
18
18
|
"""Actually do the exposure, should be implemented by derived classes.
|
|
19
19
|
|
|
20
20
|
Args:
|
|
21
|
-
exposure_time: The requested exposure time in
|
|
21
|
+
exposure_time: The requested exposure time in seconds.
|
|
22
22
|
open_shutter: Whether or not to open the shutter.
|
|
23
23
|
abort_event: Event that gets triggered when exposure should be aborted.
|
|
24
24
|
|
|
@@ -10,7 +10,7 @@ from typing import Any, TypeVar, cast
|
|
|
10
10
|
import numpy as np
|
|
11
11
|
from pyobs.images import Image
|
|
12
12
|
from pyobs.interfaces import IAbortable, IBinning, ICamera, ICooling, ITemperatures, IWindow
|
|
13
|
-
from pyobs.interfaces.IBinning import BinningCapabilities, BinningState
|
|
13
|
+
from pyobs.interfaces.IBinning import Binning, BinningCapabilities, BinningState
|
|
14
14
|
from pyobs.interfaces.ICooling import CoolingState
|
|
15
15
|
from pyobs.interfaces.ITemperatures import SensorReading, TemperaturesState
|
|
16
16
|
from pyobs.interfaces.IWindow import WindowCapabilities, WindowState
|
|
@@ -54,6 +54,10 @@ class SbigCamera(BaseCamera, ICamera, IWindow, IBinning, ICooling, ITemperatures
|
|
|
54
54
|
# active lock
|
|
55
55
|
self._lock_active = asyncio.Lock()
|
|
56
56
|
|
|
57
|
+
# shared lock guarding all access to the non-reentrant CSBIGCam object, so an exposure and
|
|
58
|
+
# a filter move (which uses its own _lock_motion) can never overlap on the same driver
|
|
59
|
+
self._lock_cam = asyncio.Lock()
|
|
60
|
+
|
|
57
61
|
# cooling
|
|
58
62
|
self._setpoint = setpoint
|
|
59
63
|
|
|
@@ -159,10 +163,21 @@ class SbigCamera(BaseCamera, ICamera, IWindow, IBinning, ICooling, ITemperatures
|
|
|
159
163
|
)
|
|
160
164
|
await self.comm.set_capabilities(
|
|
161
165
|
IBinning,
|
|
162
|
-
BinningCapabilities(binnings=[
|
|
166
|
+
BinningCapabilities(binnings=[Binning(x=1, y=1), Binning(x=2, y=2), Binning(x=3, y=3)]),
|
|
163
167
|
)
|
|
164
168
|
await self.comm.set_state(IBinning, BinningState(x=self._binning[0], y=self._binning[1]))
|
|
165
169
|
|
|
170
|
+
async def close(self) -> None:
|
|
171
|
+
"""Close module and release the camera link."""
|
|
172
|
+
await BaseCamera.close(self)
|
|
173
|
+
|
|
174
|
+
# take the same lock _expose()/set_filter() use, so close can't tear down the driver
|
|
175
|
+
# out from under a live exposure or filter move
|
|
176
|
+
async with self._lock_cam:
|
|
177
|
+
# release the SBIG device/driver link
|
|
178
|
+
if not await self._run_blocking(self._cam.close):
|
|
179
|
+
log.error("Timed out closing SBIG camera after %.1fs.", _SDK_CALL_TIMEOUT)
|
|
180
|
+
|
|
166
181
|
async def set_window(self, left: int, top: int, width: int, height: int, **kwargs: Any) -> None:
|
|
167
182
|
"""Set the camera window.
|
|
168
183
|
|
|
@@ -180,7 +195,7 @@ class SbigCamera(BaseCamera, ICamera, IWindow, IBinning, ICooling, ITemperatures
|
|
|
180
195
|
"""Actually do the exposure, should be implemented by derived classes.
|
|
181
196
|
|
|
182
197
|
Args:
|
|
183
|
-
exposure_time: The requested exposure time in
|
|
198
|
+
exposure_time: The requested exposure time in seconds.
|
|
184
199
|
open_shutter: Whether or not to open the shutter.
|
|
185
200
|
abort_event: Event that gets triggered when exposure should be aborted.
|
|
186
201
|
|
|
@@ -191,107 +206,109 @@ class SbigCamera(BaseCamera, ICamera, IWindow, IBinning, ICooling, ITemperatures
|
|
|
191
206
|
pyobs.utils.exceptions.GrabImageError: If exposure was not successful.
|
|
192
207
|
"""
|
|
193
208
|
|
|
194
|
-
async with self.
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
209
|
+
async with self._lock_cam:
|
|
210
|
+
async with self._lock_active:
|
|
211
|
+
# binning
|
|
212
|
+
binning = self._binning
|
|
213
|
+
|
|
214
|
+
# set window, CSBIGCam expects left/top also in binned coordinates, so divide by binning
|
|
215
|
+
left = int(math.floor(self._window[0]) / binning[0])
|
|
216
|
+
top = int(math.floor(self._window[1]) / binning[1])
|
|
217
|
+
width = int(math.floor(self._window[2]) / binning[0])
|
|
218
|
+
height = int(math.floor(self._window[3]) / binning[1])
|
|
219
|
+
log.info(
|
|
220
|
+
"Set window to %dx%d (binned %dx%d) at %d,%d.",
|
|
221
|
+
self._window[2],
|
|
222
|
+
self._window[3],
|
|
223
|
+
width,
|
|
224
|
+
height,
|
|
225
|
+
left,
|
|
226
|
+
top,
|
|
227
|
+
)
|
|
228
|
+
window = (left, top, width, height)
|
|
229
|
+
|
|
230
|
+
# get date obs
|
|
231
|
+
log.info("Starting exposure with for %.2f seconds...", exposure_time)
|
|
232
|
+
date_obs = datetime.now(UTC).strftime("%Y-%m-%dT%H:%M:%S.%f")
|
|
233
|
+
|
|
234
|
+
def _start() -> None:
|
|
235
|
+
# init image
|
|
236
|
+
self._img.image_can_close = False
|
|
237
|
+
|
|
238
|
+
# set exposure time, window and binning
|
|
239
|
+
self._cam.exposure_time = exposure_time
|
|
240
|
+
self._cam.window = window
|
|
241
|
+
self._cam.binning = binning
|
|
242
|
+
|
|
243
|
+
# start exposure
|
|
244
|
+
self._cam.start_exposure(self._img, open_shutter)
|
|
245
|
+
|
|
246
|
+
await self._run_blocking_or_raise(_start)
|
|
247
|
+
|
|
248
|
+
# wait for it -- runs the whole poll loop as a single blocking call (see
|
|
249
|
+
# _run_blocking), rather than polling has_exposure_finished() every 10ms directly
|
|
250
|
+
# on the event loop
|
|
251
|
+
def _wait() -> bool:
|
|
252
|
+
while not self._cam.has_exposure_finished():
|
|
253
|
+
if abort_event.is_set():
|
|
254
|
+
return True
|
|
255
|
+
time.sleep(0.01)
|
|
256
|
+
return False
|
|
257
|
+
|
|
258
|
+
exposure_timeout = exposure_time + _EXPOSURE_WAIT_MARGIN
|
|
259
|
+
aborted = await self._run_blocking_or_raise(_wait, timeout=exposure_timeout)
|
|
260
|
+
if aborted:
|
|
261
|
+
raise exc.AbortedError("Exposure aborted.")
|
|
262
|
+
|
|
263
|
+
# finish exposure
|
|
264
|
+
await self._run_blocking_or_raise(self._cam.end_exposure)
|
|
265
|
+
|
|
266
|
+
# wait for readout
|
|
267
|
+
log.info("Exposure finished, reading out...")
|
|
268
|
+
await self._change_exposure_status(ExposureStatus.READOUT)
|
|
269
|
+
|
|
270
|
+
# start readout (can raise ValueError)
|
|
271
|
+
loop = asyncio.get_running_loop()
|
|
272
|
+
await loop.run_in_executor(None, self._cam.readout, self._img, open_shutter)
|
|
273
|
+
|
|
274
|
+
# finalize image
|
|
275
|
+
self._img.image_can_close = True
|
|
276
|
+
|
|
277
|
+
# download data
|
|
278
|
+
data = self._img.data
|
|
279
|
+
|
|
280
|
+
# temp & cooling
|
|
281
|
+
def _get_cooling() -> tuple[Any, float, float, Any]:
|
|
282
|
+
return self._cam.get_cooling()
|
|
283
|
+
|
|
284
|
+
_, temp, setpoint, _ = await self._run_blocking_or_raise(_get_cooling)
|
|
285
|
+
|
|
286
|
+
# create FITS image and set header
|
|
287
|
+
img = Image(data)
|
|
288
|
+
img.header["DATE-OBS"] = (date_obs, "Date and time of start of exposure")
|
|
289
|
+
img.header["EXPTIME"] = (exposure_time, "Exposure time [s]")
|
|
290
|
+
img.header["DET-TEMP"] = (temp, "CCD temperature [C]")
|
|
291
|
+
img.header["DET-TSET"] = (setpoint, "Cooler setpoint [C]")
|
|
292
|
+
|
|
293
|
+
# binning
|
|
294
|
+
img.header["XBINNING"] = img.header["DET-BIN1"] = (self._binning[0], "Binning factor used on X axis")
|
|
295
|
+
img.header["YBINNING"] = img.header["DET-BIN2"] = (self._binning[1], "Binning factor used on Y axis")
|
|
296
|
+
|
|
297
|
+
# window
|
|
298
|
+
img.header["XORGSUBF"] = (self._window[0], "Subframe origin on X axis")
|
|
299
|
+
img.header["YORGSUBF"] = (self._window[1], "Subframe origin on Y axis")
|
|
300
|
+
|
|
301
|
+
# statistics
|
|
302
|
+
img.header["DATAMIN"] = (float(np.min(data)), "Minimum data value")
|
|
303
|
+
img.header["DATAMAX"] = (float(np.max(data)), "Maximum data value")
|
|
304
|
+
img.header["DATAMEAN"] = (float(np.mean(data)), "Mean data value")
|
|
305
|
+
|
|
306
|
+
# biassec/trimsec
|
|
307
|
+
self.set_biassec_trimsec(img.header, *self._full_frame)
|
|
308
|
+
|
|
309
|
+
# return FITS image
|
|
310
|
+
log.info("Readout finished.")
|
|
311
|
+
return img
|
|
295
312
|
|
|
296
313
|
async def _abort_exposure(self) -> None:
|
|
297
314
|
"""Abort the running exposure. Should be implemented by derived class.
|
|
@@ -22,7 +22,7 @@ log = logging.getLogger(__name__)
|
|
|
22
22
|
_FILTER_WAIT_TIMEOUT = 30.0
|
|
23
23
|
|
|
24
24
|
|
|
25
|
-
class SbigFilterCamera(
|
|
25
|
+
class SbigFilterCamera(SbigCamera, MotionStatusMixin, IFilters):
|
|
26
26
|
"""A pyobs module for SBIG cameras."""
|
|
27
27
|
|
|
28
28
|
__module__ = "pyobs_sbig"
|
|
@@ -33,7 +33,7 @@ class SbigFilterCamera(MotionStatusMixin, SbigCamera, IFilters):
|
|
|
33
33
|
Args:
|
|
34
34
|
filter_names: List of filter names.
|
|
35
35
|
"""
|
|
36
|
-
|
|
36
|
+
super().__init__(motion_status_interfaces=["IFilters"], **kwargs)
|
|
37
37
|
from .sbigudrv import FilterWheelModel, FilterWheelPosition # type: ignore
|
|
38
38
|
|
|
39
39
|
# filter wheel
|
|
@@ -53,9 +53,6 @@ class SbigFilterCamera(MotionStatusMixin, SbigCamera, IFilters):
|
|
|
53
53
|
# current position
|
|
54
54
|
self._position = FilterWheelPosition.UNKNOWN
|
|
55
55
|
|
|
56
|
-
# init mixins
|
|
57
|
-
MotionStatusMixin.__init__(self, **kwargs, motion_status_interfaces=["IFilters"])
|
|
58
|
-
|
|
59
56
|
async def open(self) -> None:
|
|
60
57
|
"""Open module.
|
|
61
58
|
|
|
@@ -108,7 +105,7 @@ class SbigFilterCamera(MotionStatusMixin, SbigCamera, IFilters):
|
|
|
108
105
|
"""Actually do the exposure, should be implemented by derived classes.
|
|
109
106
|
|
|
110
107
|
Args:
|
|
111
|
-
exposure_time: The requested exposure time in
|
|
108
|
+
exposure_time: The requested exposure time in seconds.
|
|
112
109
|
open_shutter: Whether or not to open the shutter.
|
|
113
110
|
abort_event: Event that gets triggered when exposure should be aborted.
|
|
114
111
|
|
|
@@ -160,38 +157,39 @@ class SbigFilterCamera(MotionStatusMixin, SbigCamera, IFilters):
|
|
|
160
157
|
# set status
|
|
161
158
|
await self._change_motion_status(MotionStatus.SLEWING, interface="IFilters")
|
|
162
159
|
|
|
163
|
-
# acquire lock
|
|
164
|
-
async with
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
160
|
+
# acquire the shared camera lock (so the move can't overlap an exposure) and the motion lock
|
|
161
|
+
async with self._lock_cam:
|
|
162
|
+
async with LockWithAbort(self._lock_motion, self._abort_motion):
|
|
163
|
+
# set it
|
|
164
|
+
log.info("Changing filter to %s...", filter_name)
|
|
165
|
+
target = filters[filter_name]
|
|
166
|
+
|
|
167
|
+
def _set_filter() -> None:
|
|
168
|
+
self._cam.set_filter(target)
|
|
169
|
+
|
|
170
|
+
await self._run_blocking_or_raise(_set_filter)
|
|
171
|
+
|
|
172
|
+
# wait for it -- runs the whole poll loop as a single blocking call (see
|
|
173
|
+
# SbigCamera._run_blocking), rather than polling get_filter_position_and_status()
|
|
174
|
+
# every 100ms directly on the event loop
|
|
175
|
+
def _wait() -> bool:
|
|
176
|
+
while True:
|
|
177
|
+
position, status = self._cam.get_filter_position_and_status()
|
|
178
|
+
if position == target and status == FilterWheelStatus.IDLE:
|
|
179
|
+
return False
|
|
180
|
+
if self._abort_motion.is_set():
|
|
181
|
+
return True
|
|
182
|
+
time.sleep(0.1)
|
|
183
|
+
|
|
184
|
+
aborted = await self._run_blocking_or_raise(_wait, timeout=_FILTER_WAIT_TIMEOUT)
|
|
185
|
+
if aborted:
|
|
186
|
+
raise exc.AbortedError("Filter change aborted.")
|
|
187
|
+
|
|
188
|
+
# update cached position and publish new state
|
|
189
|
+
self._position = target
|
|
190
|
+
log.info("Filter changed.")
|
|
191
|
+
await self.comm.send_event(FilterChangedEvent(filter_name))
|
|
192
|
+
await self.comm.set_state(IFilters, FilterState(filter=filter_name))
|
|
195
193
|
|
|
196
194
|
# set status
|
|
197
195
|
await self._change_motion_status(MotionStatus.POSITIONED, interface="IFilters")
|
|
@@ -72,6 +72,10 @@ cdef class SBIGImg:
|
|
|
72
72
|
def __cinit__(self):
|
|
73
73
|
self.obj = new CSBIGImg()
|
|
74
74
|
|
|
75
|
+
def __dealloc__(self):
|
|
76
|
+
if self.obj != NULL:
|
|
77
|
+
del self.obj
|
|
78
|
+
|
|
75
79
|
@property
|
|
76
80
|
def image_can_close(self) -> bool:
|
|
77
81
|
return self.obj.GetImageCanClose()
|
|
@@ -109,6 +113,19 @@ cdef class SBIGCam:
|
|
|
109
113
|
self.aborted = False
|
|
110
114
|
self.lock = threading.Lock()
|
|
111
115
|
|
|
116
|
+
def __dealloc__(self):
|
|
117
|
+
if self.obj != NULL:
|
|
118
|
+
del self.obj
|
|
119
|
+
|
|
120
|
+
def close(self):
|
|
121
|
+
"""Close the camera device and driver.
|
|
122
|
+
|
|
123
|
+
The C++ destructor does this too (via __dealloc__), but closing explicitly lets callers
|
|
124
|
+
release the link without waiting for the GC to collect the object.
|
|
125
|
+
"""
|
|
126
|
+
self.obj.CloseDevice()
|
|
127
|
+
self.obj.CloseDriver()
|
|
128
|
+
|
|
112
129
|
def establish_link(self):
|
|
113
130
|
res = self.obj.EstablishLink()
|
|
114
131
|
if res != 0:
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"""Smoke tests: import the drivers and instantiate them without hardware, asserting
|
|
2
|
+
the interfaces they claim.
|
|
3
|
+
|
|
4
|
+
The Cython extension (sbigudrv) links the bundled SBIG Universal Driver during
|
|
5
|
+
install, but the device link is only established inside open(), so instantiation is
|
|
6
|
+
safe with no SBIG hardware attached.
|
|
7
|
+
"""
|
|
8
|
+
|
|
9
|
+
from pyobs.interfaces import IAbortable, IBinning, ICamera, ICooling, IFilters, ITemperatures, IWindow
|
|
10
|
+
from pyobs.modules import Module
|
|
11
|
+
|
|
12
|
+
from pyobs_sbig import Sbig6303eCamera, SbigCamera, SbigFilterCamera
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
def test_instantiate_camera() -> None:
|
|
16
|
+
camera = SbigCamera()
|
|
17
|
+
assert isinstance(camera, Module)
|
|
18
|
+
assert isinstance(camera, ICamera)
|
|
19
|
+
assert isinstance(camera, IWindow)
|
|
20
|
+
assert isinstance(camera, IBinning)
|
|
21
|
+
assert isinstance(camera, ICooling)
|
|
22
|
+
assert isinstance(camera, ITemperatures)
|
|
23
|
+
assert isinstance(camera, IAbortable)
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
def test_instantiate_filter_camera() -> None:
|
|
27
|
+
camera = SbigFilterCamera(filter_wheel="CFW10")
|
|
28
|
+
assert isinstance(camera, Module)
|
|
29
|
+
assert isinstance(camera, IFilters)
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
def test_instantiate_6303e() -> None:
|
|
33
|
+
camera = Sbig6303eCamera(filter_wheel="CFW10")
|
|
34
|
+
assert isinstance(camera, Module)
|
|
35
|
+
assert isinstance(camera, IFilters)
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
"""Unit tests for the non-hardware logic in SbigCamera: constructor defaults, the
|
|
2
|
+
window/binning setters, and the _run_blocking/_run_blocking_or_raise wrappers.
|
|
3
|
+
|
|
4
|
+
Hardware I/O (establishing the link, exposing, reading out) is out of scope here.
|
|
5
|
+
"""
|
|
6
|
+
|
|
7
|
+
import asyncio
|
|
8
|
+
import threading
|
|
9
|
+
from unittest.mock import AsyncMock
|
|
10
|
+
|
|
11
|
+
import pytest
|
|
12
|
+
from pyobs.interfaces import IBinning, IWindow
|
|
13
|
+
|
|
14
|
+
from pyobs_sbig import SbigCamera
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
def test_constructor_defaults() -> None:
|
|
18
|
+
camera = SbigCamera()
|
|
19
|
+
assert camera._setpoint == -20
|
|
20
|
+
assert camera._window == (0, 0, 0, 0)
|
|
21
|
+
assert camera._binning == (1, 1)
|
|
22
|
+
assert camera._full_frame == (0, 0, 0, 0)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
@pytest.mark.asyncio
|
|
26
|
+
async def test_set_window() -> None:
|
|
27
|
+
camera = SbigCamera()
|
|
28
|
+
camera.comm.set_state = AsyncMock() # type: ignore[method-assign]
|
|
29
|
+
|
|
30
|
+
await camera.set_window(10, 20, 100, 200)
|
|
31
|
+
|
|
32
|
+
assert camera._window == (10, 20, 100, 200)
|
|
33
|
+
assert camera.comm.set_state.await_args is not None
|
|
34
|
+
interface, state = camera.comm.set_state.await_args.args
|
|
35
|
+
assert interface is IWindow
|
|
36
|
+
assert (state.x, state.y, state.width, state.height) == (10, 20, 100, 200)
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
@pytest.mark.asyncio
|
|
40
|
+
async def test_set_binning() -> None:
|
|
41
|
+
camera = SbigCamera()
|
|
42
|
+
camera.comm.set_state = AsyncMock() # type: ignore[method-assign]
|
|
43
|
+
|
|
44
|
+
await camera.set_binning(2, 3)
|
|
45
|
+
|
|
46
|
+
assert camera._binning == (2, 3)
|
|
47
|
+
assert camera.comm.set_state.await_args is not None
|
|
48
|
+
interface, state = camera.comm.set_state.await_args.args
|
|
49
|
+
assert interface is IBinning
|
|
50
|
+
assert (state.x, state.y) == (2, 3)
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
@pytest.mark.asyncio
|
|
54
|
+
async def test_run_blocking_runs_func_and_returns_true() -> None:
|
|
55
|
+
ran: list[bool] = []
|
|
56
|
+
|
|
57
|
+
def fast() -> None:
|
|
58
|
+
ran.append(True)
|
|
59
|
+
|
|
60
|
+
assert await SbigCamera._run_blocking(fast) is True
|
|
61
|
+
assert ran == [True]
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
@pytest.mark.asyncio
|
|
65
|
+
async def test_run_blocking_times_out() -> None:
|
|
66
|
+
done = threading.Event()
|
|
67
|
+
|
|
68
|
+
def slow() -> None:
|
|
69
|
+
done.wait()
|
|
70
|
+
|
|
71
|
+
assert await SbigCamera._run_blocking(slow, timeout=0.01) is False
|
|
72
|
+
done.set()
|
|
73
|
+
await asyncio.sleep(0.05)
|
|
74
|
+
|
|
75
|
+
|
|
76
|
+
@pytest.mark.asyncio
|
|
77
|
+
async def test_run_blocking_or_raise_returns_value() -> None:
|
|
78
|
+
camera = SbigCamera()
|
|
79
|
+
assert await camera._run_blocking_or_raise(lambda: 42) == 42
|
|
80
|
+
|
|
81
|
+
|
|
82
|
+
@pytest.mark.asyncio
|
|
83
|
+
async def test_run_blocking_or_raise_reraises() -> None:
|
|
84
|
+
camera = SbigCamera()
|
|
85
|
+
|
|
86
|
+
def boom() -> int:
|
|
87
|
+
raise ValueError("boom")
|
|
88
|
+
|
|
89
|
+
with pytest.raises(ValueError):
|
|
90
|
+
await camera._run_blocking_or_raise(boom)
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"""Unit tests for the non-hardware logic in SbigFilterCamera: filter-name mapping
|
|
2
|
+
and set_filter validation.
|
|
3
|
+
|
|
4
|
+
The SBIG Universal Driver is mocked out / not touched; only the name<->position
|
|
5
|
+
mapping and validation are exercised.
|
|
6
|
+
"""
|
|
7
|
+
|
|
8
|
+
import pytest
|
|
9
|
+
from pyobs.utils import exceptions as exc
|
|
10
|
+
from pyobs.utils.enums import MotionStatus
|
|
11
|
+
|
|
12
|
+
from pyobs_sbig import SbigFilterCamera
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
def test_constructor_threads_kwargs_cooperatively() -> None:
|
|
16
|
+
"""Locks in the cooperative-super()-chain conversion: SbigFilterCamera(MotionStatusMixin,
|
|
17
|
+
SbigCamera, ...) used to call SbigCamera.__init__() then a separate, redundant
|
|
18
|
+
MotionStatusMixin.__init__(self, **kwargs, motion_status_interfaces=[...]).
|
|
19
|
+
|
|
20
|
+
Unlike the equivalent fix in pyobs-alpaca/pyobs-brot/pyobs-iagvt, there's no kwarg that
|
|
21
|
+
demonstrates a "raises pre-fix, passes post-fix" regression here: motion_status_interfaces
|
|
22
|
+
is the only kwarg MotionStatusMixin's chain needs and it's hardcoded at the call site, so a
|
|
23
|
+
caller passing it explicitly collides (`got multiple values`) both before and after this fix
|
|
24
|
+
rather than leaking. Every other kwarg these live configs set (filter_wheel, filter_names,
|
|
25
|
+
setpoint, fits_headers, comm) is already consumed by SbigCamera's own chain and re-consumes
|
|
26
|
+
cleanly on the old redundant second pass too. This test instead locks in that construction
|
|
27
|
+
with a representative, live-config-shaped kwarg set succeeds and mixin state lands
|
|
28
|
+
correctly -- the actual fix is a correctness/consistency cleanup, not a crash fix, for this
|
|
29
|
+
particular class."""
|
|
30
|
+
camera = SbigFilterCamera(
|
|
31
|
+
filter_wheel="CFW10",
|
|
32
|
+
setpoint=-15.0,
|
|
33
|
+
fits_headers={"DET-PIXL": (0.0054, "Pixel size")},
|
|
34
|
+
comm={"class": "pyobs.comm.dummy.DummyComm"},
|
|
35
|
+
)
|
|
36
|
+
assert camera.motion_status() == MotionStatus.UNKNOWN
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
def test_filter_names_default() -> None:
|
|
40
|
+
camera = SbigFilterCamera(filter_wheel="CFW10")
|
|
41
|
+
assert "UNKNOWN" in camera._filter_names.values()
|
|
42
|
+
assert len(camera._filter_names) == 11 # 10 positions + UNKNOWN
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
def test_filter_names_custom() -> None:
|
|
46
|
+
names = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"]
|
|
47
|
+
camera = SbigFilterCamera(filter_wheel="CFW10", filter_names=names)
|
|
48
|
+
assert set(names).issubset(set(camera._filter_names.values()))
|
|
49
|
+
|
|
50
|
+
|
|
51
|
+
@pytest.mark.asyncio
|
|
52
|
+
async def test_set_filter_unknown_name() -> None:
|
|
53
|
+
camera = SbigFilterCamera(filter_wheel="CFW10")
|
|
54
|
+
with pytest.raises(exc.InvalidArgumentError):
|
|
55
|
+
await camera.set_filter("does-not-exist")
|
|
@@ -1040,6 +1040,15 @@ wheels = [
|
|
|
1040
1040
|
{ url = "https://files.pythonhosted.org/packages/7f/ec/6b120b4a86f6fadc7ddb1d7c7cdcb15bcfb332deb022ab60df51bcd4494c/influxdb_client-1.50.0-py3-none-any.whl", hash = "sha256:f172975cf7f0c95bfe74f288b31273393b164d2c58a948de55497d9956ab49be", size = 746289, upload-time = "2026-01-23T09:39:37.377Z" },
|
|
1041
1041
|
]
|
|
1042
1042
|
|
|
1043
|
+
[[package]]
|
|
1044
|
+
name = "iniconfig"
|
|
1045
|
+
version = "2.3.0"
|
|
1046
|
+
source = { registry = "https://pypi.org/simple" }
|
|
1047
|
+
sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" }
|
|
1048
|
+
wheels = [
|
|
1049
|
+
{ url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" },
|
|
1050
|
+
]
|
|
1051
|
+
|
|
1043
1052
|
[[package]]
|
|
1044
1053
|
name = "invoke"
|
|
1045
1054
|
version = "3.0.3"
|
|
@@ -1889,6 +1898,15 @@ wheels = [
|
|
|
1889
1898
|
{ url = "https://files.pythonhosted.org/packages/49/e2/4e6eee633809c376c024821b91ade709cbfd040ec53939ffbcc292aa7eee/platformdirs-4.11.2-py3-none-any.whl", hash = "sha256:7f89089b6ea71bda7962953edcf784b2e2d9d285b40ad88be2bb75c6e9d82ab4", size = 23361, upload-time = "2026-08-10T15:48:04.855Z" },
|
|
1890
1899
|
]
|
|
1891
1900
|
|
|
1901
|
+
[[package]]
|
|
1902
|
+
name = "pluggy"
|
|
1903
|
+
version = "1.6.0"
|
|
1904
|
+
source = { registry = "https://pypi.org/simple" }
|
|
1905
|
+
sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" }
|
|
1906
|
+
wheels = [
|
|
1907
|
+
{ url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" },
|
|
1908
|
+
]
|
|
1909
|
+
|
|
1892
1910
|
[[package]]
|
|
1893
1911
|
name = "pre-commit"
|
|
1894
1912
|
version = "4.6.2"
|
|
@@ -2290,6 +2308,15 @@ wheels = [
|
|
|
2290
2308
|
{ url = "https://files.pythonhosted.org/packages/b4/11/97233cf23ad5411ac6f13b1d6ee3888f90ace4f974d9bf9db887aa428912/pyerfa-2.0.1.5-cp39-abi3-win_amd64.whl", hash = "sha256:66292d437dcf75925b694977aa06eb697126e7b86553e620371ed3e48b5e0ad0", size = 349410, upload-time = "2024-11-11T15:22:24.817Z" },
|
|
2291
2309
|
]
|
|
2292
2310
|
|
|
2311
|
+
[[package]]
|
|
2312
|
+
name = "pygments"
|
|
2313
|
+
version = "2.20.0"
|
|
2314
|
+
source = { registry = "https://pypi.org/simple" }
|
|
2315
|
+
sdist = { url = "https://files.pythonhosted.org/packages/c3/b2/bc9c9196916376152d655522fdcebac55e66de6603a76a02bca1b6414f6c/pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", size = 4955991, upload-time = "2026-03-29T13:29:33.898Z" }
|
|
2316
|
+
wheels = [
|
|
2317
|
+
{ url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" },
|
|
2318
|
+
]
|
|
2319
|
+
|
|
2293
2320
|
[[package]]
|
|
2294
2321
|
name = "pynacl"
|
|
2295
2322
|
version = "1.6.2"
|
|
@@ -2327,7 +2354,7 @@ wheels = [
|
|
|
2327
2354
|
|
|
2328
2355
|
[[package]]
|
|
2329
2356
|
name = "pyobs-core"
|
|
2330
|
-
version = "2.0.0.
|
|
2357
|
+
version = "2.0.0.dev82"
|
|
2331
2358
|
source = { registry = "https://pypi.org/simple" }
|
|
2332
2359
|
dependencies = [
|
|
2333
2360
|
{ name = "aiohttp" },
|
|
@@ -2359,9 +2386,9 @@ dependencies = [
|
|
|
2359
2386
|
{ name = "tenacity" },
|
|
2360
2387
|
{ name = "typing-extensions" },
|
|
2361
2388
|
]
|
|
2362
|
-
sdist = { url = "https://files.pythonhosted.org/packages/
|
|
2389
|
+
sdist = { url = "https://files.pythonhosted.org/packages/13/b8/e0d2a5fa390e15eebd01c86a75360e47e72823036b9e8793f73961c4e24a/pyobs_core-2.0.0.dev82.tar.gz", hash = "sha256:eb5e6510e0ba113700876db409cdce4b5d57e6df399421fc8cf174ec9e5076a8", size = 362959, upload-time = "2026-08-19T04:27:17.94Z" }
|
|
2363
2390
|
wheels = [
|
|
2364
|
-
{ url = "https://files.pythonhosted.org/packages/
|
|
2391
|
+
{ url = "https://files.pythonhosted.org/packages/81/17/83f22b85cfd9dea2c18396738d12fcd631232b2e8a111700133b037a7673/pyobs_core-2.0.0.dev82-py3-none-any.whl", hash = "sha256:b0cfe7d7a9dff89a8650ff4c01cdd3423f8ca9188aeef1d799d3e61085484bb2", size = 585768, upload-time = "2026-08-19T04:27:16.531Z" },
|
|
2365
2392
|
]
|
|
2366
2393
|
|
|
2367
2394
|
[package.optional-dependencies]
|
|
@@ -2373,7 +2400,7 @@ gui = [
|
|
|
2373
2400
|
|
|
2374
2401
|
[[package]]
|
|
2375
2402
|
name = "pyobs-sbig"
|
|
2376
|
-
version = "2.0.0.
|
|
2403
|
+
version = "2.0.0.dev9"
|
|
2377
2404
|
source = { editable = "." }
|
|
2378
2405
|
dependencies = [
|
|
2379
2406
|
{ name = "astropy" },
|
|
@@ -2394,6 +2421,8 @@ dev = [
|
|
|
2394
2421
|
{ name = "cython" },
|
|
2395
2422
|
{ name = "pre-commit" },
|
|
2396
2423
|
{ name = "pyrefly" },
|
|
2424
|
+
{ name = "pytest" },
|
|
2425
|
+
{ name = "pytest-asyncio" },
|
|
2397
2426
|
{ name = "ruff" },
|
|
2398
2427
|
]
|
|
2399
2428
|
|
|
@@ -2401,8 +2430,8 @@ dev = [
|
|
|
2401
2430
|
requires-dist = [
|
|
2402
2431
|
{ name = "astropy", specifier = ">=7.0.1,<8" },
|
|
2403
2432
|
{ name = "numpy", specifier = ">=2.2.5,<3" },
|
|
2404
|
-
{ name = "pyobs-core", specifier = ">=2.0.0.
|
|
2405
|
-
{ name = "pyobs-core", extras = ["gui"], marker = "extra == 'gui'", specifier = ">=2.0.0.
|
|
2433
|
+
{ name = "pyobs-core", specifier = ">=2.0.0.dev82,<3" },
|
|
2434
|
+
{ name = "pyobs-core", extras = ["gui"], marker = "extra == 'gui'", specifier = ">=2.0.0.dev82,<3" },
|
|
2406
2435
|
{ name = "qasync", marker = "extra == 'gui'", specifier = ">=0.28.0" },
|
|
2407
2436
|
]
|
|
2408
2437
|
provides-extras = ["gui"]
|
|
@@ -2413,6 +2442,8 @@ dev = [
|
|
|
2413
2442
|
{ name = "cython", specifier = ">=3.0.0,<4" },
|
|
2414
2443
|
{ name = "pre-commit", specifier = ">=4.2.0,<5" },
|
|
2415
2444
|
{ name = "pyrefly", specifier = ">=1.1.1" },
|
|
2445
|
+
{ name = "pytest", specifier = ">=8.0.0" },
|
|
2446
|
+
{ name = "pytest-asyncio", specifier = ">=0.24.0" },
|
|
2416
2447
|
{ name = "ruff", specifier = ">=0.9.0" },
|
|
2417
2448
|
]
|
|
2418
2449
|
|
|
@@ -2492,6 +2523,35 @@ wheels = [
|
|
|
2492
2523
|
{ url = "https://files.pythonhosted.org/packages/f1/12/eb6723faf5cb7fa581145da1c15f40d641b96e080f0491af2f1859fdeedb/pyside6_essentials-6.11.1-cp310-abi3-win_arm64.whl", hash = "sha256:11253ea52aabecefe9febddbbe78b43a824129e3af1cec98431028fba7fa954f", size = 57964512, upload-time = "2026-05-13T09:43:52.968Z" },
|
|
2493
2524
|
]
|
|
2494
2525
|
|
|
2526
|
+
[[package]]
|
|
2527
|
+
name = "pytest"
|
|
2528
|
+
version = "9.1.1"
|
|
2529
|
+
source = { registry = "https://pypi.org/simple" }
|
|
2530
|
+
dependencies = [
|
|
2531
|
+
{ name = "colorama", marker = "sys_platform == 'win32'" },
|
|
2532
|
+
{ name = "iniconfig" },
|
|
2533
|
+
{ name = "packaging" },
|
|
2534
|
+
{ name = "pluggy" },
|
|
2535
|
+
{ name = "pygments" },
|
|
2536
|
+
]
|
|
2537
|
+
sdist = { url = "https://files.pythonhosted.org/packages/e4/47/b9efed96c114afcfa3c9d3fe98a76a1d14c74a9e266d397cf6eb64be5e01/pytest-9.1.1.tar.gz", hash = "sha256:1088fbde8f2b49d95a549a195707afa7a76a3ce9bcadc26b6d71f0ffda5fe313", size = 1636369, upload-time = "2026-06-19T10:58:32.857Z" }
|
|
2538
|
+
wheels = [
|
|
2539
|
+
{ url = "https://files.pythonhosted.org/packages/24/25/1de2678b631f5a49215c6c96fff41ba892b0a34df68d6d80292b1b48aa7f/pytest-9.1.1-py3-none-any.whl", hash = "sha256:37a86b45efb9a47a61a36449063e8e18d0cab3161329fc099eb21783169c4f0c", size = 386536, upload-time = "2026-06-19T10:58:31.347Z" },
|
|
2540
|
+
]
|
|
2541
|
+
|
|
2542
|
+
[[package]]
|
|
2543
|
+
name = "pytest-asyncio"
|
|
2544
|
+
version = "1.4.0"
|
|
2545
|
+
source = { registry = "https://pypi.org/simple" }
|
|
2546
|
+
dependencies = [
|
|
2547
|
+
{ name = "pytest" },
|
|
2548
|
+
{ name = "typing-extensions", marker = "python_full_version < '3.13'" },
|
|
2549
|
+
]
|
|
2550
|
+
sdist = { url = "https://files.pythonhosted.org/packages/43/7c/d36d04db312ecf4298932ef77e6e4a9e8ad017906e24e34f0b0c361a2473/pytest_asyncio-1.4.0.tar.gz", hash = "sha256:c6c0d2259945122819f171a32ecea2c349ead889ee28176caaf492143424be42", size = 58514, upload-time = "2026-05-26T09:56:04.083Z" }
|
|
2551
|
+
wheels = [
|
|
2552
|
+
{ url = "https://files.pythonhosted.org/packages/03/e2/08a497ef684b88559c9cc5f4ad53a37e7b99e727094a86d6ea32536d5d3c/pytest_asyncio-1.4.0-py3-none-any.whl", hash = "sha256:933ca923a23075a87fb7070c0ec272a6848489824d887c85c812670932835aa1", size = 16930, upload-time = "2026-05-26T09:56:02.576Z" },
|
|
2553
|
+
]
|
|
2554
|
+
|
|
2495
2555
|
[[package]]
|
|
2496
2556
|
name = "python-dateutil"
|
|
2497
2557
|
version = "2.9.0.post0"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|