Issue-551: Restricting python version and removing pkg_resources

.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

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
     rev: v2.6.0
     hooks:
     -   id: reorder-python-imports
-        files: ^src/|test/
+        files: ^ait/|tests/
 
 -   repo: local
     hooks:
@@ -27,7 +27,7 @@ repos:
     -   id: black
         name: black
         entry: black
-        files: ^src/|test/
+        files: ^ait/|tests/
         language: system
         types: [python]
 

.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

@@ -20,7 +20,7 @@
 """
 
 import os
-import pkg_resources
+from importlib.resources import files
 import struct
 import yaml
 from io import IOBase
@@ -513,7 +513,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

@@ -19,7 +19,7 @@
 """
 
 import os
-import pkg_resources
+from importlib.resources import files
 import re
 import yaml
 
@@ -73,7 +73,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

@@ -64,10 +64,11 @@
 """
 
 import os
-import pkg_resources
-import yaml
+from importlib.resources import files
 from io import IOBase
 
+import yaml
+
 import ait
 from ait.core import json, util
 
@@ -218,7 +219,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

@@ -21,13 +21,14 @@
 """
 
 import collections.abc
+import csv
 import os
-import pkg_resources
 import struct
-import yaml
-import csv
+from importlib.resources import files
 from io import IOBase
 
+import yaml
+
 import ait
 from ait.core import dtype, json, log, util
 
@@ -1094,7 +1095,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

pyproject.toml

@@ -13,26 +13,25 @@ repository = 'https://github.com/NASA-AMMOS/AIT-Core'
 documentation = 'https://ait-core.readthedocs.io/en/latest'
 authors       = ['AMMOS Instrument Toolkit Development Team <ait-pmc@googlegroups.com>']
 
-packages = [
-    {include = "ait"}
-]
+packages = [{ include = "ait" }]
 
-include = [
-    "ait/core/data/*.json"
-]
+include = ["ait/core/data/*.json"]
 
 [tool.poetry.dependencies]
-python           = '>= 3.7 < 3.11'
-bottle           = '0.12.23'
-jsonschema       = '3.0.2'
-pyyaml           = '5.3.1'  # Temporarily pinning this to 5.3.1 because pyyaml and Cython 3 don't get along
-requests         = '>= 2.22.0'
-greenlet         = '1.1.3'
-gevent           = '*'
-gevent-websocket = '0.10.1'
-pyzmq            = '24.0.0'
-gipc             = "^1.1.0"
-setproctitle = "^1.2.3"
+python              = ">= 3.10 < 3.12"
+bottle              = "0.12.23"
+jsonschema          = "4.25.1"
+pyyaml              = "6.0.1"
+requests            = ">= 2.22.0"
+greenlet            = "^3.1.1"
+gevent              = "25.9.1"
+gevent-websocket    = "0.10.1"
+pyzmq               = "24.0.0"
+gipc                = "^1.1.0"
+setproctitle        = "^1.2.3"
+msgpack             = "1.0.5"
+importlib_metadata  = "4.3.0"
+importlib_resources = "6.5.2"
 
 [tool.poetry.dev-dependencies]
 black                     = '*'
@@ -51,7 +50,7 @@ pytest-cov                = '*'
 pytest-watch              = '*'
 pytest-xdist              = '*'
 pre-commit                = '*'
-sphinx                    = '>= 4.2'
+sphinx                      = "4.4"
 sphinx-rtd-theme          = '*'
 sphinxcontrib-httpdomain  = '*'
 tox                       = '>= 3.8 < 4.0'

tests/ait/core/test_val.py

@@ -15,7 +15,7 @@
 gevent.monkey.patch_all()
 
 import os
-import pkg_resources
+from importlib.resources import files
 import jsonschema
 
 import pytest
@@ -441,7 +441,7 @@ def testTlmDictValidation():
 def testEvrValidation():
     # Validation test of current telemetry dictionary
     yml = ait.config.evrdict.filename
-    schema = os.path.join(os.path.dirname(yml), evr.getDefaultSchema())
+    schema = str(os.path.join(os.path.dirname(yml), evr.getDefaultSchema()))
     msgs, v = validate_schema([yml, schema])
     dispmsgs(msgs)
     assert v
@@ -451,7 +451,7 @@ def testEvrValidation():
 def testTableValidation():
     # Validation test of current table configuration
     yml = ait.config.table.filename
-    schema = pkg_resources.resource_filename("ait.core", "data/table_schema.json")
+    schema = str(files("ait.core").joinpath("data/table_schema.json"))
     msgs, v = validate_schema([yml, schema])
     dispmsgs(msgs)
     assert v
@@ -461,7 +461,7 @@ def testTableValidation():
 def testLimitsValidation():
     # Validation test of current table configuration
     yml = ait.config.limits.filename
-    schema = pkg_resources.resource_filename("ait.core", "data/limits_schema.json")
+    schema = str(files("ait.core").joinpath("data/limits_schema.json"))
     msgs, v = validate_schema([yml, schema])
     dispmsgs(msgs)
     assert v

tox.ini

@@ -1,20 +1,16 @@
 [tox]
 envlist =
-    py37
-    py38
-    py39
     py310
+    py311
     docs
     lint
 
 isolated_build = True
 
 [gh-actions]
 python =
-    3.7: py37
-    3.8: py38
-    3.9: py39
     3.10: py310, docs, lint, distcheck
+    3.11: py311, docs, lint, distcheck
 
 [testenv]
 setenv = AIT_CONFIG = {toxinidir}/config/config.yaml
@@ -31,15 +27,13 @@ commands_pre =
     poetry install
 commands =
     poetry run sphinx-build doc/source doc/build
-basepython = python3.10
 
 [testenv:lint]
 setenv = AIT_CONFIG = {toxinidir}/config/config.yaml
 commands_pre =
     poetry install
 commands=
     python -m pre_commit run --color=always {posargs:--all}
-basepython = python3.10
 
 [testenv:distcheck]
 skip_install = true