python-deps(deps-dev): update ruff requirement from 0.7.4 to 0.8.0 in…

… the python-dependencies group (#355) * python-deps(deps-dev): update ruff requirement Updates the requirements on [ruff](https://github.com/astral-sh/ruff) to permit the latest version. Updates `ruff` to 0.8.0 - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.7.4...0.8.0) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development dependency-group: python-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> * chore: Update dependencies. * chore: Run ruff lint/format and update code to pass checks --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tektronix Bot <GithubBot-1010@fortive.onmicrosoft.com> Co-authored-by: Felt, Nicholas <nicholas.felt@tektronix.com>
tektronix · Nov 25, 2024 · a6029da · a6029da
1 parent 644396b
commit a6029da
Show file tree

Hide file tree

Showing 13 changed files with 93 additions and 92 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -133,7 +133,7 @@ repos:
         always_run: true
         args: [audit, --json, --ignore-code=CVE-2019-8341]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: cafecb2f683a620516412e109877570ca7648cbd  # frozen: v0.7.4
+    rev: 0710b94280408eef12748cde4782972942370ad2  # frozen: v0.8.0
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

diff --git a/docs/_templates/mkdocstrings/python/readthedocs/class.html.jinja b/docs/_templates/mkdocstrings/python/readthedocs/class.html.jinja
@@ -34,8 +34,9 @@
               click {{ base.path }} href "" "{{ base.path }}"
               {% endfor %}
             </div>
-            <script>
-              let diagram = document.getElementById('mermaid-diagram-{{ class.path }}');
+            <!--suppress ES6ConvertVarToLetConst -->
+              <script>
+              var diagram = document.getElementById('mermaid-diagram-{{ class.path }}');
               diagram.innerHTML = diagram.innerHTML.replace(/click ([\w.]+) href "" "\1"/g, function(match, nodeID, offset) {
                 try {
                   const link = document.getElementById("mermaid-link-" + nodeID).href;

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -57,5 +57,5 @@ typing-extensions==4.12.2 ; python_version >= "3.8" and python_version < "4.0"
 urllib3==2.2.3 ; python_version >= "3.8" and python_version < "4.0"
 watchdog==4.0.2 ; python_version >= "3.8" and python_version < "4.0"
 wcmatch==10.0 ; python_version >= "3.8" and python_version < "4.0"
-wheel==0.45.0 ; python_version >= "3.8" and python_version < "3.9"
+wheel==0.45.1 ; python_version >= "3.8" and python_version < "3.9"
 zipp==3.20.2 ; python_version >= "3.8" and python_version < "3.10"
diff --git a/pyproject.toml b/pyproject.toml
@@ -158,7 +158,7 @@ pytest-env = "^1.1.3"
 pytest-github-report = "^0.0.1"
 pytest-html = "^4.1.1"
 pytest-order = "^1.2.1"
-ruff = "0.7.4"
+ruff = "0.8.0"
 
 [tool.poetry.scripts]
 list-visa-resources = "tm_devices:print_available_visa_devices"

diff --git a/src/tm_devices/__init__.py b/src/tm_devices/__init__.py
@@ -28,12 +28,12 @@
 
 
 __all__ = [
-    "configure_logging",
+    "PYVISA_PY_BACKEND",
+    "SYSTEM_DEFAULT_VISA_BACKEND",
     "DeviceManager",
     "LoggingLevels",
+    "SupportedModels",
+    "configure_logging",
     "print_available_visa_devices",
-    "PYVISA_PY_BACKEND",
     "register_additional_usbtmc_mapping",
-    "SupportedModels",
-    "SYSTEM_DEFAULT_VISA_BACKEND",
 ]
diff --git a/src/tm_devices/commands/__init__.py b/src/tm_devices/commands/__init__.py
@@ -89,27 +89,27 @@
     "AFG3KCommandConstants",
     "AFG3KCommands",
     "AFG3KMixin",
-    "AWG5200CommandConstants",
-    "AWG5200Commands",
-    "AWG5200Mixin",
     "AWG5KCCommandConstants",
     "AWG5KCCommands",
     "AWG5KCMixin",
     "AWG5KCommandConstants",
     "AWG5KCommands",
     "AWG5KMixin",
-    "AWG70KACommandConstants",
-    "AWG70KACommands",
-    "AWG70KAMixin",
-    "AWG70KBCommandConstants",
-    "AWG70KBCommands",
-    "AWG70KBMixin",
     "AWG7KCCommandConstants",
     "AWG7KCCommands",
     "AWG7KCMixin",
     "AWG7KCommandConstants",
     "AWG7KCommands",
     "AWG7KMixin",
+    "AWG70KACommandConstants",
+    "AWG70KACommands",
+    "AWG70KAMixin",
+    "AWG70KBCommandConstants",
+    "AWG70KBCommands",
+    "AWG70KBMixin",
+    "AWG5200CommandConstants",
+    "AWG5200Commands",
+    "AWG5200Mixin",
     "DAQ6510CommandConstants",
     "DAQ6510Commands",
     "DAQ6510Mixin",
@@ -137,6 +137,12 @@
     "DPO5KCommandConstants",
     "DPO5KCommands",
     "DPO5KMixin",
+    "DPO7KCCommandConstants",
+    "DPO7KCCommands",
+    "DPO7KCMixin",
+    "DPO7KCommandConstants",
+    "DPO7KCommands",
+    "DPO7KMixin",
     "DPO70KCCommandConstants",
     "DPO70KCCommands",
     "DPO70KCMixin",
@@ -149,12 +155,6 @@
     "DPO70KSXCommandConstants",
     "DPO70KSXCommands",
     "DPO70KSXMixin",
-    "DPO7KCCommandConstants",
-    "DPO7KCCommands",
-    "DPO7KCMixin",
-    "DPO7KCommandConstants",
-    "DPO7KCommands",
-    "DPO7KMixin",
     "DSA70KCCommandConstants",
     "DSA70KCCommands",
     "DSA70KCMixin",

diff --git a/src/tm_devices/driver_mixins/device_control/__init__.py b/src/tm_devices/driver_mixins/device_control/__init__.py
@@ -4,4 +4,4 @@
 from .rest_api_control import RESTAPIControl
 from .tsp_control import TSPControl
 
-__all__ = ["PIControl", "TSPControl", "RESTAPIControl"]
+__all__ = ["PIControl", "RESTAPIControl", "TSPControl"]
diff --git a/src/tm_devices/driver_mixins/device_control/pi_control.py b/src/tm_devices/driver_mixins/device_control/pi_control.py
@@ -305,11 +305,8 @@ def poll_query(  # noqa: PLR0913  # pylint: disable=too-many-locals
                     <= float(wanted_val) + tolerance
                 )
                 str_comparison = isinstance(wanted_val, str) and queried_value == wanted_val
-                if (
-                    not invert_range
-                    and (float_comparison or str_comparison)
-                    or invert_range
-                    and not (float_comparison or str_comparison)
+                if (not invert_range and (float_comparison or str_comparison)) or (
+                    invert_range and not (float_comparison or str_comparison)
                 ):
                     return
             time.sleep(sleep_time)

diff --git a/src/tm_devices/driver_mixins/shared_implementations/__init__.py b/src/tm_devices/driver_mixins/shared_implementations/__init__.py
@@ -8,6 +8,6 @@
     "CommonPISystemErrorCheckMixin",
     "CommonTSPErrorCheckMixin",
     "IEEE4882Commands",
-    "TSPIEEE4882Commands",
     "LegacyTSPIEEE4882Commands",
+    "TSPIEEE4882Commands",
 ]
diff --git a/src/tm_devices/drivers/__init__.py b/src/tm_devices/drivers/__init__.py
@@ -105,12 +105,10 @@
 
 
 __all__ = [
-    "SupportedModels",
     "AFG3K",
     "AFG3KB",
     "AFG3KC",
     "AFG31K",
-    "AWG5200",
     "AWG5K",
     "AWG5KB",
     "AWG5KC",
@@ -119,7 +117,15 @@
     "AWG7KC",
     "AWG70KA",
     "AWG70KB",
+    "AWG5200",
     "DAQ6510",
+    "DMM6500",
+    "DMM7510",
+    "DMM7512",
+    "DPO2K",
+    "DPO2KB",
+    "DPO4K",
+    "DPO4KB",
     "DPO5K",
     "DPO5KB",
     "DPO7K",
@@ -133,35 +139,35 @@
     "DSA70KC",
     "DSA70KD",
     "LPD6",
-    "MSO2",
-    "MSO4",
-    "MSO4B",
-    "MSO5",
-    "MSO5B",
-    "MSO5LP",
-    "MSO6",
-    "MSO6B",
-    "MSO2K",
-    "MSO2KB",
-    "DPO2K",
-    "DPO2KB",
     "MDO3",
     "MDO3K",
     "MDO4K",
     "MDO4KB",
     "MDO4KC",
+    "MSO2",
+    "MSO2K",
+    "MSO2KB",
+    "MSO4",
+    "MSO4B",
     "MSO4K",
     "MSO4KB",
-    "DPO4K",
-    "DPO4KB",
+    "MSO5",
+    "MSO5B",
     "MSO5K",
     "MSO5KB",
+    "MSO5LP",
+    "MSO6",
+    "MSO6B",
     "MSO70K",
     "MSO70KC",
     "MSO70KDX",
-    "TekScopePC",
-    "TSOVu",
-    "TMT4",
+    "PSU2200",
+    "PSU2220",
+    "PSU2230",
+    "PSU2231",
+    "PSU2231A",
+    "PSU2280",
+    "PSU2281",
     "SMU2400",
     "SMU2401",
     "SMU2410",
@@ -170,39 +176,33 @@
     "SMU2461",
     "SMU2470",
     "SMU2601A",
-    "SMU2602A",
-    "SMU2604A",
-    "SMU2611A",
-    "SMU2612A",
-    "SMU2614A",
-    "SMU2634A",
-    "SMU2635A",
-    "SMU2636A",
     "SMU2601B",
-    "SMU2601BPulse",
+    "SMU2602A",
     "SMU2602B",
+    "SMU2604A",
     "SMU2604B",
     "SMU2606B",
+    "SMU2611A",
     "SMU2611B",
+    "SMU2612A",
     "SMU2612B",
+    "SMU2614A",
     "SMU2614B",
+    "SMU2634A",
     "SMU2634B",
+    "SMU2635A",
     "SMU2635B",
+    "SMU2636A",
     "SMU2636B",
     "SMU2651A",
     "SMU2657A",
     "SMU6430",
     "SMU6514",
     "SMU6517B",
-    "PSU2200",
-    "PSU2220",
-    "PSU2230",
-    "PSU2231",
-    "PSU2231A",
-    "PSU2280",
-    "PSU2281",
-    "DMM6500",
-    "DMM7510",
-    "DMM7512",
     "SS3706A",
+    "TMT4",
+    "SMU2601BPulse",
+    "SupportedModels",
+    "TSOVu",
+    "TekScopePC",
 ]
diff --git a/src/tm_devices/helpers/__init__.py b/src/tm_devices/helpers/__init__.py
@@ -43,42 +43,42 @@
 from tm_devices.helpers.verification_functions import raise_error, raise_failure, verify_values
 
 __all__ = [
+    "PACKAGE_NAME",
+    "PYVISA_PY_BACKEND",
+    "SYSTEM_DEFAULT_VISA_BACKEND",
+    "USB_MODEL_ID_LOOKUP",
+    "VALID_DEVICE_CONNECTION_TYPES",
+    "VISA_RESOURCE_EXPRESSION_REGEX",
     "AliasDict",
     "ConfigFileType",
     "ConnectionTypes",
+    "DMConfigOptions",
+    "DeviceConfigEntry",
+    "DeviceTypes",
+    "LoadImpedanceAFG",
+    "LoggingLevels",
+    "ReadOnlyCachedProperty",
+    "SASSetWaveformFileTypes",
+    "SerialConfig",
+    "Singleton",
+    "SupportedModels",
+    "SupportedRequestTypes",
+    "USBTMCConfiguration",
     "check_for_update",
     "check_network_connection",
     "check_port_connection",
     "check_visa_connection",
     "configure_logging",
     "create_visa_connection",
     "detect_visa_resource_expression",
-    "DeviceConfigEntry",
-    "DeviceTypes",
-    "DMConfigOptions",
     "get_model_series",
     "get_version",
     "get_visa_backend",
-    "LoggingLevels",
-    "PACKAGE_NAME",
     "ping_address",
-    "PYVISA_PY_BACKEND",
     "raise_error",
     "raise_failure",
     "register_additional_usbtmc_mapping",
     "sanitize_enum",
-    "SerialConfig",
-    "Singleton",
-    "SupportedModels",
-    "SupportedRequestTypes",
-    "SYSTEM_DEFAULT_VISA_BACKEND",
-    "USB_MODEL_ID_LOOKUP",
-    "USBTMCConfiguration",
-    "VALID_DEVICE_CONNECTION_TYPES",
     "validate_address",
     "verify_values",
-    "VISA_RESOURCE_EXPRESSION_REGEX",
-    "ReadOnlyCachedProperty",
-    "SASSetWaveformFileTypes",
-    "LoadImpedanceAFG",
 ]
diff --git a/src/tm_devices/helpers/functions.py b/src/tm_devices/helpers/functions.py
@@ -527,10 +527,13 @@ def get_visa_backend(visa_lib_path: str) -> str:
             raise KeyError  # noqa: TRY301
     except KeyError:
         found_visa = False
-        for visa_type in visa_backends:
-            for visa_implementation in visa_backends[visa_type]:
-                if visa_lib_path in visa_implementation:
-                    vendor = visa_backends[visa_type][visa_implementation]["Vendor"]
+        for visa_type, visa_implementation_dict in visa_backends.items():
+            for (
+                visa_implementation_name,
+                visa_implementation_details,
+            ) in visa_implementation_dict.items():
+                if visa_lib_path in visa_implementation_name:
+                    vendor = visa_implementation_details["Vendor"]
                     visa_name = "NI-VISA" if "National Instruments" in vendor else f"{vendor} VISA"
                     found_visa = True
                 elif visa_lib_path.endswith("yaml") and visa_type == "sim":

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -38,7 +38,7 @@ pytest-order==1.3.0 ; python_version >= "3.8" and python_version < "4.0"
 python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "4.0"
 pytz==2024.2 ; python_version >= "3.8" and python_version < "4.0"
 requests==2.32.3 ; python_version >= "3.8" and python_version < "4.0"
-ruff==0.7.4 ; python_version >= "3.8" and python_version < "4.0"
+ruff==0.8.0 ; python_version >= "3.8" and python_version < "4.0"
 setuptools==75.3.0 ; python_version >= "3.8" and python_version < "4.0"
 six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
 soupsieve==2.6 ; python_version >= "3.8" and python_version < "4.0"