Merge pull request #21 from rambo/deps_update

rambo · web-flow · commit fa2a8db0fe9c · 2025-01-07T15:26:06.000+02:00
Update deps and remove loop param from create_connection
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.4.0
+current_version = 2.5.0
 commit = False
 tag = False
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,10 +1,10 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 default_language_version:
-    python: python3.7
+    python: python3
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.4.0
+    rev: v4.5.0
     hooks:
     -   id: no-commit-to-branch
     -   id: check-executables-have-shebangs
@@ -22,41 +22,52 @@ repos:
         args:
         - --autofix
 -   repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 24.1.1
     hooks:
     -   id: black
-        language_version: python3.7
+        language_version: python3
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.800
+    rev: v1.8.0
     hooks:
     -   id: mypy
         language: system
-        args: [--strict] #, --ignore-missing-imports]
--   repo: https://github.com/pre-commit/mirrors-pylint
-    rev: v2.4.4
+        args: ["--strict"]
+-   repo: https://github.com/pycqa/pylint
+    rev: v3.0.3
     hooks:
     -   id: pylint
         language: system
 -   repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.1.7
+    rev: v1.5.4
     hooks:
     -   id: forbid-crlf
     -   id: remove-crlf
     -   id: forbid-tabs
     -   id: remove-tabs
 -   repo: https://github.com/PyCQA/bandit
-    rev: 1.6.2
+    rev: 1.7.7
     hooks:
     - id: bandit
       args: ["--skip=B101"]
--   repo: git://github.com/Lucas-C/pre-commit-hooks-markup
-    rev: v1.0.0
+-   repo: https://github.com/Lucas-C/pre-commit-hooks-markup
+    rev: v1.0.1
     hooks:
     -   id: rst-linter
 -   repo: https://github.com/Yelp/detect-secrets
-    rev: v1.0.3
+    rev: v1.4.0
     hooks:
     -   id: detect-secrets
         language: system
         exclude: "poetry.lock"
         # args: ['--baseline', '.secrets.baseline']
+-   repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.9.0.6
+    hooks:
+    -   id: shellcheck
+        args: ["--external-sources"]
+-   repo: https://github.com/python-poetry/poetry
+    rev: '1.7.1'
+    hooks:
+    -   id: poetry-check
+    -   id: poetry-lock
+        args: ["--no-update"]
diff --git a/examples/hp6632b_serial.py b/examples/hp6632b_serial.py
@@ -7,6 +7,8 @@
 from scpi.devices import hp6632b
 from scpi.wrapper import AIOWrapper
 
+# pylint: disable=R0801
+
 if __name__ == "__main__":
     if len(sys.argv) < 2:
         print(f"run with python -i {__file__} /dev/ttyUSB0")
diff --git a/examples/multimeter_tcp.py b/examples/multimeter_tcp.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+"""Example/test script for using the Generic multimeter via TCP"""
+import atexit
+import os
+import sys
+
+from scpi.transports import TCPTransport
+from scpi.devices.generic import MultiMeter
+from scpi.wrapper import AIOWrapper
+
+# pylint: disable=R0801
+
+if __name__ == "__main__":
+    if len(sys.argv) < 3:
+        print(f"run with python -i {__file__} IP PORT")
+        sys.exit(1)
+    # Then put to interactive mode
+    os.environ["PYTHONINSPECT"] = "1"
+    xport = TCPTransport(ipaddr=sys.argv[1], port=int(sys.argv[2]))
+    aiodev = MultiMeter(xport)
+    dev = AIOWrapper(aiodev)
+
+    atexit.register(dev.quit)
+
+    print(dev.identify())
diff --git a/examples/prologix_usb.py b/examples/prologix_usb.py
@@ -10,6 +10,8 @@
 from scpi.devices.hp6632b import HP6632B
 from scpi.devices.generic import MultiMeter
 
+# pylint: disable=R0801
+
 if __name__ == "__main__":
     if len(sys.argv) < 2:
         print(f"run with python -i {__file__} /dev/ttyUSB0")
diff --git a/examples/tdklambda_tcp.py b/examples/tdklambda_tcp.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """
 Created on febrary 21 2020.
 
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "scpi"
-version = "2.4.0"
+version = "2.5.0"
 description = "Basic idea here is to make transport-independent command sender/parser and a device baseclass that implements the common SCPI commands"
 authors = ["Eero af Heurlin <eero.afheurlin@iki.fi>"]
 homepage = "https://github.com/rambo/python-scpi/"
@@ -37,28 +37,28 @@ addopts="--cov=scpi --cov-branch"
 max-line-length = 120
 
 [tool.pylint.messages_control]
-disable=["fixme", "W1202", "C0330"]
+disable=["fixme", "W1202", "C0209"]
 
 [tool.coverage.run]
 omit = ["tests/*"]
 branch = true
 
 [tool.poetry.dependencies]
-python = "^3.6"
+python = "^3.9"
 pyserial = "^3.4"
 
 [tool.poetry.dev-dependencies]
-pytest = "^6.2"
-coverage = {version = "^5.4", extras = ["toml"]}
-pytest-cov = "^2.11"
-pylint = "^2.5"
-black = "=20.8b1"
-bandit = "^1.6"
-mypy = "^0.800"
-pre-commit = "^1.20"
-pytest-asyncio = "^0.14"
+pytest = "^8.0"
+coverage = "^7.4"
+pytest-cov = "^4.1"
+pylint = "^3.0"
+black = "^24.1"
+bandit = "^1.7"
+mypy = "^1.8"
+pre-commit = "^3.6"
+pytest-asyncio = ">=0.21,<1.0" # caret behaviour on 0.x is to lock to 0.x.*
 bump2version = "^1.0"
-detect-secrets = "^1.0"
+detect-secrets = "^1.4"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
diff --git a/src/scpi/__init__.py b/src/scpi/__init__.py
@@ -1,6 +1,7 @@
 """SCPI module, the scpi class implements the base command set, devices may extend it.
 transports are separate from devices (so you can use for example hp6632b with either serial port or GPIB)"""
-__version__ = "2.4.0"  # NOTE Use `bump2version --config-file patch` to bump versions correctly
+
+__version__ = "2.5.0"  # NOTE Use `bump2version --config-file patch` to bump versions correctly
 from .scpi import SCPIProtocol, SCPIDevice
 from .errors import CommandError
 
diff --git a/src/scpi/devices/TDKLambdaZPlus.py b/src/scpi/devices/TDKLambdaZPlus.py
@@ -1,4 +1,5 @@
 """TDK Lambda power supplies"""
+
 # pylint: disable=C0103
 from typing import Optional, Union, Any
 from dataclasses import dataclass, field
@@ -256,7 +257,7 @@ def tcp(ipaddr: str, port: int) -> TDKLambdaZplus:
 
 
 def serial(serial_url: str, baudrate: int = 9600) -> TDKLambdaZplus:
-    """ Quick helper to connect via serial """
+    """Quick helper to connect via serial"""
     port = pyserial.serial_for_url(
         serial_url,
         baudrate=baudrate,
diff --git a/src/scpi/devices/generic.py b/src/scpi/devices/generic.py
@@ -1,4 +1,5 @@
 """Mixins for different device functionalities"""
+
 import decimal
 
 from ..scpi import SCPIDevice
diff --git a/src/scpi/devices/hp6632b.py b/src/scpi/devices/hp6632b.py
@@ -1,4 +1,5 @@
 """HP/Agilent 3362B specific device implementation and helpers"""
+
 from typing import Any
 import logging
 import decimal
diff --git a/src/scpi/errors/__init__.py b/src/scpi/errors/__init__.py
@@ -1,4 +1,5 @@
 """SCPI module specific errors"""
+
 from typing import Any
 
 
diff --git a/src/scpi/scpi.py b/src/scpi/scpi.py
@@ -1,4 +1,5 @@
 """Generic SCPI commands, allow sending and reading of raw data, helpers to parse information"""
+
 from typing import Any, Tuple, Sequence, Union, Optional, cast
 import asyncio
 import re
@@ -14,6 +15,7 @@
 ERROR_RE = re.compile(r'([+-]?\d+),"(.*?)"')
 LOGGER = logging.getLogger(__name__)
 
+
 # FIXME rename to mixin and use as such
 class BitEnum:  # pylint: disable=R0903
     """Baseclass for bit definitions of various status registers"""
@@ -234,7 +236,7 @@ async def _ask(command: str) -> str:
             if auto_check_error:
                 await self.check_error(command)
             if abort_on_timeout:
-                self.abort_command()
+                await self.abort_command()
             # re-raise the timeout if no other error found
             raise err
         except asyncio.CancelledError:
diff --git a/src/scpi/transports/__init__.py b/src/scpi/transports/__init__.py
@@ -1,3 +1,6 @@
 """Transport layers for the SCPI module"""
+
 from .rs232 import RS232Transport
 from .tcp import TCPTransport
+
+__all__ = ["RS232Transport", "TCPTransport"]
diff --git a/src/scpi/transports/baseclass.py b/src/scpi/transports/baseclass.py
@@ -2,6 +2,7 @@
 
 All transports must define certain basic methods (check all the raise NotImplementedError)
 """
+
 from typing import Optional, Callable
 import asyncio
 import logging
@@ -18,7 +19,7 @@ class AbstractTransport(ABC):  # pylint: disable=R0903
     the low-level transport methods"""
 
 
-@dataclass  # type: ignore # there's something weird with dataclasses and ABCs
+@dataclass
 class BaseTransport(AbstractTransport, ABC):
     """Baseclass for SCPI tranport layers, abstracts away details, must be subclasses to implement"""
 
diff --git a/src/scpi/transports/gpib/__init__.py b/src/scpi/transports/gpib/__init__.py
@@ -1,4 +1,5 @@
 """GPIB related transports"""
+
 from .base import GPIBDeviceTransport, GPIBTransport
 
 __all__ = ["GPIBDeviceTransport", "GPIBTransport"]
diff --git a/src/scpi/transports/gpib/base.py b/src/scpi/transports/gpib/base.py
@@ -1,4 +1,5 @@
 """GPIB Related baseclasses"""
+
 from __future__ import annotations
 from typing import Optional, Tuple, Sequence, Union
 from abc import ABC, abstractmethod
diff --git a/src/scpi/transports/gpib/prologix.py b/src/scpi/transports/gpib/prologix.py
@@ -1,4 +1,5 @@
 """"Driver" for http://prologix.biz/gpib-usb-controller.html GPIB controller"""
+
 from typing import Optional, Sequence, List, Any, Tuple, cast
 import asyncio
 import logging
@@ -77,6 +78,7 @@ async def _send_and_read(send: str) -> str:
             async with self.lock:
                 response: Optional[str] = None
 
+                # pylint: disable=R0801
                 def set_response(message: str) -> None:
                     """Callback for setting the response"""
                     nonlocal response, self
diff --git a/src/scpi/transports/rs232.py b/src/scpi/transports/rs232.py
@@ -1,4 +1,5 @@
 """Serial port transport layer"""
+
 from __future__ import annotations
 from typing import Optional, Any, Dict, cast
 import asyncio
@@ -58,6 +59,7 @@ async def get_response(self) -> str:
         async with self.lock:
             response: Optional[str] = None
 
+            # pylint: disable=R0801
             def set_response(message: str) -> None:
                 """Callback for setting the response"""
                 nonlocal response, self
diff --git a/src/scpi/transports/tcp.py b/src/scpi/transports/tcp.py
@@ -1,4 +1,5 @@
 """TCP based transport"""
+
 from typing import Optional
 import asyncio
 from dataclasses import dataclass, field
@@ -22,7 +23,7 @@ class TCPTransport(BaseTransport):
 
     async def open_connection(self, ipaddr: str, port: int) -> None:
         """Open a connection (also update the IP/port)"""
-        self.reader, self.writer = await asyncio.open_connection(ipaddr, port, loop=asyncio.get_event_loop())
+        self.reader, self.writer = await asyncio.open_connection(ipaddr, port)
         self.ipaddr = ipaddr
         self.port = port
 
diff --git a/src/scpi/wrapper.py b/src/scpi/wrapper.py
@@ -1,4 +1,5 @@
 """Helper class to allow using of device in traditional blocking style without having to deal with the ioloop"""
+
 from typing import Any
 import asyncio
 import functools
diff --git a/tests/test_scpi.py b/tests/test_scpi.py
@@ -1,7 +1,8 @@
 """Package level tests"""
+
 from scpi import __version__
 
 
 def test_version() -> None:
     """Make sure version matches expected"""
-    assert __version__ == "2.4.0"
+    assert __version__ == "2.5.0"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#!/usr/bin/env python3`
`1`	`2`	`"""`
`2`	`3`	`Created on febrary 21 2020.`
`3`	`4`