From e103cbd8186e129a744a75fa93ad9e4600557863 Mon Sep 17 00:00:00 2001
From: Greg Albrecht W2GMD <github@undef.net>
Date: Thu, 26 Dec 2024 15:08:38 -0800
Subject: [PATCH] 6.1.0 beta updates

- Removing py 3.6
- Adding support for seavision
---
 .github/workflows/python-test_and_lint.yml |  2 --
 CHANGELOG.md                               |  5 ++++
 README.md                                  | 21 ++++++-------
 aiscot/__init__.py                         | 35 ++++++++++------------
 setup.cfg                                  |  1 -
 5 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/python-test_and_lint.yml b/.github/workflows/python-test_and_lint.yml
index be23fe1..e132d7f 100644
--- a/.github/workflows/python-test_and_lint.yml
+++ b/.github/workflows/python-test_and_lint.yml
@@ -13,8 +13,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # FIXME: Disabled 3.6 to bypass PyTAK error.
-        # python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
         python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
 
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1af1e4a..eb06f03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## AISCOT 6.1.0
+
+- Added support for DOT's SeaVision.
+- Dropped support for Python 3.6
+
 ## AISCOT 6.0.0
 
 - New for 2024.
diff --git a/README.md b/README.md
index edc2ec6..c45fd09 100644
--- a/README.md
+++ b/README.md
@@ -2,22 +2,19 @@
 
 # Display Ships in TAK - AIS to TAK Gateway 
 
-AISCOT is software for monitoring and analyzing maritime surveillance data within the 
-Team Awareness KIT (TAK) suite of products.
+## Features
 
-AISCOT captures and reports real-time automatic identification system (AIS) data 
-received from vessels (or other maritime objects) into TAK Products using native TAK 
-protocols, including Cursor on Target (CoT).
+- Real-time AIS data capture and reporting
+- Integration with TAK products using native protocols
+- Compatibility with ATAK, WinTAK, iTAK, TAK Server & TAKX
+- Support for RF AIS transmissions, local NMEA, and Internet AIS aggregators
+- Display of AIS data with icons, attitude, type, track, bearing, speed, callsign, and more
 
-AISCOT has been evaluated with ATAK, WinTAK, iTAK, TAK Server & TAKX, and is know to 
-work with other situational awareness (SA) software.
+## Use Case
 
-AISCOT supports over-the-air radio (RF) AIS transmissions, local NMEA, and Internet 
-AIS aggregators (like AISHUB). AIS data is displayed in TAK with appropriate icons, 
-attitude, type, track, bearing, speed, callsign and more.
+Originally developed to support an [open ocean boat race in the Northern Pacific Ocean](http://ampledata.org/boat_race_support.html).
 
-AISCOT was original developed to support an [open ocean boat race in the Northern 
-Pacific Ocean](http://ampledata.org/boat_race_support.html).
+## Documentation
 
 [AISCOT documentation is available here.](https://aiscot.rtfd.io)
 
diff --git a/aiscot/__init__.py b/aiscot/__init__.py
index 18aa832..a52c52c 100644
--- a/aiscot/__init__.py
+++ b/aiscot/__init__.py
@@ -19,28 +19,23 @@
 
 """AISCOT: Display Ships in TAK - AIS to TAK Gateway"""
 
-__version__ = "6.0.0-beta6"
+__version__ = "6.1.0"
 
-# Python 3.6 test/build work-around:
-try:
-    from .constants import (
-        LOG_FORMAT,
-        LOG_LEVEL,
-        DEFAULT_LISTEN_PORT,
-        DEFAULT_LISTEN_HOST,
-        DEFAULT_COT_TYPE,
-        DEFAULT_COT_STALE,
-        DEFAULT_POLL_INTERVAL,
-        DEFAULT_MID_DB_FILE,
-        DEFAULT_SHIP_DB_FILE,
-    )
 
-    from .functions import ais_to_cot, create_tasks
+from .constants import (
+    LOG_FORMAT,
+    LOG_LEVEL,
+    DEFAULT_LISTEN_PORT,
+    DEFAULT_LISTEN_HOST,
+    DEFAULT_COT_TYPE,
+    DEFAULT_COT_STALE,
+    DEFAULT_POLL_INTERVAL,
+    DEFAULT_MID_DB_FILE,
+    DEFAULT_SHIP_DB_FILE,
+)
 
-    from .ais_functions import get_known_craft
+from .functions import ais_to_cot, create_tasks
 
-    from .classes import AISWorker
-except ImportError:
-    import warnings
+from .ais_functions import get_known_craft
 
-    warnings.warn("COMPAT: Python 3.6. Ignoring ImportError.")
+from .classes import AISWorker
diff --git a/setup.cfg b/setup.cfg
index edeb454..7ecebc7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -39,7 +39,6 @@ classifiers =
   Programming Language :: Python
   Programming Language :: Python :: 3
   Programming Language :: Python :: 3 :: Only
-  # Programming Language :: Python :: 3.6
   Programming Language :: Python :: 3.7
   Programming Language :: Python :: 3.8
   Programming Language :: Python :: 3.9