From 16a3d89f6eab2db0e90176a952b75ab22ac0f463 Mon Sep 17 00:00:00 2001 From: Benedikt Burger <67148916+BenediktBurger@users.noreply.github.com> Date: Tue, 30 Apr 2024 02:35:45 +0200 Subject: [PATCH 1/4] Bump codecov action version --- .github/workflows/pyleco_extras_CI.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/pyleco_extras_CI.yml b/.github/workflows/pyleco_extras_CI.yml index 0169e8a..ce1c4be 100644 --- a/.github/workflows/pyleco_extras_CI.yml +++ b/.github/workflows/pyleco_extras_CI.yml @@ -67,11 +67,9 @@ jobs: - name: Test for Coverage run: pytest --cov=pyleco_extras --cov-report=xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} - directory: ./coverage/reports/ - # env_vars: OS,PYTHON fail_ci_if_error: true files: ./coverage.xml,!./cache flags: unittests From ea3de883b9ee0089256634060e775122d200a912 Mon Sep 17 00:00:00 2001 From: Benedikt Burger <67148916+BenediktBurger@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:49:51 +0200 Subject: [PATCH 2/4] Adjust readme to changed names. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c2e0c91..d3c507d 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,8 @@ That removes the need to create a director for a specific instrument, but offers ### Trinamic Motor Cards -The `actors.motor_controller` offers an Actor for Trinamic motor cards. -The `directors.motor_director` offers the corresponding Director, which can be used as an in-place replacement for trinamic motor cards objects of the [pytrinamic](https://github.com/trinamic/PyTrinamic) project. +The `actors.tmc_motor_actor` offers an Actor for Trinamic motor cards. +The `directors.tmc_motor_director` offers the corresponding Director, which can be used as an in-place replacement for trinamic motor cards objects of the [pytrinamic](https://github.com/trinamic/PyTrinamic) project. ## Tools From 1e2ae7a49fb909f135a5261f79c9fffd153f2e62 Mon Sep 17 00:00:00 2001 From: Benedikt Burger <67148916+BenediktBurger@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:58:52 +0200 Subject: [PATCH 3/4] Fix CI errors --- .github/environment.yml | 2 +- .github/workflows/pyleco_extras_CI.yml | 2 +- codecov.yml | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/environment.yml b/.github/environment.yml index 3f92121..8b0811b 100644 --- a/.github/environment.yml +++ b/.github/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - pyzmq=25.1.2 - - pymeasure=0.13.1 + - pymeasure=0.14.0 - pip # don't pin, to gain newest conda compatibility fixes - pip: - jsonrpc2-pyclient==4.3.0 diff --git a/.github/workflows/pyleco_extras_CI.yml b/.github/workflows/pyleco_extras_CI.yml index ce1c4be..8181b8e 100644 --- a/.github/workflows/pyleco_extras_CI.yml +++ b/.github/workflows/pyleco_extras_CI.yml @@ -99,7 +99,7 @@ jobs: - name: Install mypy run: pip install mypy - name: Run mypy - run: mypy -p pyleco_extras + run: mypy pyleco_extras tests test: name: Python ${{ matrix.python-version }}, ${{ matrix.os }} diff --git a/codecov.yml b/codecov.yml index 6f566fe..35cde5c 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,8 +1,4 @@ coverage: status: project: off - default: - # basic - target: auto - threshold: 0.1% # allows a small drop of coverage for flaky tests patch: off From 469d40e77f6fd732dba675ec5d76fdb6830b72e6 Mon Sep 17 00:00:00 2001 From: Benedikt Burger <67148916+BenediktBurger@users.noreply.github.com> Date: Wed, 19 Jun 2024 15:23:04 +0200 Subject: [PATCH 4/4] Fix typing --- pyleco_extras/gui/data_logger/data/plot_widget.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyleco_extras/gui/data_logger/data/plot_widget.py b/pyleco_extras/gui/data_logger/data/plot_widget.py index 0ba33c2..6c7ec79 100644 --- a/pyleco_extras/gui/data_logger/data/plot_widget.py +++ b/pyleco_extras/gui/data_logger/data/plot_widget.py @@ -6,7 +6,7 @@ import logging import math -from typing import Any, Iterable, Protocol, Optional +from typing import Any, Iterable, Protocol, Optional, Union import numpy as np import pint @@ -29,7 +29,7 @@ def get_xy_data( x_key: Optional[str] = None, start: Optional[int] = None, stop: Optional[int] = None, - ) -> tuple[list[float]] | tuple[list[float], list[float]]: ... + ) -> Union[tuple[list[float]], tuple[list[float], list[float]]]: ... def get_data_keys(self) -> Iterable[str]: ...