From e683df3fafc36d4ff10692dca101737f34bc138c Mon Sep 17 00:00:00 2001 From: Joo Liang Cheah Date: Tue, 27 Aug 2024 14:18:15 +0800 Subject: [PATCH 1/4] Update installer download link (#628) --- generated/nidaqmx/_installer_metadata.json | 12 ++++++------ src/handwritten/_installer_metadata.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/generated/nidaqmx/_installer_metadata.json b/generated/nidaqmx/_installer_metadata.json index 76b4c0393..d4cccc1a2 100644 --- a/generated/nidaqmx/_installer_metadata.json +++ b/generated/nidaqmx/_installer_metadata.json @@ -1,9 +1,9 @@ { "Windows": [ { - "Version": "24.3.0", - "Release": "2024Q2", - "Location": "https://download.ni.com/support/nipkg/products/ni-d/ni-daqmx/24.3/online/ni-daqmx_24.3_online.exe", + "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", "supportedOS": [ "Windows 11", "Windows Server 2022 64-bit", @@ -15,10 +15,10 @@ ], "Linux": [ { - "Version": "24.3.0", - "Release": "2024Q2", + "Version": "24.5.0", + "Release": "2024Q3", "_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/LinuxDrivers2024Q2/NILinux2024Q2DeviceDrivers.zip", + "Location": "https://download.ni.com/support/softlib/MasterRepository/LinuxDrivers2024Q3/NILinux2024Q3DeviceDrivers.zip", "supportedOS": [ "ubuntu 20.04", "ubuntu 22.04", diff --git a/src/handwritten/_installer_metadata.json b/src/handwritten/_installer_metadata.json index 76b4c0393..d4cccc1a2 100644 --- a/src/handwritten/_installer_metadata.json +++ b/src/handwritten/_installer_metadata.json @@ -1,9 +1,9 @@ { "Windows": [ { - "Version": "24.3.0", - "Release": "2024Q2", - "Location": "https://download.ni.com/support/nipkg/products/ni-d/ni-daqmx/24.3/online/ni-daqmx_24.3_online.exe", + "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", "supportedOS": [ "Windows 11", "Windows Server 2022 64-bit", @@ -15,10 +15,10 @@ ], "Linux": [ { - "Version": "24.3.0", - "Release": "2024Q2", + "Version": "24.5.0", + "Release": "2024Q3", "_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/LinuxDrivers2024Q2/NILinux2024Q2DeviceDrivers.zip", + "Location": "https://download.ni.com/support/softlib/MasterRepository/LinuxDrivers2024Q3/NILinux2024Q3DeviceDrivers.zip", "supportedOS": [ "ubuntu 20.04", "ubuntu 22.04", From b82d78d2e52600735a5df463a44bef1511402666 Mon Sep 17 00:00:00 2001 From: Brad Keryan Date: Thu, 29 Aug 2024 17:37:20 -0500 Subject: [PATCH 2/4] CONTRIBUTING.md: Add branching policy (#627) --- CONTRIBUTING.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index edcf74cef..97b06700f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,9 +84,18 @@ $ poetry install -E docs $ poetry run sphinx-build -b html docs docs\_build ``` +# Branching Policy + +Active development for the next release occurs on the `master` branch. + +During finalization, we create a release branch (e.g. `releases/1.2`) in order to control which changes target the imminent +release vs. the next release after that. Changes that are intended for both the imminent release and subsequent releases +should be made in the `master` branch and cherry-picked into the release branch. Changes that only apply to the imminent +release (such as version numbers) may be made directly in the release branch. + # Release Process -1. Ensure your git `HEAD` is at the latest version of `master` branch with no pending changes. +1. Ensure your git `HEAD` is at the latest version of the `master` or appropriate `releases/*` branch with no pending changes. 2. Note the version currently being released by running: ```sh $ poetry version From 681e8dfd8460ceb350db546f65bc8623baa93f7d Mon Sep 17 00:00:00 2001 From: Joo Liang Cheah Date: Fri, 30 Aug 2024 09:10:38 +0800 Subject: [PATCH 3/4] Update version to 1.0.1 (#630) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bce44b24c..5b4b9e935 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nidaqmx" -version = "1.0.0" +version = "1.0.1" license = "MIT" description = "NI-DAQmx Python API" authors = ["NI "] From 79df1b100f2b95db855ec9f684f3e6990b4e3649 Mon Sep 17 00:00:00 2001 From: Joo Liang Cheah Date: Fri, 30 Aug 2024 14:48:21 +0800 Subject: [PATCH 4/4] Update changelog 101 (#631) * Update CHANGELOG for 1.0.1 * added known issues --- CHANGELOG.md | 16 ++++++++++++++++ pyproject.toml | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b4049060..ff37670b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog * [1.1.0](#110) +* [1.0.1](#101) * [1.0.0](#100) * [0.9.0](#090) * [0.8.0](#080) @@ -30,6 +31,21 @@ All notable changes to this project will be documented in this file. * ### Known Issues * ... +## 1.0.1 +* ### Merged Pull Requests + * [Full changelog: 1.0.0...1.0.1](https://github.com/ni/nidaqmx-python/compare/1.0.0...1.0.1) + +* ### Resolved Issues + * [540: Task.wait_for_valid_timestamp doesn't return the timestamp](https://github.com/ni/nidaqmx-python/issues/540) + * [606: CERTIFICATE_VERIFY_FAILED occurs when executing installdriver command on Windows system](https://github.com/ni/nidaqmx-python/issues/606) + * [615: Onboard device memory overflow](https://github.com/ni/nidaqmx-python/issues/615) + * [623: installdriver CLI doesn't prompt or indicate what versions are being downloaded/installed on a clean system](https://github.com/ni/nidaqmx-python/issues/623) + +* ### Known Issues + * [613: InStream.logging_file_path setter type hint is not effective](https://github.com/ni/nidaqmx-python/issues/613) + * [620: InStream.get_channels_buffer_size uses wrong encoding](https://github.com/ni/nidaqmx-python/issues/620) + * [621: InStream.get_channels_buffer_size should not be public](https://github.com/ni/nidaqmx-python/issues/621) + ## 1.0.0 * ### Merged Pull Requests * [Full changelog: 0.9.0...1.0.0](https://github.com/ni/nidaqmx-python/compare/0.9.0...1.0.0) diff --git a/pyproject.toml b/pyproject.toml index 5b4b9e935..04a7f642a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nidaqmx" -version = "1.0.1" +version = "1.1.0" license = "MIT" description = "NI-DAQmx Python API" authors = ["NI "]