Merge pull request #554 from NASA-AMMOS/issue-551-2.x_updated

Issue-551: Restricting python version and removing pkg_resources (2.x)

Author: EmilyPascua

.github/workflows/full_build.yaml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.10","3.11"]
     runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v3

.python-version

@@ -1,4 +1,2 @@
-3.7.15
-3.8.15
-3.9.15
-3.10.8
+3.10.20
+3.11

ait/core/cmd.py

@@ -19,9 +19,9 @@
 """
 import os
 import struct
+from importlib.resources import files
 from io import IOBase
 
-import pkg_resources
 import yaml
 
 import ait
@@ -518,7 +518,7 @@ def getDefaultDictFilename():  # noqa
 
 
 def getDefaultSchema():  # noqa
-    return pkg_resources.resource_filename("ait.core", "data/cmd_schema.json")
+    return str(files("ait.core").joinpath("data/cmd_schema.json"))
 
 
 def getMaxCmdSize():  # noqa

ait/core/evr.py

@@ -18,8 +18,8 @@
 """
 import os
 import re
+from importlib.resources import files
 
-import pkg_resources
 import yaml
 
 import ait.core
@@ -75,7 +75,7 @@ def toJSON(self):  # noqa
 
 
 def getDefaultSchema():  # noqa
-    return pkg_resources.resource_filename("ait.core", "data/evr_schema.json")
+    return str(files("ait.core").joinpath("data/evr_schema.json"))
 
 
 def getDefaultDict(reload=False):  # noqa

ait/core/limits.py

@@ -68,9 +68,9 @@
 
 """
 import os
+from importlib.resources import files
 from io import IOBase
 
-import pkg_resources
 import yaml
 
 import ait
@@ -224,7 +224,7 @@ def getDefaultDict(reload=False):  # noqa
 
 
 def getDefaultSchema():  # noqa
-    return pkg_resources.resource_filename("ait.core", "data/limits_schema.json")
+    return str(files("ait.core").joinpath("data/limits_schema.json"))
 
 
 def getDefaultDictFilename():  # noqa

ait/core/tlm.py

@@ -22,9 +22,9 @@
 import csv
 import os
 import struct
+from importlib.resources import files
 from io import IOBase
 
-import pkg_resources
 import yaml
 
 import ait
@@ -1096,7 +1096,7 @@ def getDefaultDict(reload=False):  # noqa
 
 
 def getDefaultSchema():  # noqa
-    return pkg_resources.resource_filename("ait.core", "data/tlm_schema.json")
+    return str(files("ait.core").joinpath("data/tlm_schema.json"))
 
 
 def getDefaultDictFilename():  # noqa