fixing for 3.12 tests

snstac · Jun 20, 2024 · e2e346a · e2e346a
1 parent 19e511d
commit e2e346a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/aiscot/__init__.py b/aiscot/__init__.py
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-"""AISCOT: AIS to TAK Gateway - Display Ships in TAK."""
+"""AISCOT: Display Ships in TAK - AIS to TAK Gateway"""
 
 __version__ = "6.0.0-beta1"
 
@@ -40,8 +40,7 @@
     from .ais_functions import get_known_craft
 
     from .classes import AISWorker
-except ImportError as exc:
+except ImportError:
     import warnings
 
-    warnings.warn(str(exc))
-    warnings.warn("Ignoring ImportError - Python 3.6 compat work-around.")
+    warnings.warn("COMPAT: Python 3.6. Ignoring ImportError.")
diff --git a/aiscot/constants.py b/aiscot/constants.py
@@ -21,7 +21,11 @@
 
 import logging
 import os
-import pkg_resources
+
+try:
+    from pkg_resources import resource_filename as find
+except ImportError:
+    from importlib.resources import files as find
 
 
 if bool(os.environ.get("DEBUG")):
@@ -46,11 +50,9 @@
 
 DEFAULT_POLL_INTERVAL: int = 61
 
-DEFAULT_MID_DB_FILE = pkg_resources.resource_filename(
+DEFAULT_MID_DB_FILE = find(
     __name__,
     "data/MaritimeIdentificationDigits-bb62983a-cf0e-40a1-9431-cd54eaeb1c85.csv",
 )
 
-DEFAULT_SHIP_DB_FILE = pkg_resources.resource_filename(
-    __name__, "data/yadd_mmsi_ship_2023-02-11-001541.txt"
-)
+DEFAULT_SHIP_DB_FILE = find(__name__, "data/yadd_mmsi_ship_2023-02-11-001541.txt")
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -3,4 +3,3 @@ pytest-cov
 pylint
 flake8
 black
-pkg_resources
diff --git a/setup.cfg b/setup.cfg
@@ -95,7 +95,6 @@ test =
   pylint
   flake8
   black
-  pkg_resources
 [isort]
 profile = black