Skip to content

Commit

Permalink
pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
lobis committed Jun 19, 2023
1 parent 2ae7e34 commit 46bbabd
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ dmypy.json
.idea/
.vscode/

node_modules/
node_modules/
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10 changes: 8 additions & 2 deletions src/hvps/commands/caen/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
from __future__ import annotations
import re

from src.hvps.commands.caen.module import _get_mon_module_command, _get_set_module_command
from src.hvps.commands.caen.channel import _get_mon_channel_command, _get_set_channel_command
from src.hvps.commands.caen.module import (
_get_mon_module_command,
_get_set_module_command,
)
from src.hvps.commands.caen.channel import (
_get_mon_channel_command,
_get_set_channel_command,
)

import logging

Expand Down
5 changes: 4 additions & 1 deletion src/hvps/commands/iseg/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
from __future__ import annotations
import re

from src.hvps.commands.iseg.channel import _get_set_channel_command, _get_mon_channel_command
from src.hvps.commands.iseg.channel import (
_get_set_channel_command,
_get_mon_channel_command,
)

import logging

Expand Down
4 changes: 3 additions & 1 deletion src/hvps/commands/iseg/channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ def _get_mon_channel_command(channel: int, parameter: str) -> bytes:
pass


def _get_set_channel_command(channel: int, parameter: str, value: str | int | float | None) -> bytes:
def _get_set_channel_command(
channel: int, parameter: str, value: str | int | float | None
) -> bytes:
# TODO: implement
pass
5 changes: 4 additions & 1 deletion src/hvps/devices/channel.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import serial

from src.hvps.commands.caen.channel import _get_set_channel_command, _get_mon_channel_command
from src.hvps.commands.caen.channel import (
_get_set_channel_command,
_get_mon_channel_command,
)
from src.hvps.commands.caen import _parse_response

from time import sleep
Expand Down
1 change: 1 addition & 0 deletions tests/test_caen.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

# find a way to only run these tests if a serial port connection exists


@pytest.mark.skip(reason="Needs fixing")
def test_caen_no_connection():
with pytest.raises(Exception):
Expand Down
6 changes: 5 additions & 1 deletion tests/test_caen_commands.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import pytest

from hvps.commands.caen import _parse_response, _get_set_module_command, _get_mon_module_command
from hvps.commands.caen import (
_parse_response,
_get_set_module_command,
_get_mon_module_command,
)


def test_caen_module_get_commands():
Expand Down

0 comments on commit 46bbabd

Please sign in to comment.