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
2 changes: 1 addition & 1 deletion .github/workflows/check_nimg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [windows-latest, ubuntu-latest]
python-version: [3.11, 3.14]
python-version: [3.11, 3.15]
runs-on: ${{ matrix.os }}
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_nims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [windows-latest, ubuntu-latest]
python-version: [3.11, 3.14]
python-version: [3.11, 3.15]
runs-on: ${{ matrix.os }}
defaults:
run:
Expand Down
29 changes: 27 additions & 2 deletions .github/workflows/run_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
matrix:
os: [windows-latest, ubuntu-latest]
# grpcio does not have binary wheels for pypy or free-threading, as of version 1.75.1.
python-version: [3.11, 3.12, 3.13, 3.14]
python-version: [3.11, 3.12, 3.13, 3.14, 3.15]
# Fail-fast skews the pass/fail ratio and seems to make pytest produce
# incomplete JUnit XML results.
fail-fast: false
Expand Down Expand Up @@ -71,9 +71,34 @@ jobs:
run: poetry run pytest ./tests/unit -v --cov=ni_measurement_plugin_sdk_service --junitxml=test_results/nims-${{ matrix.os }}-py${{ matrix.python-version}}-all-extras.xml
working-directory: ./packages/service

- name: Cache virtualenv (ni-measurement-plugin-sdk-generator)
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: packages/generator/.venv
key: ni-measurement-plugin-sdk-generator-${{ runner.os }}-py${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('packages/generator/poetry.lock') }}
- name: Install ni-measurement-plugin-sdk-generator
run: poetry install -v
working-directory: ./packages/generator
Comment thread
dixonjoel marked this conversation as resolved.
Resolved
- name: Run generator unit and template-rendering tests and code coverage
run: poetry run pytest ./tests/unit ./tests/acceptance/test_plugin_generator.py -v --cov=ni_measurement_plugin_sdk_generator --junitxml=test_results/nimg-${{ matrix.os }}-py${{ matrix.python-version }}.xml
working-directory: ./packages/generator

- name: Cache virtualenv (ni-measurement-plugin-sdk)
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: packages/sdk/.venv
key: ni-measurement-plugin-sdk-${{ runner.os }}-py${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('packages/sdk/poetry.lock') }}
- name: Install and build ni-measurement-plugin-sdk
run: |
poetry install -v
poetry build
working-directory: ./packages/sdk
Comment thread
dixonjoel marked this conversation as resolved.
Resolved

- name: Upload test results
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
with:
name: test_results_unit_${{ matrix.os }}_py${{ matrix.python-version }}
path: ./packages/service/test_results/*.xml
path: |
./packages/service/test_results/*.xml
./packages/generator/test_results/*.xml
if: always()
771 changes: 534 additions & 237 deletions packages/generator/poetry.lock

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions packages/generator/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,17 @@ grpcio-tools = [
# requires protobuf v5 or later
{version = "1.67.0", python = ">=3.11,<3.14"},
# requires protobuf v6 or later
{version = "1.75.1", python = "^3.14"},
{version = "1.75.1", python = ">=3.14,<3.15"},
# requires protobuf v7 or later
{version = "1.84.0", python = "^3.15"},
]
# NumPy dropped support for Python 3.8 before adding support for Python 3.12, so
# we need to include multiple NumPy versions in poetry.lock.
numpy = [
{ version = ">=1.23.2", python = ">=3.11,<3.12"},
{ version = ">=1.26", python = ">=3.12,<3.13"},
{ version = ">=2.1", python = "^3.13"},
{ version = ">=2.1", python = ">=3.13,<3.15"},
{ version = ">=2.5.4", python = "^3.15"},
]
ni-measurementlink-proto = { version = "^1.0.0" }

Expand Down
401 changes: 240 additions & 161 deletions packages/sdk/poetry.lock

Large diffs are not rendered by default.

771 changes: 534 additions & 237 deletions packages/service/poetry.lock

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion packages/service/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ grpcio-tools = [
# requires protobuf v5 or later
{ version = "1.67.0", python = ">=3.11,<3.14" },
# requires protobuf v6 or later
{ version = "1.75.1", python = "^3.14" },
{ version = "1.75.1", python = ">=3.14,<3.15" },
# requires protobuf v7 or later
{ version = "1.84.0", python = "^3.15" },
]
pytest-cov = ">=3.0.0"
pytest-mock = ">=3.0"
Expand Down
Loading