Drop six (#271)

Author: cognifloyd

.github/workflows/tox.yml

@@ -7,7 +7,7 @@ on:
     branches:
       - master
   schedule:
-    # run every Monday at 6 AM
+    # run every Monday at 6am
     - cron: '0 6 * * 1'
 
 jobs:

CHANGELOG.rst

@@ -37,6 +37,8 @@ Fixed
   Contributed by @Stealthii
 * Update jsonschema requirements to allow 3.2 (security fix)
   Contributed by @james-bellamy
+* Removed six from code base since py2 is not supported.
+  Contributed by @nzlosh
 
 1.5.0
 -----

bin/orquesta-generate-schemas

@@ -1,3 +1,4 @@
+# Copyright 2021 The StackStorm Authors.
 # Licensed to the StackStorm, Inc ('StackStorm') under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -18,7 +19,6 @@ from __future__ import absolute_import
 import inspect
 import json
 import os
-import six
 import sys
 
 from orquesta.specs import native
@@ -32,7 +32,7 @@ def main():
     scripts_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
     schemas_dir = scripts_dir + "/../docs/source/schemas"
 
-    for name, model in six.iteritems(workflow_models):
+    for name, model in workflow_models.items():
         new_schema_text = json.dumps(model.get_schema(), indent=4) + "\n"
         print('Generated schema for the "%s" model.' % name)
 

orquesta/composers/base.py

@@ -1,3 +1,4 @@
+# Copyright 2021 The StackStorm Authors.
 # Copyright 2019 Extreme Networks, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +15,6 @@
 
 import abc
 import logging
-import six
 
 from orquesta.utils import plugin as plugin_util
 
@@ -26,8 +26,7 @@ def get_composer(catalog):
     return plugin_util.get_module("orquesta.composers", catalog)
 
 
-@six.add_metaclass(abc.ABCMeta)
-class WorkflowComposer(object):
+class WorkflowComposer(object, metaclass=abc.ABCMeta):
     wf_spec_type = None
 
     @classmethod

orquesta/composers/native.py

@@ -1,3 +1,4 @@
+# Copyright 2021 The StackStorm Authors.
 # Copyright 2019 Extreme Networks, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +14,7 @@
 # limitations under the License.
 
 import logging
-from six.moves import queue
+import queue
 
 from orquesta.composers import base as comp_base
 from orquesta import graphing

orquesta/conducting.py

@@ -14,9 +14,7 @@
 # limitations under the License.
 
 import logging
-import six
-
-from six.moves import queue
+import queue
 
 from orquesta import constants
 from orquesta import events
@@ -119,7 +117,7 @@ def get_task_sequence(self, task_id, route):
             task_id, route = q.get()
 
             for i, t in enumerate(self.sequence):
-                for k, v in six.iteritems(t["prev"]):
+                for k, v in t["prev"].items():
                     p = self.sequence[v]
                     if p["id"] == task_id and p["route"] == route:
                         seq.append((i, t))
@@ -590,7 +588,7 @@ def get_task(self, task_id, route):
         if getattr(task_spec, "delay", None):
             task_delay = task_spec.delay
 
-            if isinstance(task_delay, six.string_types):
+            if isinstance(task_delay, str):
                 task_delay = expr_base.evaluate(task_delay, task_ctx)
 
             if not isinstance(task_delay, int):
@@ -790,7 +788,7 @@ def setup_retry_in_task_state(self, task_state_entry, in_ctx_idxs):
 
         # Evaluate the retry delay value.
         if "delay" in task_state_entry["retry"] and isinstance(
-            task_state_entry["retry"]["delay"], six.string_types
+            task_state_entry["retry"]["delay"], str
         ):
             delay_value = expr_base.evaluate(task_state_entry["retry"]["delay"], in_ctx)
 
@@ -801,7 +799,7 @@ def setup_retry_in_task_state(self, task_state_entry, in_ctx_idxs):
 
         # Evaluate the retry count value.
         if "count" in task_state_entry["retry"] and isinstance(
-            task_state_entry["retry"]["count"], six.string_types
+            task_state_entry["retry"]["count"], str
         ):
             count_value = expr_base.evaluate(task_state_entry["retry"]["count"], in_ctx)
 
@@ -1227,7 +1225,7 @@ def _collapse_task_rerun_requests(self, tasks=None):
         # Only the index is required for further evaluation below.
         result = {
             k: [i[0] for i in self.workflow_state.get_task_sequence(t.task_id, t.route)]
-            for k, t in six.iteritems(tasks)
+            for k, t in tasks.items()
         }
 
         # If the list of task request is greater than one, then we have to check whether
@@ -1238,10 +1236,7 @@ def _collapse_task_rerun_requests(self, tasks=None):
             # The for loops below identify task requests that have subsequent task sequences
             # not in other task requests.
             result = {
-                k: i
-                for k, i in six.iteritems(result)
-                for j in result.values()
-                if len(set(i) - set(j)) > 0
+                k: i for k, i in result.items() for j in result.values() if len(set(i) - set(j)) > 0
             }
 
         return result
@@ -1256,9 +1251,7 @@ def request_workflow_rerun(self, task_requests=None):
         tasks = {t.task_state_entry_id: t for t in task_requests or []}
 
         # If the list of tasks is provided, verify if task exist and rerunnable.
-        invalid_rerun_requests = [
-            t for k, t in six.iteritems(tasks) if k not in self.workflow_state.tasks
-        ]
+        invalid_rerun_requests = [t for k, t in tasks.items() if k not in self.workflow_state.tasks]
 
         if invalid_rerun_requests:
             raise exc.InvalidTaskRerunRequest(invalid_rerun_requests)
@@ -1277,7 +1270,7 @@ def request_workflow_rerun(self, task_requests=None):
                     self._get_task_state_idx(t.task_id, t.route),
                     self.workflow_state.get_task(t.task_id, t.route),
                 )
-                for k, t in six.iteritems(tasks)
+                for k, t in tasks.items()
                 if k in self._collapse_task_rerun_requests(tasks)
             }
 
@@ -1299,11 +1292,11 @@ def request_workflow_rerun(self, task_requests=None):
         continuable_candidates = {
             constants.TASK_STATE_ROUTE_FORMAT % (t["id"], str(t["route"])): t
             for i, t in self.workflow_state.get_terminal_tasks()
-            if len([k for k, v in six.iteritems(t["next"]) if v]) > 0
+            if len([k for k, v in t["next"].items() if v]) > 0
         }
 
         # Automatically resume all continuable candidates.
-        for _, task in sorted(six.iteritems(continuable_candidates), key=lambda x: x[0]):
+        for _, task in sorted(continuable_candidates.items(), key=lambda x: x[0]):
             # Reset terminal status for the continuable candidate.
             task.pop("term", None)
 

orquesta/expressions/base.py

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2021 The StackStorm Authors.
 # Copyright 2019 Extreme Networks, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +19,6 @@
 import inspect
 import logging
 import re
-import six
 import threading
 
 from stevedore import extension
@@ -32,8 +34,7 @@
 _EXP_EVALUATOR_NAMESPACE = "orquesta.expressions.evaluators"
 
 
-@six.add_metaclass(abc.ABCMeta)
-class Evaluator(object):
+class Evaluator(metaclass=abc.ABCMeta):
     _type = "unspecified"
     _delimiter = None
 
@@ -92,11 +93,11 @@ def get_evaluators():
 
 
 def get_statement_regexes():
-    return {t: e.get_statement_regex() for t, e in six.iteritems(get_evaluators())}
+    return {t: e.get_statement_regex() for t, e in get_evaluators().items()}
 
 
 def has_expressions(text):
-    result = {t: e.has_expressions(text) for t, e in six.iteritems(get_evaluators())}
+    result = {t: e.has_expressions(text) for t, e in get_evaluators().items()}
 
     return any(result.values())
 
@@ -105,18 +106,18 @@ def validate(statement):
     errors = []
 
     if isinstance(statement, dict):
-        for k, v in six.iteritems(statement):
+        for k, v in statement.items():
             errors.extend(validate(k)["errors"])
             errors.extend(validate(v)["errors"])
 
     elif isinstance(statement, list):
         for item in statement:
             errors.extend(validate(item)["errors"])
 
-    elif isinstance(statement, six.string_types):
+    elif isinstance(statement, str):
         evaluators = [
             evaluator
-            for name, evaluator in six.iteritems(get_evaluators())
+            for name, evaluator in get_evaluators().items()
             if evaluator.has_expressions(statement)
         ]
 
@@ -131,13 +132,13 @@ def validate(statement):
 
 def evaluate(statement, data=None):
     if isinstance(statement, dict):
-        return {evaluate(k, data=data): evaluate(v, data=data) for k, v in six.iteritems(statement)}
+        return {evaluate(k, data=data): evaluate(v, data=data) for k, v in statement.items()}
 
     elif isinstance(statement, list):
         return [evaluate(item, data=data) for item in statement]
 
-    elif isinstance(statement, six.string_types):
-        for name, evaluator in six.iteritems(get_evaluators()):
+    elif isinstance(statement, str):
+        for name, evaluator in get_evaluators().items():
             if evaluator.has_expressions(statement):
                 return evaluator.evaluate(statement, data=data)
 
@@ -148,16 +149,16 @@ def extract_vars(statement):
     variables = []
 
     if isinstance(statement, dict):
-        for k, v in six.iteritems(statement):
+        for k, v in statement.items():
             variables.extend(extract_vars(k))
             variables.extend(extract_vars(v))
 
     elif isinstance(statement, list):
         for item in statement:
             variables.extend(extract_vars(item))
 
-    elif isinstance(statement, six.string_types):
-        for name, evaluator in six.iteritems(get_evaluators()):
+    elif isinstance(statement, str):
+        for name, evaluator in get_evaluators().items():
             for var_ref in evaluator.extract_vars(statement):
                 for regex_var_extract in evaluator.get_var_extraction_regexes():
                     result = re.search(regex_var_extract, var_ref)
@@ -170,8 +171,6 @@ def extract_vars(statement):
 
 
 def func_has_ctx_arg(func):
-    getargspec = (
-        inspect.getargspec if six.PY2 else inspect.getfullargspec  # pylint: disable=no-member
-    )
+    getargspec = inspect.getfullargspec  # pylint: disable=no-member
 
     return "context" in getargspec(func).args

orquesta/expressions/functions/common.py

@@ -1,3 +1,4 @@
+# Copyright 2021 The StackStorm Authors.
 # Copyright 2019 Extreme Networks, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,16 +14,16 @@
 # limitations under the License.
 
 import json
-import six
 
+from itertools import zip_longest
 from orquesta import exceptions as exc
 
 
 def json_(s):
     if isinstance(s, dict):
         return s
 
-    if not isinstance(s, six.string_types):
+    if not isinstance(s, str):
         raise TypeError("Given object is not typeof string.")
 
     return json.loads(s)
@@ -36,7 +37,7 @@ def zip_(*args, **kwargs):
 
     pad_with = kwargs.pop("pad", None)
 
-    return list(six.moves.zip_longest(*args, fillvalue=pad_with))
+    return list(zip_longest(*args, fillvalue=pad_with))
 
 
 def ctx_(context, key=None):
@@ -49,4 +50,4 @@ def ctx_(context, key=None):
 
         return context["__vars"][key]
     else:
-        return {k: v for k, v in six.iteritems(context["__vars"]) if not k.startswith("__")}
+        return {k: v for k, v in context["__vars"].items() if not k.startswith("__")}

orquesta/expressions/functions/workflow.py

@@ -1,3 +1,4 @@
+# Copyright 2020 The StackStorm Authors.
 # Copyright 2019 Extreme Networks, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");