From 19fb42d059d6fe452b84776e6acc9a32206ba587 Mon Sep 17 00:00:00 2001 From: Charity Loh <55676809+charitylxy@users.noreply.github.com> Date: Fri, 8 Nov 2024 01:15:15 +0800 Subject: [PATCH 1/3] Update DAQmx Installer Download Link (#654) * Update installer download link * add new linux supported os * generate code --- generated/nidaqmx/_installer_metadata.json | 13 +++++++------ src/handwritten/_installer_metadata.json | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/generated/nidaqmx/_installer_metadata.json b/generated/nidaqmx/_installer_metadata.json index d4cccc1a..23066bcf 100644 --- a/generated/nidaqmx/_installer_metadata.json +++ b/generated/nidaqmx/_installer_metadata.json @@ -1,9 +1,9 @@ { "Windows": [ { - "Version": "24.6.0", - "Release": "2024Q3.1", - "Location": "https://download.ni.com/support/nipkg/products/ni-d/ni-daqmx/24.6/online/ni-daqmx_24.6_online.exe", + "Version": "24.8.0", + "Release": "2024Q4", + "Location": "https://download.ni.com/support/nipkg/products/ni-d/ni-daqmx/24.8/online/ni-daqmx_24.8_online.exe", "supportedOS": [ "Windows 11", "Windows Server 2022 64-bit", @@ -15,13 +15,14 @@ ], "Linux": [ { - "Version": "24.5.0", - "Release": "2024Q3", + "Version": "24.8.0", + "Release": "2024Q4", "_comment": "Location url must be of the format 'https://download.ni.com/support/softlib/MasterRepository/LinuxDrivers/NILinuxDeviceDrivers.zip'. Any change to the format will require a change in the code.", - "Location": "https://download.ni.com/support/softlib/MasterRepository/LinuxDrivers2024Q3/NILinux2024Q3DeviceDrivers.zip", + "Location": "https://download.ni.com/support/softlib/MasterRepository/LinuxDrivers2024Q4/NILinux2024Q4DeviceDrivers.zip", "supportedOS": [ "ubuntu 20.04", "ubuntu 22.04", + "ubuntu 24.04", "rhel 8", "rhel 9", "opensuse 15.4", diff --git a/src/handwritten/_installer_metadata.json b/src/handwritten/_installer_metadata.json index d4cccc1a..23066bcf 100644 --- a/src/handwritten/_installer_metadata.json +++ b/src/handwritten/_installer_metadata.json @@ -1,9 +1,9 @@ { "Windows": [ { - "Version": "24.6.0", - "Release": "2024Q3.1", - "Location": "https://download.ni.com/support/nipkg/products/ni-d/ni-daqmx/24.6/online/ni-daqmx_24.6_online.exe", + "Version": "24.8.0", + "Release": "2024Q4", + "Location": "https://download.ni.com/support/nipkg/products/ni-d/ni-daqmx/24.8/online/ni-daqmx_24.8_online.exe", "supportedOS": [ "Windows 11", "Windows Server 2022 64-bit", @@ -15,13 +15,14 @@ ], "Linux": [ { - "Version": "24.5.0", - "Release": "2024Q3", + "Version": "24.8.0", + "Release": "2024Q4", "_comment": "Location url must be of the format 'https://download.ni.com/support/softlib/MasterRepository/LinuxDrivers/NILinuxDeviceDrivers.zip'. Any change to the format will require a change in the code.", - "Location": "https://download.ni.com/support/softlib/MasterRepository/LinuxDrivers2024Q3/NILinux2024Q3DeviceDrivers.zip", + "Location": "https://download.ni.com/support/softlib/MasterRepository/LinuxDrivers2024Q4/NILinux2024Q4DeviceDrivers.zip", "supportedOS": [ "ubuntu 20.04", "ubuntu 22.04", + "ubuntu 24.04", "rhel 8", "rhel 9", "opensuse 15.4", From a155e2b2d55162da07ec1ccc3ab8c2f45629cad2 Mon Sep 17 00:00:00 2001 From: Charity Loh <55676809+charitylxy@users.noreply.github.com> Date: Fri, 8 Nov 2024 01:29:06 +0800 Subject: [PATCH 2/3] Update Changelog 1.0.2 (#655) * Update changelog and pyproject.toml version * revert back to 1.1.0 * address comment --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cdc0856..5825fbfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,9 +38,11 @@ All notable changes to this project will be documented in this file. * ### Resolved Issues * [644: nidaqmx doesn't support Python 3.13+](https://github.com/ni/nidaqmx-python/issues/644) + * [641: No devices found](https://github.com/ni/nidaqmx-python/issues/641) + * Fall back to ASCII encoding if the system locale is not set. * ### Known Issues - * ... + * [639: first_samp_timestamp_val property does not work because LibraryInterpreter is missing a method](https://github.com/ni/nidaqmx-python/issues/639) ## 1.0.1 * ### Merged Pull Requests From 4ccdfdcf657e4a619e8f6dd4a40735da885edc02 Mon Sep 17 00:00:00 2001 From: Joo Liang Cheah Date: Fri, 8 Nov 2024 11:09:04 +0800 Subject: [PATCH 3/3] Cherry-pick commits and version update for 1.0.2 release --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b3d0b96a..5111165a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nidaqmx" -version = "1.1.0" +version = "1.0.2" license = "MIT" description = "NI-DAQmx Python API" authors = ["NI "]