From b07b393e8c9c4455469a8be9dd6a415ff0d0a708 Mon Sep 17 00:00:00 2001 From: John Ingve Olsen Date: Tue, 28 Nov 2023 12:53:34 +0100 Subject: [PATCH] Bump to SDK 2.11.0-preview-1 --- README.md | 2 +- continuous-integration/deployment/expected-version.txt | 2 +- .../linux/platform-dependent/fedora-37/setup.sh | 4 ++-- .../linux/platform-dependent/fedora-38/setup.sh | 4 ++-- .../linux/platform-dependent/ubuntu-20.04/setup.sh | 4 ++-- .../linux/platform-dependent/ubuntu-22.04/setup.sh | 4 ++-- .../linux/platform-dependent/ubuntu-23.04/setup.sh | 4 ++-- .../linux/platform-dependent/ubuntu-23.10/setup.sh | 4 ++-- continuous-integration/versions.json | 2 +- continuous-integration/windows/setup.py | 2 +- setup.py | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 5d6f0beb..469f6b97 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Zivid Python is the official Python package for Zivid 3D cameras. Read more abou ### Dependencies * [Python](https://www.python.org/) version 3.7 or higher -* [Zivid SDK][zivid-download-software-url] version 2.10.1 (see [here][zivid-software-installation-url] for help) +* [Zivid SDK][zivid-download-software-url] version 2.11.0 (see [here][zivid-software-installation-url] for help) * [Compiler](doc/CompilerInstallation.md) with C++17 support *Ubuntu users must install Python headers (`apt install python3-dev`) in addition to the regular `python3` package.* diff --git a/continuous-integration/deployment/expected-version.txt b/continuous-integration/deployment/expected-version.txt index 5777c832..a2d85a56 100644 --- a/continuous-integration/deployment/expected-version.txt +++ b/continuous-integration/deployment/expected-version.txt @@ -1 +1 @@ -2.10.1.2.10.1 +2.11.0.2.11.0 diff --git a/continuous-integration/linux/platform-dependent/fedora-37/setup.sh b/continuous-integration/linux/platform-dependent/fedora-37/setup.sh index dfaebe0b..2502c135 100755 --- a/continuous-integration/linux/platform-dependent/fedora-37/setup.sh +++ b/continuous-integration/linux/platform-dependent/fedora-37/setup.sh @@ -30,5 +30,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file diff --git a/continuous-integration/linux/platform-dependent/fedora-38/setup.sh b/continuous-integration/linux/platform-dependent/fedora-38/setup.sh index dfaebe0b..2502c135 100755 --- a/continuous-integration/linux/platform-dependent/fedora-38/setup.sh +++ b/continuous-integration/linux/platform-dependent/fedora-38/setup.sh @@ -30,5 +30,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file diff --git a/continuous-integration/linux/platform-dependent/ubuntu-20.04/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-20.04/setup.sh index 5a57f69a..be165f14 100755 --- a/continuous-integration/linux/platform-dependent/ubuntu-20.04/setup.sh +++ b/continuous-integration/linux/platform-dependent/ubuntu-20.04/setup.sh @@ -36,5 +36,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u20/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file diff --git a/continuous-integration/linux/platform-dependent/ubuntu-22.04/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-22.04/setup.sh index 5961650b..8d9f4fe4 100755 --- a/continuous-integration/linux/platform-dependent/ubuntu-22.04/setup.sh +++ b/continuous-integration/linux/platform-dependent/ubuntu-22.04/setup.sh @@ -35,5 +35,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u22/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u22/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? \ No newline at end of file diff --git a/continuous-integration/linux/platform-dependent/ubuntu-23.04/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-23.04/setup.sh index 5f246445..eb095848 100755 --- a/continuous-integration/linux/platform-dependent/ubuntu-23.04/setup.sh +++ b/continuous-integration/linux/platform-dependent/ubuntu-23.04/setup.sh @@ -35,5 +35,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u22/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u22/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? diff --git a/continuous-integration/linux/platform-dependent/ubuntu-23.10/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-23.10/setup.sh index 5f246445..eb095848 100755 --- a/continuous-integration/linux/platform-dependent/ubuntu-23.10/setup.sh +++ b/continuous-integration/linux/platform-dependent/ubuntu-23.10/setup.sh @@ -35,5 +35,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? -install_www_deb "https://downloads.zivid.com/sdk/releases/${ZIVID_SDK_EXACT_VERSION}/u22/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u22/zivid-telicam-driver_${ZIVID_TELICAM_EXACT_VERSION}_amd64.deb" || exit $? +install_www_deb "https://downloads.zivid.com/sdk/previews/${ZIVID_SDK_EXACT_VERSION}/u22/zivid_${ZIVID_SDK_EXACT_VERSION}_amd64.deb" || exit $? diff --git a/continuous-integration/versions.json b/continuous-integration/versions.json index 3ec47841..e013ae44 100644 --- a/continuous-integration/versions.json +++ b/continuous-integration/versions.json @@ -1,4 +1,4 @@ { - "ZIVID_SDK_EXACT_VERSION": "2.10.1+50b274e8-7", + "ZIVID_SDK_EXACT_VERSION": "2.11.0-rc-1+9df43446-1", "ZIVID_TELICAM_EXACT_VERSION": "3.0.1.1-3" } diff --git a/continuous-integration/windows/setup.py b/continuous-integration/windows/setup.py index 045afa82..c814feab 100644 --- a/continuous-integration/windows/setup.py +++ b/continuous-integration/windows/setup.py @@ -15,7 +15,7 @@ def _install_zivid_sdk(): exact_version = json.loads(versions_json)["ZIVID_SDK_EXACT_VERSION"] with tempfile.TemporaryDirectory() as temp_dir: - zivid_installer_url = f"https://downloads.zivid.com/sdk/releases/{exact_version}/windows/ZividSetup_{exact_version}.exe" + zivid_installer_url = f"https://downloads.zivid.com/sdk/previews/{exact_version}/windows/ZividSetup_{exact_version}.exe" print("Downloading {}".format(zivid_installer_url), flush=True) zivid_installer = Path(temp_dir) / "ZividSetup.exe" response = requests.get(zivid_installer_url, timeout=(25, 600)) diff --git a/setup.py b/setup.py index bd757d75..ae50c687 100644 --- a/setup.py +++ b/setup.py @@ -10,11 +10,11 @@ # To be replaced by: from setuptools_scm import get_version def get_version(): - return "2.10.1" + return "2.11.0" def _zivid_sdk_version(): - return "2.10.1" + return "2.11.0" def _zivid_python_version():