Merge pull request #253 from AndroxxTraxxon/master

update builtin collections imports to be forward-compatible with Python3.10+

.coveragerc

@@ -21,6 +21,5 @@ exclude_lines =
     if __name__ == .__main__.:
 
 ignore_errors = True
+omit = orquesta/tests/*
 
-omit =
-	tests/*

.github/workflows/tox.yml

@@ -12,11 +12,10 @@ on:
 
 jobs:
   tests:
-    #python 3.6 not available on ubuntu-latest
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ["3.6", "3.8"]
+        python-version: ["3.6", "3.8", "3.9", "3.10", "3.11"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -30,5 +29,4 @@ jobs:
           pip install -r requirements-ci.txt
           make clean reqs schemas
       - name: "Run tox for ${{ matrix.python-version }}"
-        run: |
-          make check
+        run: make check

CHANGELOG.rst

@@ -7,6 +7,12 @@ In Development
 Changed
 ~~~~~~~
 
+* Update deprecated `collections` imports to `collections.abc` to be forward-compatible with Python3.10
+  Contributed by @AndroxxTraxxon
+* Migrate from `nosetest` to `pytest` for Python test runner.
+  Contributed by @AndroxxTraxxon
+* Add Python versions 3.9, 3.10, and 3.11 to the test matrix
+  Contributed by @AndroxxTraxxon
 * Update networkx >=2.6 for Python 3.8 to fix insecure deserialization #255 (improvement)
   Contributed by @Stealthii
 * Update jsonschema requirements to allow 3.2 (improvement)

orquesta/conducting.py

@@ -370,7 +370,6 @@ def log_entry(
         result=None,
         data=None,
     ):
-
         # Check entry type.
         if entry_type not in ["info", "warn", "error"]:
             raise exc.WorkflowLogEntryError('The log entry type "%s" is not valid.' % entry_type)

orquesta/expressions/functions/workflow.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import collections
+import collections.abc
 
 from orquesta import constants
 from orquesta import exceptions as exc
@@ -117,8 +117,8 @@ def item_(context, key=None):
     if not key:
         return current_item
 
-    if not isinstance(current_item, collections.Mapping):
-        raise exc.ExpressionEvaluationException("Item is not type of collections.Mapping.")
+    if not isinstance(current_item, collections.abc.Mapping):
+        raise exc.ExpressionEvaluationException("Item is not type of collections.abc.Mapping.")
 
     if key not in current_item:
         raise exc.ExpressionEvaluationException('Item does not have key "%s".' % key)

orquesta/specs/base.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import collections
+import collections.abc
 import inspect
 import json
 import jsonschema
@@ -613,7 +613,7 @@ def update(self, *args, **kwargs):
         raise NotImplementedError()
 
 
-class SequenceSpec(Spec, collections.MutableSequence):
+class SequenceSpec(Spec, collections.abc.MutableSequence):
     def __init__(self, spec, name=None, member=False):
         super(SequenceSpec, self).__init__(spec, name=name, member=member)
 

orquesta/tests/hacking/import_aliases_rule.py

@@ -59,7 +59,6 @@
 
 
 def get_alias(logical_line):
-
     parts = logical_line.split()
 
     if (
@@ -68,7 +67,6 @@ def get_alias(logical_line):
         and parts[1] != "__future__"
         and not core.is_import_exception(parts[1])
     ):
-
         # from path.to.module import module
         if len(parts) == 4:
             return ".".join([parts[1], parts[3]]), None

orquesta/tests/unit/base.py

@@ -156,7 +156,6 @@ def format_task_item(
         items_count=None,
         items_concurrency=None,
     ):
-
         if not actions and items_count is None:
             actions = [{"action": spec.action, "input": spec.input}]
 
@@ -285,7 +284,6 @@ def assert_task_items(
         concurrency=None,
         mock_ac_ex_results=None,
     ):
-
         # Set up test cases.
         tests = list(zip(mock_ac_ex_statuses, expected_task_statuses, expected_workflow_statuses))
         tk_ex_result = [None] * len(items)

orquesta/tests/unit/conducting/native/test_task_rendering_for_with_items.py

@@ -81,7 +81,7 @@ def test_bad_item_type(self):
                 "type": "error",
                 "message": (
                     "YaqlEvaluationException: Unable to evaluate expression '<% item(x) %>'. "
-                    "ExpressionEvaluationException: Item is not type of collections.Mapping."
+                    "ExpressionEvaluationException: Item is not type of collections.abc.Mapping."
                 ),
                 "task_id": "task1",
                 "route": 0,

orquesta/tests/unit/specs/native/test_workflow_rehearsal_spec.py

@@ -211,8 +211,7 @@ def test_init_test_spec_with_mock_action_execution_yml_result_path(self):
     def test_init_test_spec_with_base_path(self):
         shutil.copy(self.get_wf_file_path("sequential"), "/tmp/sequential.yaml")
 
-        fd, path = tempfile.mkstemp(suffix=".json")
-
+        fd, path = tempfile.mkstemp(suffix=".json", dir="/tmp")
         with os.fdopen(fd, "w") as tmp:
             tmp.write('{"foo": "bar"}\n')
 

requirements-ci.txt

@@ -1,4 +1,4 @@
 # Different versions of tox are required by python version
 tox-gh-actions
 tox==3.28.0 ; python_version == "3.6"
-tox==4.6.4 ; python_version == "3.8"
+tox==4.11.3; python_version >= "3.8"

requirements-test.txt

@@ -3,8 +3,8 @@ coverage
 flake8<3.9.0,>=3.8.0
 hacking
 mock>=1.0
-nose
-nosexcover
+pytest
+pytest-cov
 pep8>=1.6.0,<1.7
 pylint>=2.5.2,<2.6
 twine

tox.ini

@@ -1,23 +1,27 @@
 [tox]
-envlist = py36,py38,pep8,docs
+envlist = py36,py38,py39,py310,py311,pep8,docs
 minversion = 1.6
 skipsdist = True
 
 [gh-actions]
 python =
-    3.6: py36,pep8,docs
-    3.8: py38
+    3.6: py36
+    3.8: py38,pep8,docs
+    3.9: py39
+    3.10: py310
+    3.11: py311
 
 [testenv]
 usedevelop = True
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/requirements-test.txt
 commands =
-    nosetests -sv --with-xcoverage --cover-package=orquesta orquesta.tests
+    pytest --cov=orquesta --cov-report=term orquesta/tests
 
 [testenv:pep8]
 deps =
+    -r{toxinidir}/requirements.txt
     -r{toxinidir}/requirements-test.txt
 commands =
     pylint -E --rcfile={toxinidir}/.pylintrc orquesta
@@ -26,7 +30,9 @@ commands =
 
 [testenv:docs]
 deps =
+    -r{toxinidir}/requirements.txt
     -r{toxinidir}/requirements-docs.txt
+    -e{toxinidir}
 commands =
     python {toxinidir}/bin/orquesta-generate-schemas
     sphinx-build -W -b html docs/source docs/build/html