Skip to content
Open
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
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Changelog
* [1.4.1](#141)
* [1.4.0](#140)
* [1.3.0](#130)
* [1.2.0](#120)
Expand All @@ -25,6 +26,20 @@

All notable changes to this project will be documented in this file.

## 1.4.1
* ### Merged Pull Requests
* [Full changelog: 1.4.0...1.4.1](https://github.com/ni/nidaqmx-python/compare/1.3.0...1.4.1)
Copy link
Collaborator

Choose a reason for hiding this comment

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

1.4.0...1.4.1?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, the link should be 1.4.0…1.4.1. There is a mistake here, and I will correct it in the next commit.


* ### Resolved Issues
* ...

* ### Major Changes
* Update installer metadata using DAQmx version 26.0.0


* ### Known Issues
* ...

## 1.4.0
* ### Merged Pull Requests
* [Full changelog: 1.3.0...1.4.0](https://github.com/ni/nidaqmx-python/compare/1.3.0...1.4.0)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "nidaqmx"
description = "NI-DAQmx Python API"
license = "MIT"
keywords = ["nidaqmx", "nidaq", "daqmx", "daq"]
version = "1.4.1.dev0"
version = "1.4.1"
Copy link
Collaborator

Choose a reason for hiding this comment

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

There have been no changes in releases/1.4 since the 1.4.0 release. Are you going to cherry-pick #924 ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes correct, #924 just merged, and it will be cherry-picked.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ok. Please also update CHANGELOG.md in the main branch to list 1.5.0 and 1.4.1, with #924 listed under 1.4.1

classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down