Skip to content

Commit

Permalink
Merge pull request #158 from zivid/bump-to-SDK-2.6.0
Browse files Browse the repository at this point in the history
Bump SDK version from 2.5.0 to 2.6.0
  • Loading branch information
eskaur authored Jan 8, 2022
2 parents ffc7df6 + db636da commit e61754b
Show file tree
Hide file tree
Showing 16 changed files with 448 additions and 27 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.6 or higher
* [Zivid SDK][zivid-download-software-url] version 2.5.0 (see [here][zivid-software-installation-url] for help)
* [Zivid SDK][zivid-download-software-url] version 2.6.0 (see [here][zivid-software-installation-url] for help)
* [Compiler](doc/CompilerInstallation.md) with C++17 support

*Windows users also needs to make sure that the Zivid SDK installation folder is in system `PATH` before using the package, not only the terminal PATH variable. The default install location that should be added to system `PATH` is `C:\Program Files\Zivid\bin`.*
Expand Down Expand Up @@ -146,14 +146,14 @@ Please visit [Zivid Knowledge Base][zivid-knowledge-base-url] for general inform

| Operating System | Python version | Zivid SDK version |
| :--------------- | :----------------------- | :---------------- |
| Ubuntu 20.04 | 3.8 | 2.5.0 |
| Ubuntu 18.04 | 3.6 | 2.5.0 |
| Fedora 30 | 3.7 | 2.5.0 |
| Fedora 33 | 3.9 | 2.5.0 |
| Fedora 34 | 3.9 | 2.5.0 |
| Fedora 35 | 3.10 | 2.5.0 |
| Windows 10 | 3.6, 3.7, 3.8, 3.9, 3.10 | 2.5.0 |
| Arch Linux | latest | 2.5.0 |
| Ubuntu 20.04 | 3.8 | 2.6.0 |
| Ubuntu 18.04 | 3.6 | 2.6.0 |
| Fedora 30 | 3.7 | 2.6.0 |
| Fedora 33 | 3.9 | 2.6.0 |
| Fedora 34 | 3.9 | 2.6.0 |
| Fedora 35 | 3.10 | 2.6.0 |
| Windows 10 | 3.6, 3.7, 3.8, 3.9, 3.10 | 2.6.0 |
| Arch Linux | latest | 2.6.0 |

[header-image]: https://www.zivid.com/hubfs/softwarefiles/images/zivid-generic-github-header.png
[ci-badge]: https://img.shields.io/github/workflow/status/zivid/zivid-python/Main%20CI%20workflow/master
Expand Down
2 changes: 1 addition & 1 deletion continuous-integration/deployment/expected-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.0.2.5.0
2.4.0.2.6.0
4 changes: 2 additions & 2 deletions continuous-integration/linux/platform-dependent/arch/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ function aur_install {
ln -s /usr/lib/libtinfo.so.{6,5} || exit $?
aur_install intel-opencl-runtime a7db4fe8cfa872078034f7966bb2def788bf8e5d ncurses5-compat-libs || exit $?

aur_install zivid-telicam-driver 65aa6bbe383c8e45fdb449091ec4a21aef1d38a6 || exit $?
aur_install zivid 56755c1996eb5b35fd4957c0192f6ed4c471b7a7 || exit $?
aur_install zivid-telicam-driver fdb8aed85e9b99bac1248886bc1bcb0749336abf || exit $?
aur_install zivid 3de8cdad9965221572902613c36523f5c5aecc94 || exit $?
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ function install_www_deb {
rm -r $TMP_DIR || exit $?
}

install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u18/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u18/zivid_2.5.0+19fa6891-1_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u18/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u18/zivid_2.6.0+fa0036c5-1_amd64.deb || exit $?
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ function install_www_deb {
rm -r $TMP_DIR || exit $?
}

install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u18/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u18/zivid_2.5.0+19fa6891-1_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u18/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u18/zivid_2.6.0+fa0036c5-1_amd64.deb || exit $?
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ function install_www_deb {
rm -r $TMP_DIR || exit $?
}

install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u20/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u20/zivid_2.5.0+19fa6891-1_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u20/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u20/zivid_2.6.0+fa0036c5-1_amd64.deb || exit $?
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ function install_www_deb {
rm -r $TMP_DIR || exit $?
}

install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u20/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u20/zivid_2.5.0+19fa6891-1_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u20/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u20/zivid_2.6.0+fa0036c5-1_amd64.deb || exit $?
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ function install_www_deb {
rm -r $TMP_DIR || exit $?
}

install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u18/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u18/zivid_2.5.0+19fa6891-1_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u18/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u18/zivid_2.6.0+fa0036c5-1_amd64.deb || exit $?
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ function install_www_deb {
rm -r $TMP_DIR || exit $?
}

install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u20/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/u20/zivid_2.5.0+19fa6891-1_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u20/zivid-telicam-driver_3.0.1.1-3_amd64.deb || exit $?
install_www_deb https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/u20/zivid_2.6.0+fa0036c5-1_amd64.deb || exit $?
2 changes: 1 addition & 1 deletion continuous-integration/windows/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def _install_zivid_sdk():
import requests # pylint: disable=import-outside-toplevel

with tempfile.TemporaryDirectory() as temp_dir:
zivid_installer_url = "https://www.zivid.com/hubfs/softwarefiles/releases/2.5.0+19fa6891-1/windows/ZividSetup_2.5.0+19fa6891-1.exe"
zivid_installer_url = "https://www.zivid.com/hubfs/softwarefiles/releases/2.6.0+fa0036c5-1/windows/ZividSetup_2.6.0+fa0036c5-1.exe"
print("Downloading {}".format(zivid_installer_url), flush=True)
zivid_installer = Path(temp_dir) / "ZividSetup.exe"
response = requests.get(zivid_installer_url)
Expand Down
Loading

0 comments on commit e61754b

Please sign in to comment.