Skip to content
This repository has been archived by the owner on Nov 13, 2024. It is now read-only.

Commit

Permalink
Merge pull request #10 from BenediktBurger/fix-ci
Browse files Browse the repository at this point in the history
Fix CI errors
  • Loading branch information
BenediktBurger authored Jun 19, 2024
2 parents ea3de88 + 469d40e commit b46492e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pyleco_extras_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 0 additions & 4 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions pyleco_extras/gui/data_logger/data/plot_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]: ...

Expand Down

0 comments on commit b46492e

Please sign in to comment.