2024.1.2

.copier-answers.yml

@@ -9,6 +9,6 @@ project_email: [email protected]
 project_name: boilerdaq
 project_owner_github_username: softboiler
 project_owner_name: Blake Naccarato
-project_version: 2024.1.1
+project_version: 2024.1.2
 python_version: '3.11'
 year_of_project_creation: 2023

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -13,10 +13,10 @@ body:
     id: "latest-version"
     attributes:
       label: "Please confirm that this bug affects the latest version"
-      description: "Please verify the issue is present in the latest version by installing it with `pip install boilerdaq==2024.1.1` and checking that the bug is still there"
+      description: "Please verify the issue is present in the latest version by installing it with `pip install boilerdaq==2024.1.2` and checking that the bug is still there"
       options:
         - required: True
-          label: "This bug affects version `2024.1.1` of `boilerdaq`."
+          label: "This bug affects version `2024.1.2` of `boilerdaq`."
   - type: "checkboxes"
     id: "operating-systems"
     attributes:

.github/issue_template.md

@@ -10,9 +10,9 @@ Please apply the `bug` label
 
 ### Please confirm that this bug affects the latest version
 
-<!-- Please verify the issue is present in the latest version by installing it with `pip install boilerdaq==2024.1.1` and checking that the bug is still there #} -->
+<!-- Please verify the issue is present in the latest version by installing it with `pip install boilerdaq==2024.1.2` and checking that the bug is still there #} -->
 
-- [ ] This bug affects version `2024.1.1` of `boilerdaq`.
+- [ ] This bug affects version `2024.1.2` of `boilerdaq`.
 
 ### Please indicate which operating system(s) you are using
 

CHANGELOG.md

@@ -14,6 +14,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 
 <!-- towncrier release notes start -->
 
+## [2024.1.2](https://github.com/softboiler/boilerdaq/tree/2024.1.2)
+
+### Changes
+
+Sign releases from now on.
+
 ## [2024.1.1](https://github.com/softboiler/boilerdaq/tree/2024.1.1)
 
 ### Changes

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "boilerdaq"
-version = "2024.1.1"
+version = "2024.1.2"
 description = "Data acquisition for a nucleate pool boiling experimental apparatus"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -22,6 +22,7 @@ classifiers = [
     # "Programming Language :: Python :: 3.14",  # ? Unreleased (https://peps.python.org/pep-0745)
 ]
 dependencies = [
+    "boilercore>=2024.1.3",
     "libusb>=1.0.27",
     "mcculw>=1.0.0",
     "pandas[hdf5,performance]>=2.2.0",
@@ -52,8 +53,10 @@ ignore_errors = true
 [tool.fawltydeps]
 deps = ["pyproject.toml"]
 code = ["src"]
-ignore_undeclared = ["boilercore", "PySide6"]
+ignore_undeclared = ["PySide6"]
 ignore_unused = ["libusb", "pyusb", "pyvisa-py", "pyvisa-sim", "zeroconf"]
+[tool.fawltydeps.custom_mapping]
+boilercore = ["boilercore"]
 
 [tool.pytest.ini_options]
 addopts = '''

requirements/dev.in

@@ -2,7 +2,6 @@
 --editable docs/
 --editable scripts/
 --editable tests/
---editable submodules/boilercore
 debugpy==1.8.2
 dvc[gs]==3.51.2
 fawltydeps==0.16.0

requirements/override.txt

@@ -1 +1,2 @@
+--editable submodules/boilercore
 cachier @ git+https://github.com/blakeNaccarato/cachier@db7f394a553a90944ca25c2d687771006e77a024

scripts/boilerdaq_tools/sync.py

@@ -20,20 +20,21 @@
 """Requirements."""
 DEV = REQS / "dev.in"
 """Other development tools and editable local dependencies."""
+OVERRIDES = REQS / "override.txt"
+"""Overrides to satisfy otherwise incompatible combinations."""
+NODEPS = REQS / "nodeps.in"
+"""Path to dependencies which should not have their transitive dependencies compiled."""
 DEPS = (
     DEV,
     *[
         Path(editable["path"]) / "pyproject.toml"
         for editable in finditer(
-            r"(?m)^(?:-e|--editable)\s(?P<path>.+)$", DEV.read_text("utf-8")
+            r"(?m)^(?:-e|--editable)\s(?P<path>.+)$",
+            "".join([path.read_text("utf-8") for path in [DEV, OVERRIDES, NODEPS]]),
         )
     ],
 )
 """Paths to compile dependencies for."""
-OVERRIDES = REQS / "override.txt"
-"""Overrides to satisfy otherwise incompatible combinations."""
-NODEPS = REQS / "nodeps.in"
-"""Path to dependencies which should not have their transitive dependencies compiled."""
 REQUIREMENTS = REQS / "requirements.txt"
 """Requirements."""
 

src/boilerdaq/daq.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 from tempfile import NamedTemporaryFile
 from textwrap import dedent
-from typing import Any, NamedTuple, Self
+from typing import TYPE_CHECKING, Any, NamedTuple, Self
 from warnings import warn
 
 from boilercore.fits import fit_from_params
@@ -23,12 +23,17 @@
     mkQApp,
     setConfigOptions,
 )
-from PySide6.QtCore import Qt, QTimer, Signal
-from PySide6.QtGui import QKeyEvent
 from pyvisa import ResourceManager, VisaIOError
 from pyvisa.resources import MessageBasedResource
 from simple_pid import PID
 
+if TYPE_CHECKING:
+    from PySide6.QtCore import Qt, QTimer, Signal
+    from PySide6.QtGui import QKeyEvent
+else:
+    from pyqtgraph.Qt.QtCore import Qt, QTimer, Signal
+    from pyqtgraph.Qt.QtGui import QKeyEvent
+
 try:
     try:
         from mcculw.enums import InterfaceType

tests/pyproject.toml

@@ -12,6 +12,8 @@ dependencies = [
     "pytest-custom-exit-code==0.3.0",
     "pytest-github-actions-annotate-failures==0.2.0",
     "pytest==8.2.2",
+    # ? Other testing
+    "boilercore>=2024.1.3",
 ]
 
 [tool.fawltydeps]
@@ -21,7 +23,6 @@ ignore_undeclared = [
     "boilerdaq_docs",
     "boilerdaq_tests",
     "boilerdaq_tools",
-    "boilercore",
     "boilerdaq",
     "PySide6",
 ]
@@ -33,3 +34,5 @@ ignore_unused = [
     "pytest",
     "pytest-qt",
 ]
+[tool.fawltydeps.custom_mapping]
+boilercore = ["boilercore"]