Skip to content

Post publish workflow to update main after the 1.3.0 release #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 12, 2024
Merged

Post publish workflow to update main after the 1.3.0 release #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8bb9b1a
Check if NIMS and NIMG versions are different before committing (#585)
dixonjoel Jan 12, 2024
ae55362
Change examples in main to use 1.3.0 released packages
dixonjoel Jan 12, 2024
470672f
Fix .toml file
dixonjoel Jan 12, 2024
7b01f37
Only update the top level and examples readme
dixonjoel Jan 12, 2024
56767b7
Fix output voltage .toml
dixonjoel Jan 12, 2024
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
15 changes: 10 additions & 5 deletions .github/workflows/Publish_NIMS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,20 @@ jobs:
working-directory: ./ni_measurementlink_generator

- name: Commit file changes
id: commit
if: ${{ startsWith(github.event.release.target_commitish, 'main') || startsWith(github.event.release.target_commitish, 'releases/') }}
run: |
git config --local user.email "action@github.com"
git config --local user.name "GitHub Action"
git add .
git commit -m "Promote NIMS package version and update Sphinx generated files in _docs" -a
echo "version_changed=false" >> $GITHUB_OUTPUT
if [ -n "$(git status --porcelain)" ]; then
git config --local user.email "action@github.com"
git config --local user.name "GitHub Action"
git add .
git commit -m "Promote NIMS and NIMG package version" -a
echo "version_changed=true" >> $GITHUB_OUTPUT
fi

- name: Push changes to the appropriate branch
if: ${{ startsWith(github.event.release.target_commitish, 'main') || startsWith(github.event.release.target_commitish, 'releases/') }}
if: ${{ steps.commit.outputs.version_changed && (startsWith(github.event.release.target_commitish, 'main') || startsWith(github.event.release.target_commitish, 'releases/')) }}
uses: CasperWA/push-protected@v2
with:
token: ${{ secrets.ADMIN_PAT }}
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,14 @@ There are three ways to do this:

## Examples

The `examples` directory contains example measurements for MeasurementLink 2024 Q1 or later. If
The `examples` directory contains example measurements for MeasurementLink 2024 Q2 or later. If
you are using a previous version of MeasurementLink, download the appropriate examples:

- MeasurementLink 2023 Q1: [measurementlink-python-examples-1.0.1.zip](https://github.com/ni/measurementlink-python/releases/download/1.0.1/measurementlink-python-examples-1.0.1.zip)
- MeasurementLink 2023 Q2: [measurementlink-python-examples-1.0.1.zip](https://github.com/ni/measurementlink-python/releases/download/1.0.1/measurementlink-python-examples-1.0.1.zip)
- MeasurementLink 2023 Q3: [measurementlink-python-examples-1.1.0.zip](https://github.com/ni/measurementlink-python/releases/download/1.1.0/measurementlink-python-examples-1.1.0.zip)
- MeasurementLink 2023 Q4: [measurementlink-python-examples-1.2.0.zip](https://github.com/ni/measurementlink-python/releases/download/1.2.0/measurementlink-python-examples-1.2.0.zip)
- MeasurementLink 2024 Q1: [measurementlink-python-examples-1.3.0.zip](https://github.com/ni/measurementlink-python/releases/download/1.3.0/measurementlink-python-examples-1.3.0.zip)

For more information on setting up and running the example measurements, see the included `README.md` file.

Expand Down
3 changes: 2 additions & 1 deletion examples/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@

## Example Measurements

These are example measurements for MeasurementLink 2024 Q1 or later.
These are example measurements for MeasurementLink 2024 Q2 or later.

If you are using a previous version of MeasurementLink, download the appropriate examples:

- MeasurementLink 2023 Q1: [measurementlink-python-examples-1.0.1.zip](https://github.com/ni/measurementlink-python/releases/download/1.0.1/measurementlink-python-examples-1.0.1.zip)
- MeasurementLink 2023 Q2: [measurementlink-python-examples-1.0.1.zip](https://github.com/ni/measurementlink-python/releases/download/1.0.1/measurementlink-python-examples-1.0.1.zip)
- MeasurementLink 2023 Q3: [measurementlink-python-examples-1.1.0.zip](https://github.com/ni/measurementlink-python/releases/download/1.1.0/measurementlink-python-examples-1.1.0.zip)
- MeasurementLink 2023 Q4: [measurementlink-python-examples-1.2.0.zip](https://github.com/ni/measurementlink-python/releases/download/1.2.0/measurementlink-python-examples-1.2.0.zip)
- MeasurementLink 2024 Q1: [measurementlink-python-examples-1.3.0.zip](https://github.com/ni/measurementlink-python/releases/download/1.3.0/measurementlink-python-examples-1.3.0.zip)

For best results, use the example measurements corresponding to the version of MeasurementLink
that you are using. Newer examples may demonstrate features that are not available in older
Expand Down
2 changes: 1 addition & 1 deletion examples/game_of_life/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["National Instruments"]

[tool.poetry.dependencies]
python = "^3.8"
ni-measurementlink-service = {version = "^1.3.0-dev0", allow-prereleases = true}
ni-measurementlink-service = {version = "^1.3.0"}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558

[tool.poetry.group.dev.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/nidaqmx_analog_input/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
nidaqmx = { version = ">=0.8.0", extras = ["grpc"] }
ni-measurementlink-service = {version = "^1.3.0-dev2", allow-prereleases = true}
ni-measurementlink-service = {version = "^1.3.0"}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558

[tool.poetry.group.dev.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/nidcpower_source_dc_voltage/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
nidcpower = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurementlink-service = {version = "^1.3.0-dev2", allow-prereleases = true}
ni-measurementlink-service = {version = "^1.3.0"}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
2 changes: 1 addition & 1 deletion examples/nidigital_spi/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
nidigital = ">=1.4.4"
ni-measurementlink-service = {version = "^1.3.0-dev2", allow-prereleases = true}
ni-measurementlink-service = {version = "^1.3.0"}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
2 changes: 1 addition & 1 deletion examples/nidmm_measurement/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
nidmm = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurementlink-service = {version = "^1.3.0-dev2", allow-prereleases = true}
ni-measurementlink-service = {version = "^1.3.0"}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
2 changes: 1 addition & 1 deletion examples/nifgen_standard_function/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
nifgen = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurementlink-service = {version = "^1.3.0-dev2", allow-prereleases = true}
ni-measurementlink-service = {version = "^1.3.0"}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
2 changes: 1 addition & 1 deletion examples/niscope_acquire_waveform/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
niscope = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurementlink-service = {version = "^1.3.0-dev2", allow-prereleases = true}
ni-measurementlink-service = {version = "^1.3.0"}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
2 changes: 1 addition & 1 deletion examples/niswitch_control_relays/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
niswitch = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurementlink-service = {version = "^1.3.0-dev2", allow-prereleases = true}
ni-measurementlink-service = {version = "^1.3.0"}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
2 changes: 1 addition & 1 deletion examples/nivisa_dmm_measurement/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["National Instruments"]

[tool.poetry.dependencies]
python = "^3.8"
ni-measurementlink-service = {version = "^1.3.0-dev2", allow-prereleases = true}
ni-measurementlink-service = {version = "^1.3.0"}
PyVISA = "^1.13.0"
PyVISA-sim = "^0.5.1"
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
Expand Down
2 changes: 1 addition & 1 deletion examples/output_voltage_measurement/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["National Instruments"]

[tool.poetry.dependencies]
python = "^3.8"
ni-measurementlink-service = {version = "^1.3.0-dev2", allow-prereleases = true}
ni-measurementlink-service = {version = "^1.3.0"}
PyVISA = "^1.13.0"
PyVISA-sim = "^0.5.1"
nidcpower = { version = ">=1.4.4", extras = ["grpc"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/sample_measurement/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["National Instruments"]

[tool.poetry.dependencies]
python = "^3.8"
ni-measurementlink-service = {version = "^1.3.0-dev0", allow-prereleases = true}
ni-measurementlink-service = {version = "^1.3.0"}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558

[tool.poetry.group.dev.dependencies]
Expand Down