From f1b357a7659a5ba9b5db3e42cce825526f25d90d Mon Sep 17 00:00:00 2001 From: Trym Bremnes Date: Fri, 8 Nov 2019 09:52:55 +0100 Subject: [PATCH] Bumped Zivid SDK version to 1.6 from 1.5 --- README.md | 8 ++++---- .../linux/platform-dependent/fedora-30/setup.sh | 4 ++-- .../linux/platform-dependent/ubuntu-16.04/setup.sh | 4 ++-- .../linux/platform-dependent/ubuntu-18.04/setup.sh | 4 ++-- continuous-integration/windows/build.py | 2 +- setup.py | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index c816904b..f18ffc44 100644 --- a/README.md +++ b/README.md @@ -114,11 +114,11 @@ Please visit [Zivid Knowledge Base](http://help.zivid.com) for general informati | Operating System | Python version | Zivid SDK version | | :--------------- | :------------- | :---------------- | -| Ubuntu 18.04 | 3.6 | 1.5.0 | -| Ubuntu 16.04 | 3.5 | 1.5.0 | -| Fedora 30 | 3.7 | 1.5.0 | +| Ubuntu 18.04 | 3.6 | 1.6.0 | +| Ubuntu 16.04 | 3.5 | 1.6.0 | +| Fedora 30 | 3.7 | 1.6.0 | | Arch Linux* | latest | latest | -| Windows 10* | 3.5, 3.6, 3.7 | 1.5.0 | +| Windows 10* | 3.5, 3.6, 3.7 | 1.6.0 | [*] Only build, no unit testing. diff --git a/continuous-integration/linux/platform-dependent/fedora-30/setup.sh b/continuous-integration/linux/platform-dependent/fedora-30/setup.sh index 890ea876..cee7eafb 100755 --- a/continuous-integration/linux/platform-dependent/fedora-30/setup.sh +++ b/continuous-integration/linux/platform-dependent/fedora-30/setup.sh @@ -35,5 +35,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.5.0+63f281e2-26/u18/zivid-telicam-driver_2.0.0.1-1_amd64.deb || exit $? -install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.5.0+63f281e2-26/u18/zivid_1.5.0+63f281e2-26_amd64.deb || exit $? +install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.6.0+7a245bbe-26/u18/zivid-telicam-driver_2.0.0.1-1_amd64.deb || exit $? +install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.6.0+7a245bbe-26/u18/zivid_1.6.0+7a245bbe-26_amd64.deb || exit $? diff --git a/continuous-integration/linux/platform-dependent/ubuntu-16.04/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-16.04/setup.sh index a37975e9..70f26d6b 100755 --- a/continuous-integration/linux/platform-dependent/ubuntu-16.04/setup.sh +++ b/continuous-integration/linux/platform-dependent/ubuntu-16.04/setup.sh @@ -50,5 +50,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.5.0+63f281e2-26/u16/zivid-telicam-driver_2.0.0.1-1_amd64.deb || exit $? -install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.5.0+63f281e2-26/u16/zivid_1.5.0+63f281e2-26_amd64.deb || exit $? +install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.6.0+7a245bbe-26/u16/zivid-telicam-driver_2.0.0.1-1_amd64.deb || exit $? +install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.6.0+7a245bbe-26/u16/zivid_1.6.0+7a245bbe-26_amd64.deb || exit $? diff --git a/continuous-integration/linux/platform-dependent/ubuntu-18.04/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-18.04/setup.sh index 1e11dc9c..5f3af3da 100755 --- a/continuous-integration/linux/platform-dependent/ubuntu-18.04/setup.sh +++ b/continuous-integration/linux/platform-dependent/ubuntu-18.04/setup.sh @@ -44,5 +44,5 @@ function install_www_deb { rm -r $TMP_DIR || exit $? } -install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.5.0+63f281e2-26/u18/zivid-telicam-driver_2.0.0.1-1_amd64.deb || exit $? -install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.5.0+63f281e2-26/u18/zivid_1.5.0+63f281e2-26_amd64.deb || exit $? +install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.6.0+7a245bbe-26/u18/zivid-telicam-driver_2.0.0.1-1_amd64.deb || exit $? +install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/1.6.0+7a245bbe-26/u18/zivid_1.6.0+7a245bbe-26_amd64.deb || exit $? diff --git a/continuous-integration/windows/build.py b/continuous-integration/windows/build.py index d6e07064..f6eb8171 100644 --- a/continuous-integration/windows/build.py +++ b/continuous-integration/windows/build.py @@ -38,7 +38,7 @@ def _run_process(args): def _setup(): with tempfile.TemporaryDirectory() as temp_dir: - zivid_installer_url = "https://www.zivid.com/hubfs/softwarefiles/releases/1.5.0+63f281e2-26/windows/ZividSetup_1.5.0+63f281e2-26.exe" + zivid_installer_url = "https://www.zivid.com/hubfs/softwarefiles/releases/1.6.0+7a245bbe-26/windows/ZividSetup_1.6.0+7a245bbe-26.exe" print("Downloading {}".format(zivid_installer_url), flush=True) zivid_installer = Path(temp_dir) / "ZividSetup.exe" response = requests.get(zivid_installer_url) diff --git a/setup.py b/setup.py index a955eb6f..d972d7fd 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ def get_version(): def _zivid_sdk_version(): - return "1.5.0" + return "1.6.0" def _zivid_python_version():