From 3584e1ba81b030647bfb8848c500fd454149ac21 Mon Sep 17 00:00:00 2001 From: Brian Wallen Date: Wed, 19 Jun 2024 15:06:52 -0400 Subject: [PATCH] Changed takproto dependency, updated installation instructions in the README --- README.md | 5 ++++- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9fa55cf..73e0b15 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ versions 3.8 and up. There is a bug in the takproto library which causes an exception in TAK Meshtastic Gateway when parsing XML CoT data. There is a [PR](https://github.com/snstac/takproto/pull/16) that will fix the issue once it is merged. Until it is merged, -TAK Meshtastic Gateway will install takproto from the GitHub PR instead of PyPI. +you will need to manually install from the pull request using the installation instructions below. On Windows, the `unishox2-py3` library fails to build from the source distribution with the command `pip install unishox2-py3`. TAK Meshtastic Gateway will instead install [this wheel](https://github.com/brian7704/OpenTAKServer-Installer/blob/master/unishox2_py3-1.0.0-cp312-cp312-win_amd64.whl). @@ -46,6 +46,7 @@ The unishox2-py3 Python library requires C build tools. In Debian based distros ```shell python3 -m venv tak_meshtastic_gateway_venv . ./tak_meshtastic_gateway_venv/bin/activate +pip install git+https://github.com/snstac/takproto@refs/pull/16/merge pip install tak-meshtastic-gateway ``` @@ -54,6 +55,8 @@ pip install tak-meshtastic-gateway ```powershell python -m venv tak_meshtastic_gateway_venv .\tak_meshtastic_gateway_venv\Scripts\activate +pip install https://github.com/brian7704/OpenTAKServer-Installer/raw/master/unishox2_py3-1.0.0-cp312-cp312-win_amd64.whl +pip install git+https://github.com/snstac/takproto@refs/pull/16/merge pip install tak-meshtastic-gateway ``` diff --git a/pyproject.toml b/pyproject.toml index 81d271f..1afeaa5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ pypubsub = "4.0.3" colorlog = "6.8.2" unishox2-py3 = "1.0.0" netifaces2 = "0.0.22" -takproto = {git = "https://github.com/snstac/takproto", rev = "refs/pull/16/merge"} +takproto = "*" [tool.poetry-dynamic-versioning] enable = true