From a4fb53030e4422bf4f429e284d31e69f021fe835 Mon Sep 17 00:00:00 2001 From: blakeNaccarato Date: Fri, 5 Jul 2024 15:45:31 -0700 Subject: [PATCH] 2024.1.2 --- .copier-answers.yml | 2 +- .github/ISSUE_TEMPLATE/bug-report.yaml | 4 ++-- .github/issue_template.md | 4 ++-- CHANGELOG.md | 6 ++++++ pyproject.toml | 7 +++++-- requirements/dev.in | 1 - requirements/override.txt | 1 + scripts/boilerdaq_tools/sync.py | 11 ++++++----- src/boilerdaq/daq.py | 11 ++++++++--- tests/pyproject.toml | 5 ++++- 10 files changed, 35 insertions(+), 17 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index f1aa3b8..7081682 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -9,6 +9,6 @@ project_email: blake.naccarato@gmail.com 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 diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml index fbcd3b8..d974dbc 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yaml +++ b/.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: diff --git a/.github/issue_template.md b/.github/issue_template.md index 73d0e84..672e8f3 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -10,9 +10,9 @@ Please apply the `bug` label ### Please confirm that this bug affects the latest version - + -- [ ] 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 00916b2..f992e2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) +## [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 diff --git a/pyproject.toml b/pyproject.toml index e6aa997..ddba389 100644 --- a/pyproject.toml +++ b/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 = ''' diff --git a/requirements/dev.in b/requirements/dev.in index bcf0f1c..88b8843 100644 --- a/requirements/dev.in +++ b/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 diff --git a/requirements/override.txt b/requirements/override.txt index 9d282de..708edf2 100644 --- a/requirements/override.txt +++ b/requirements/override.txt @@ -1 +1,2 @@ +--editable submodules/boilercore cachier @ git+https://github.com/blakeNaccarato/cachier@db7f394a553a90944ca25c2d687771006e77a024 diff --git a/scripts/boilerdaq_tools/sync.py b/scripts/boilerdaq_tools/sync.py index add3035..e784a13 100644 --- a/scripts/boilerdaq_tools/sync.py +++ b/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.+)$", DEV.read_text("utf-8") + r"(?m)^(?:-e|--editable)\s(?P.+)$", + "".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.""" diff --git a/src/boilerdaq/daq.py b/src/boilerdaq/daq.py index 9b83cbe..04ed352 100644 --- a/src/boilerdaq/daq.py +++ b/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 diff --git a/tests/pyproject.toml b/tests/pyproject.toml index 1c08bcc..5802842 100644 --- a/tests/pyproject.toml +++ b/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"]