Skip to content
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
steps:
# The local wheel installation and single environment would have made using tox-system_tests.ini difficult.
# To keep things simple, we just use pip and pytest directly for a single Python version.
- run: py -3.12 -m venv --clear .venv
- run: py -3.13 -m venv --clear .venv
shell: powershell
- run: |
.venv\Scripts\Activate.ps1
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ matrix:
include:
# We run tests on the latest supported version of Python first.
# This is where additional tests are run so we give it more time.
- python: "3.12"
- python: "3.13"
- python: "3.9"
- python: "3.10"
- python: "3.11"
- python: "3.12"

install:
- travis_retry sudo apt-get -y install python3-pip
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ All notable changes to this project will be documented in this file.
## Unreleased
* ### ALL
* #### Added
* Support for Python 3.13
* #### Changed
* Fix [#2069](https://github.com/ni/nimi-python/issues/2069)
* #### Removed
Expand All @@ -52,6 +53,8 @@ All notable changes to this project will be documented in this file.
* #### Removed
* ### `nidigital` (NI-Digital Pattern Driver)
* #### Added
* Methods Added:
* `enable_match_fail_combination`
* #### Changed
* #### Removed
* ### `nidmm` (NI-DMM)
Expand Down
3 changes: 2 additions & 1 deletion build/templates/setup.py.mako
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ setup(
extras_require={
'grpc': [
'grpcio>=1.59.0,<2.0',
'protobuf>=4.21.6,<5.0'
'protobuf>=4.21.6'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this will work. We may need to bump it to 5.27.2, based on the failure to import nifake with protobuf 5.26.1.

],
},
% endif
Expand All @@ -63,6 +63,7 @@ setup(
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: System :: Hardware :: Hardware Drivers"
],
Expand Down
9 changes: 6 additions & 3 deletions build/templates/tox-system_tests.ini.mako
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
wheel_env_no_py = '{}-wheel_dep'.format(module_name)
# We only actually need to build it once, but we specify multiple versions here
# to prevent tox from trying to build the wheel with an unsupported (earlier) Python version
wheel_env = 'py{39,310,311,312}-' + wheel_env_no_py + ','
wheel_env = 'py{39,310,311,312,313}-' + wheel_env_no_py + ','
uses_other_wheel = True
if module_name == 'nitclk':
# nitclk system tests use niscope
Expand All @@ -28,7 +28,7 @@
# test suite on all supported python versions. To use it, "pip install tox"
# and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/${module_name})
[tox]
envlist = ${wheel_env}py{39,310,311,312}-${module_name}-system_tests, py312-${module_name}-coverage
envlist = ${wheel_env}py{39,310,311,312,313}-${module_name}-system_tests, py313-${module_name}-coverage
skip_missing_interpreters=True
ignore_basepython_conflict=True
# We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo
Expand Down Expand Up @@ -73,6 +73,9 @@ deps =
% if uses_other_wheel:
${wheel_env_no_py}: build

% endif
% if module_name == 'nidigital':
${module_name}-system_tests: nisync
% endif
${module_name}-system_tests: pytest
${module_name}-system_tests: coverage
Expand All @@ -87,7 +90,7 @@ deps =
${module_name}-coverage: coverage

depends =
${module_name}-coverage: py{39,310,311,312}-${module_name}-system_tests
${module_name}-coverage: py{39,310,311,312,313}-${module_name}-system_tests
% if uses_other_wheel:
${module_name}-system_tests: ${wheel_env}
% endif
Expand Down
13 changes: 13 additions & 0 deletions docs/nidigital/class.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,19 @@ disable_sites
Example: :py:meth:`my_session.disable_sites`


enable_match_fail_combination
-----------------------------

.. py:currentmodule:: nidigital.Session

.. py:method:: enable_match_fail_combination()

Configures digital pattern instruments and the PXIe-6674T timing and synchronization instrument to combine pattern comparison results and control subsequent pattern execution across digital pattern instruments based on those results. You must initialize the PXIe-6674T using NI-Sync and call this method from a multi-instrument session.





enable_sites
------------

Expand Down
29 changes: 20 additions & 9 deletions generated/nidcpower/nidcpower/nidcpower_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading