fix: merge

Signed-off-by: qthompso <[email protected]>

.github/workflows/sbom-scan.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           subject-path: ${{ github.event.repository.name }}-sbom.spdx.json
       - name: Scan SBOM
-        uses: anchore/scan-action@v3
+        uses: anchore/scan-action@v4
         id: scan
         with:
           sbom: ${{ github.event.repository.name }}-sbom.spdx.json

.pre-commit-config.yaml

@@ -142,7 +142,7 @@ repos:
         always_run: true
         args: [audit, --json, --ignore-code=CVE-2019-8341]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.1
+    rev: v0.5.2
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

docs/advanced/signal_generators.md

@@ -76,7 +76,7 @@ Each of these source channel classes (
 (or the [IAFG](default:IAFG) in the case of an oscilloscope).
 
 These source channel classes contain methods and properties that pertain to [PI](default:PI) commands, which only apply changes to one output.
-For example: the `afg.source_channel\["SOURCE1"\].set_amplitude()` call will change the amplitude only for source output 1.
+For example: the `afg.source_channel["SOURCE1"].set_amplitude()` call will change the amplitude only for source output 1.
 
 !!! tip
 
@@ -129,7 +129,7 @@ make sure that the parameters you will be supplying
 are not outside the bounds. The method only requires the desired waveform function (except on [AWGs](default:AWG)) to be provided.
 However, different aspects may need to be provided to get a more accurate representation of what can actually be generated.
 If no other inputs are provided, the smallest range of the attribute is chosen.
-An [AWG's](default:AWG) signal path affects the range of the offset and amplitude.
+For an [AWG](default:AWG), the signal path affects the range of the offset and amplitude.
 Higher frequencies on [AFGs](default:AFG) will lower the upper bound of the amplitude,
 alongside which impedance is set.
 

docs/requirements.txt

@@ -41,7 +41,7 @@ python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "4.0
 pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "4.0"
 pyyaml-env-tag==0.1 ; python_version >= "3.8" and python_version < "4.0"
 requests==2.32.3 ; python_version >= "3.8" and python_version < "4.0"
-setuptools==70.2.0 ; python_version >= "3.8" and python_version < "4.0"
+setuptools==70.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.5 ; python_version >= "3.8" and python_version < "4.0"
 symspellpy==6.7.7 ; python_version >= "3.8" and python_version < "4.0"

mkdocs.yml

@@ -73,7 +73,6 @@ plugins:
   - search:
       prebuild_index: true
   - include-markdown
-  - mermaid2
   - section-index
   - autorefs
   - macros:
@@ -91,6 +90,7 @@ plugins:
       use_default: true
       inline_refs: none
       markdown_links: true
+  - mermaid2
   - mkdocstrings:  # additional customization takes place in docs/generate_api_pages.py
       # noinspection YAMLIncompatibleTypes
       enabled: !ENV [TM_DEVICES_API_GENERATION, true]

pyproject.toml

@@ -112,10 +112,10 @@ pre-commit = [
 pre-commit-update = "^0.3.0"
 pyclean = "^3.0.0"
 pylint = "3.2.5"
-pyright = "1.1.370"
+pyright = "1.1.371"
 pyroma = "^4.2"
 python-semantic-release = "^9.6.0"
-ruff = "0.5.1"
+ruff = "0.5.2"
 safety = "^3.2.0"
 toml-sort = "^0.23.0"
 tox = "^4.0"
@@ -159,7 +159,7 @@ pytest-env = "^1.1.3"
 pytest-github-report = "^0.0.1"
 pytest-html = "^4.1.1"
 pytest-order = "^1.2.1"
-ruff = "0.5.1"
+ruff = "0.5.2"
 tomli = "^2.0.1"
 
 [tool.poetry.scripts]

tests/requirements.txt

@@ -5,12 +5,12 @@ chardet==5.2.0 ; python_version >= "3.8" and python_version < "4.0"
 charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "4.0"
 click==8.1.7 ; python_version >= "3.8" and python_version < "4.0"
 colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0"
-coverage==7.5.4 ; python_version >= "3.8" and python_version < "4.0"
+coverage==7.6.0 ; python_version >= "3.8" and python_version < "4.0"
 coverage-conditional-plugin==0.9.0 ; python_version >= "3.8" and python_version < "4.0"
-coverage[toml]==7.5.4 ; python_version >= "3.8" and python_version < "4.0"
+coverage[toml]==7.6.0 ; python_version >= "3.8" and python_version < "4.0"
 dataproperty==1.0.1 ; python_version >= "3.8" and python_version < "4.0"
 dnspython==2.6.1 ; python_version >= "3.8" and python_version < "4.0"
-exceptiongroup==1.2.1 ; python_version >= "3.8" and python_version < "3.11"
+exceptiongroup==1.2.2 ; python_version >= "3.8" and python_version < "3.11"
 flask==3.0.3 ; python_version >= "3.8" and python_version < "4.0"
 future-fstrings==1.2.0 ; python_version >= "3.8" and python_version < "4.0"
 http-server-mock==1.7 ; python_version >= "3.8" and python_version < "4.0"
@@ -38,8 +38,8 @@ pytest-order==1.2.1 ; 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.1 ; python_version >= "3.8" and python_version < "4.0"
 requests==2.32.3 ; python_version >= "3.8" and python_version < "4.0"
-ruff==0.5.1 ; python_version >= "3.8" and python_version < "4.0"
-setuptools==70.2.0 ; python_version >= "3.8" and python_version < "4.0"
+ruff==0.5.2 ; python_version >= "3.8" and python_version < "4.0"
+setuptools==70.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.5 ; python_version >= "3.8" and python_version < "4.0"
 tabledata==1.3.3 ; python_version >= "3.8" and python_version < "4.0"