v8.0.0-beta1

snstac · Jun 22, 2024 · e5e4a8b · e5e4a8b
1 parent add9cad
commit e5e4a8b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 35 deletions.
diff --git 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: <https://github.com/snstac/adsbcot>
-"""
+__version__ = "8.0.0-beta1"
 
-__version__ = "7.0.1"
-__author__ = "Greg Albrecht <[email protected]>"
-__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
@@ -51,11 +51,6 @@
  warnings.warn("ADSBCOT ignoring ImportError for: pyModeS")
 
 
-__author__ = "Greg Albrecht <[email protected]>"
-__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
@@ -20,10 +20,6 @@
 
 import pytak
 
-__author__ = "Greg Albrecht <[email protected]>"
-__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
@@ -18,11 +18,6 @@
 
 """ADSBCOT Constants."""
 
-__author__ = "Greg Albrecht <[email protected]>"
-__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:https:///run/dump1090-fa/aircraft.json"
 

diff --git a/adsbcot/functions.py b/adsbcot/functions.py
@@ -31,10 +31,6 @@
 import pytak
 import adsbcot
 
-__author__ = "Greg Albrecht <[email protected]>"
-__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
@@ -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:https://` & `file:https://` based ADS-B data feeds. To use TCP RAW (SBS-1) or TCP binary Beast protocols, you'll need to install pyModeS, see below.