From e5e4a8b16e48057b743dd5c609b1bf84fff12128 Mon Sep 17 00:00:00 2001 From: Greg Albrecht Date: Sat, 22 Jun 2024 14:52:42 -0700 Subject: [PATCH] v8.0.0-beta1 --- adsbcot/__init__.py | 15 ++++----------- adsbcot/classes.py | 5 ----- adsbcot/commands.py | 4 ---- adsbcot/constants.py | 5 ----- adsbcot/functions.py | 4 ---- docs/installation.md | 12 ++++++------ 6 files changed, 10 insertions(+), 35 deletions(-) diff --git a/adsbcot/__init__.py b/adsbcot/__init__.py index bfb651c..ae83b7b 100644 --- a/adsbcot/__init__.py +++ b/adsbcot/__init__.py @@ -16,17 +16,11 @@ # limitations under the License. # -"""ADS-B to TAK Gateway. +"""ADS-B to TAK Gateway.""" -:source: -""" +__version__ = "8.0.0-beta1" -__version__ = "7.0.1" -__author__ = "Greg Albrecht " -__copyright__ = "Copyright Sensors & Signals LLC https://www.snstac.com" -__license__ = "Apache License, Version 2.0" - -# Python 3.6 test/build work-around: +# COMPAT Python 3.6 test/build work-around: try: from .constants import ( # NOQA DEFAULT_POLL_INTERVAL, @@ -41,5 +35,4 @@ except ImportError as exc: import warnings - warnings.warn(str(exc)) - warnings.warn("ADSBCOT ignoring ImportError - Python 3.6 compat work-around.") + warnings.warn(f"COMPAT Python 3.6. Ignoring Exception {str(exc)}") diff --git a/adsbcot/classes.py b/adsbcot/classes.py index c4b5179..8e60431 100644 --- a/adsbcot/classes.py +++ b/adsbcot/classes.py @@ -51,11 +51,6 @@ warnings.warn("ADSBCOT ignoring ImportError for: pyModeS") -__author__ = "Greg Albrecht " -__copyright__ = "Copyright Sensors & Signals LLC https://www.snstac.com" -__license__ = "Apache License, Version 2.0" - - class ADSBWorker(pytak.QueueWorker): """Read ADS-B Data from inputs, serialize to CoT, and put on TX queue.""" diff --git a/adsbcot/commands.py b/adsbcot/commands.py index a7db558..742ff70 100644 --- a/adsbcot/commands.py +++ b/adsbcot/commands.py @@ -20,10 +20,6 @@ import pytak -__author__ = "Greg Albrecht " -__copyright__ = "Copyright Sensors & Signals LLC https://www.snstac.com" -__license__ = "Apache License, Version 2.0" - def main() -> None: """Boilerplate main func.""" diff --git a/adsbcot/constants.py b/adsbcot/constants.py index a5d1449..2dee4fa 100644 --- a/adsbcot/constants.py +++ b/adsbcot/constants.py @@ -18,11 +18,6 @@ """ADSBCOT Constants.""" -__author__ = "Greg Albrecht " -__copyright__ = "Copyright Sensors & Signals LLC https://www.snstac.com" -__license__ = "Apache License, Version 2.0" - - # Feed URL to use out of the box, in this case the JSON from the local filesystem. DEFAULT_FEED_URL: str = "file:///run/dump1090-fa/aircraft.json" diff --git a/adsbcot/functions.py b/adsbcot/functions.py index d36fe0d..7c7639e 100644 --- a/adsbcot/functions.py +++ b/adsbcot/functions.py @@ -31,10 +31,6 @@ import pytak import adsbcot -__author__ = "Greg Albrecht " -__copyright__ = "Copyright Sensors & Signals LLC https://www.snstac.com" -__license__ = "Apache License, Version 2.0" - APP_NAME = "adsbcot" diff --git a/docs/installation.md b/docs/installation.md index 47c5c72..f6e72bc 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -8,12 +8,12 @@ Install ADSBCOT, and prerequisite packages of [PyTAK](https://pytak.rtfd.io) & [ ```sh linenums="1" sudo apt update -wget https://github.com/ampledata/aircot/releases/latest/download/python3-aircot_latest_all.deb -sudo apt install -f ./python3-aircot_latest_all.deb -wget https://github.com/ampledata/pytak/releases/latest/download/python3-pytak_latest_all.deb -sudo apt install -f ./python3-pytak_latest_all.deb -wget https://github.com/ampledata/adsbcot/releases/latest/download/python3-adsbcot_latest_all.deb -sudo apt install -f ./python3-adsbcot_latest_all.deb +wget https://github.com/ampledata/aircot/releases/latest/download/aircot_latest_all.deb +sudo apt install -f ./aircot_latest_all.deb +wget https://github.com/ampledata/pytak/releases/latest/download/pytak_latest_all.deb +sudo apt install -f ./pytak_latest_all.deb +wget https://github.com/ampledata/adsbcot/releases/latest/download/adsbcot_latest_all.deb +sudo apt install -f ./adsbcot_latest_all.deb ``` > **N.B.** This installation method only supports `http://` & `file://` based ADS-B data feeds. To use TCP RAW (SBS-1) or TCP binary Beast protocols, you'll need to install pyModeS, see below.