Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
displayName: 'Upgrade pip'

- script: |
python -m pip install --upgrade tox
python -m pip install --upgrade "tox<4" "virtualenv<20.22"
displayName: 'Install or upgrade tox'

- task: PowerShell@2
Expand All @@ -32,7 +32,7 @@ jobs:
arguments: '-VersionToActivate old'

- script: |
tox -- older
python -m tox -- older
displayName: 'Run python unit tests with older version of TestStand/TSM'

- task: PowerShell@2
Expand All @@ -43,7 +43,7 @@ jobs:
arguments: '-VersionToActivate new'

- script: |
tox -- newer
python -m tox -- newer
displayName: 'Run python unit tests with newer version of TestStand/TSM'

- task: PublishTestResults@2
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.black]
line-length = 100
target-version = ["py36", "py37", "py38"]
target-version = ["py36", "py37", "py38", "py311"]
extend-exclude = "^/src/nitsm/_pinmapinterfaces.py"

[tool.ni-python-styleguide]
Expand All @@ -23,7 +23,7 @@ markers = [
legacy_tox_ini = """
[tox]
isolated_build = True
envlist = clean, py3{6,7,8}-tests, py3{6,7,8}-systemtests, report
envlist = clean, py3{6,7,8,11}-tests, py3{6,7,8,11}-systemtests, report

[testenv]
deps =
Expand Down
1 change: 1 addition & 0 deletions src/nitsm/tsmcontext.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""TSM Context Wrapper"""

import ctypes.wintypes
import time
import typing
Expand Down
6 changes: 3 additions & 3 deletions systemtests/nidigital_codemodules.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ def measure_ppmu(
for session, pin_set_string in zip(sessions, pin_set_strings):
# call some methods on the session to ensure no errors
session.pins[pin_set_string].ppmu_aperture_time = 4e-6
session.pins[
pin_set_string
].ppmu_aperture_time_units = nidigital.PPMUApertureTimeUnits.SECONDS
session.pins[pin_set_string].ppmu_aperture_time_units = (
nidigital.PPMUApertureTimeUnits.SECONDS
)
session.pins[pin_set_string].ppmu_output_function = nidigital.PPMUOutputFunction.CURRENT
session.pins[pin_set_string].ppmu_current_level_range = 2e-6
session.pins[pin_set_string].ppmu_current_level = 2e-6
Expand Down
2 changes: 1 addition & 1 deletion tests/test_custom_instruments.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

@pytest.fixture
def simulated_custom_instrument_sessions(standalone_tsm_context):
(instrument_names, channel_group_ids, _) = standalone_tsm_context.get_custom_instrument_names(
instrument_names, channel_group_ids, _ = standalone_tsm_context.get_custom_instrument_names(
TestCustomInstruments.pin_map_instrument_type_id
)
sessions = tuple(range(len(instrument_names)))
Expand Down
Loading