From a0b4450fe8cd585ffc2912ac69b3dd2c29472d84 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Wed, 14 Feb 2024 10:02:24 +1300 Subject: [PATCH 1/2] Update to MAVSDK v2.2.0 Signed-off-by: Julian Oes --- MAVSDK_SERVER_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAVSDK_SERVER_VERSION b/MAVSDK_SERVER_VERSION index 1defe531..a4b6ac3d 100644 --- a/MAVSDK_SERVER_VERSION +++ b/MAVSDK_SERVER_VERSION @@ -1 +1 @@ -v2.1.0 +v2.2.0 From d6d53e65d4d84daf97939a4edfa79cc38c0bba72 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Wed, 14 Feb 2024 10:25:34 +1300 Subject: [PATCH 2/2] setup: fix version for setuptools=66 We need to append the git hash with a +. Signed-off-by: Julian Oes --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 097f2960..ff704d3f 100644 --- a/setup.py +++ b/setup.py @@ -120,11 +120,14 @@ def download_mavsdk_server(self): def version(): process = subprocess.Popen(["git", "describe", "--tags"], stdout=subprocess.PIPE) - (output, err) = process.communicate() + output, _ = process.communicate() exit_code = process.wait() if exit_code != 0: raise RuntimeError(f"git describe command exited with: {exit_code}") - return output.decode("utf-8").strip() + git_describe_str = output.decode("utf-8").strip() + git_describe_str = git_describe_str.replace("-g", "+g") + print(git_describe_str) + return git_describe_str setup(