Skip to content

Commit

Permalink
Merge pull request #26 from zivid/bump-zivid-sdk
Browse files Browse the repository at this point in the history
Bumped Zivid SDK version to 1.6 from 1.5
  • Loading branch information
nedrebo authored Nov 11, 2019
2 parents a6e4022 + f1b357a commit 2498acc
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 $?
Original file line number Diff line number Diff line change
Expand Up @@ -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 $?
Original file line number Diff line number Diff line change
Expand Up @@ -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 $?
2 changes: 1 addition & 1 deletion continuous-integration/windows/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def get_version():


def _zivid_sdk_version():
return "1.5.0"
return "1.6.0"


def _zivid_python_version():
Expand Down

0 comments on commit 2498acc

Please sign in to comment.