Skip to content

Commit 1dbb836

Browse files
committed
Merge remote-tracking branch 'origin/master' into users/vagupta/rfsg-documentation-update
2 parents e55499f + 8a06f63 commit 1dbb836

File tree

20 files changed

+1667
-70
lines changed

20 files changed

+1667
-70
lines changed

CHANGELOG.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
---
1616

1717
### nidcpower (NI-DCPower)
18-
- [Unreleased](#nidcpower-unreleased)
18+
- [1.5.0](#nidcpower-150---2025-07-01)
1919
- [1.4.9](#nidcpower-149---2025-02-26)
2020
- [1.4.8](#nidcpower-148---2024-04-26)
2121
- [1.4.7](#nidcpower-147---2023-12-15)
@@ -47,7 +47,7 @@
4747
- [0.4.0](#nidcpower-040---2017-11-07)
4848
- [0.3.0](#nidcpower-030---2017-10-13)
4949

50-
#### [nidcpower] Unreleased
50+
#### [nidcpower] 1.5.0 - 2025-07-01
5151
- Added
5252
- API parity with NI-DCPower 2025 Q2.
5353
- Properties:
@@ -67,8 +67,6 @@
6767
- Enum values:
6868
- `CONSTANT_RESISTANCE` and `CONSTANT_POWER` added to enum `OutputFunction`
6969
- `nidcpower_constant_resistance_and_constant_power.py` and `nidcpower_sink_dc_current_into_electronic_load.py` examples
70-
- Changed
71-
- Removed
7270

7371
#### [nidcpower] 1.4.9 - 2025-02-26
7472
- Added

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ NI-DCPower Python API Status
6868
+-------------------------------+--------------------------+
6969
| NI-DCPower (nidcpower) | |
7070
+===============================+==========================+
71-
| Driver Version Tested Against | 2025 Q1 |
71+
| Driver Version Tested Against | 2025 Q2 |
7272
+-------------------------------+--------------------------+
7373
| PyPI Version | |nidcpowerLatestVersion| |
7474
+-------------------------------+--------------------------+

docs/nidcpower/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
# built documents.
6464
#
6565
# The full version, including alpha/beta/rc tags.
66-
release = '1.4.10.dev0'
66+
release = '1.5.0'
6767
# The short X.Y version.
6868
version = release[:3]
6969

docs/nidcpower/examples.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Examples
22
========
33

4-
`You can download all nidcpower examples for latest version here <https://github.com/ni/nimi-python/releases/download/1.4.9/nidcpower_examples.zip>`_
4+
`You can download all nidcpower examples here <https://github.com/ni/nimi-python/releases/download/nidcpower-1.5.0/nidcpower_examples.zip>`_
55

66
nidcpower_advanced_sequence.py
77
------------------------------
@@ -10,7 +10,7 @@ nidcpower_advanced_sequence.py
1010
:language: python
1111
:linenos:
1212
:encoding: utf8
13-
:caption: `(nidcpower_advanced_sequence.py) <https://github.com/ni/nimi-python/blob/master/src/nidcpower/examples/nidcpower_advanced_sequence.py>`_
13+
:caption: `(nidcpower_advanced_sequence.py) <https://github.com/ni/nimi-python/blob/nidcpower-1.5.0/src/nidcpower/examples/nidcpower_advanced_sequence.py>`_
1414

1515
nidcpower_constant_resistance_and_constant_power.py
1616
---------------------------------------------------
@@ -19,7 +19,7 @@ nidcpower_constant_resistance_and_constant_power.py
1919
:language: python
2020
:linenos:
2121
:encoding: utf8
22-
:caption: `(nidcpower_constant_resistance_and_constant_power.py) <https://github.com/ni/nimi-python/blob/master/src/nidcpower/examples/nidcpower_constant_resistance_and_constant_power.py>`_
22+
:caption: `(nidcpower_constant_resistance_and_constant_power.py) <https://github.com/ni/nimi-python/blob/nidcpower-1.5.0/src/nidcpower/examples/nidcpower_constant_resistance_and_constant_power.py>`_
2323

2424
nidcpower_lcr_source_ac_voltage.py
2525
----------------------------------
@@ -28,7 +28,7 @@ nidcpower_lcr_source_ac_voltage.py
2828
:language: python
2929
:linenos:
3030
:encoding: utf8
31-
:caption: `(nidcpower_lcr_source_ac_voltage.py) <https://github.com/ni/nimi-python/blob/master/src/nidcpower/examples/nidcpower_lcr_source_ac_voltage.py>`_
31+
:caption: `(nidcpower_lcr_source_ac_voltage.py) <https://github.com/ni/nimi-python/blob/nidcpower-1.5.0/src/nidcpower/examples/nidcpower_lcr_source_ac_voltage.py>`_
3232

3333
nidcpower_measure_record.py
3434
---------------------------
@@ -37,7 +37,7 @@ nidcpower_measure_record.py
3737
:language: python
3838
:linenos:
3939
:encoding: utf8
40-
:caption: `(nidcpower_measure_record.py) <https://github.com/ni/nimi-python/blob/master/src/nidcpower/examples/nidcpower_measure_record.py>`_
40+
:caption: `(nidcpower_measure_record.py) <https://github.com/ni/nimi-python/blob/nidcpower-1.5.0/src/nidcpower/examples/nidcpower_measure_record.py>`_
4141

4242
nidcpower_sink_dc_current_into_electronic_load.py
4343
-------------------------------------------------
@@ -46,7 +46,7 @@ nidcpower_sink_dc_current_into_electronic_load.py
4646
:language: python
4747
:linenos:
4848
:encoding: utf8
49-
:caption: `(nidcpower_sink_dc_current_into_electronic_load.py) <https://github.com/ni/nimi-python/blob/master/src/nidcpower/examples/nidcpower_sink_dc_current_into_electronic_load.py>`_
49+
:caption: `(nidcpower_sink_dc_current_into_electronic_load.py) <https://github.com/ni/nimi-python/blob/nidcpower-1.5.0/src/nidcpower/examples/nidcpower_sink_dc_current_into_electronic_load.py>`_
5050

5151
nidcpower_source_delay_measure.py
5252
---------------------------------
@@ -55,5 +55,5 @@ nidcpower_source_delay_measure.py
5555
:language: python
5656
:linenos:
5757
:encoding: utf8
58-
:caption: `(nidcpower_source_delay_measure.py) <https://github.com/ni/nimi-python/blob/master/src/nidcpower/examples/nidcpower_source_delay_measure.py>`_
58+
:caption: `(nidcpower_source_delay_measure.py) <https://github.com/ni/nimi-python/blob/nidcpower-1.5.0/src/nidcpower/examples/nidcpower_source_delay_measure.py>`_
5959

docs/nidcpower/installation.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ As a prerequisite to using the **nidcpower** module, you must install the NI-DCP
88

99
The nimi-python modules (i.e. for **NI-DCPower**) can be installed with `pip <http://pypi.python.org/pypi/pip>`_::
1010

11-
$ python -m pip install nidcpower
11+
$ python -m pip install nidcpower~=1.5.0
1212

1313

docs/nidcpower/status.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ NI-DCPower Python API Status
55
+-------------------------------+--------------------------+
66
| NI-DCPower (nidcpower) | |
77
+===============================+==========================+
8-
| Driver Version Tested Against | 2025 Q1 |
8+
| Driver Version Tested Against | 2025 Q2 |
99
+-------------------------------+--------------------------+
1010
| PyPI Version | |nidcpowerLatestVersion| |
1111
+-------------------------------+--------------------------+

0 commit comments

Comments
 (0)