dkist-processing-ops 1.0.0rc2__tar.gz → 1.0.0rc3__tar.gz

{dkist-processing-ops-1.0.0rc2 → dkist-processing-ops-1.0.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-ops
-Version: 1.0.0rc2
+Version: 1.0.0rc3
 Summary: Automated Processing smoke test and operations workflows
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD 3-Clause
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.rst
-Requires-Dist: dkist-processing-core==3.0.1
+Requires-Dist: dkist-processing-core==3.0.2rc1
 Requires-Dist: dkist-service-configuration==1.1.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"

{dkist-processing-ops-1.0.0rc2 → dkist-processing-ops-1.0.0rc3}/dkist_processing_ops/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.0rc2'
+__version__ = version = '1.0.0rc3'
 __version_tuple__ = version_tuple = (1, 0, 0)

{dkist-processing-ops-1.0.0rc2 → dkist-processing-ops-1.0.0rc3}/dkist_processing_ops/tasks/wait.py

@@ -11,14 +11,6 @@ SLEEP_TIME = 300
 
 
 class WaitTaskBase(TaskBase):
-    def __init__(
-        self,
-        recipe_run_id: int = 0,
-        workflow_name: str = "ops",
-        workflow_version: str = "ops_ver",
-    ):
-        super().__init__(recipe_run_id, workflow_name, workflow_version)
-
     def run(self) -> None:
         sleep(SLEEP_TIME)
 

{dkist-processing-ops-1.0.0rc2 → dkist-processing-ops-1.0.0rc3}/dkist_processing_ops/workflows/scale.py

@@ -72,67 +72,13 @@ ALL_WAIT_TASKS = [
 ]
 
 
-#
-# Default Resource Queue
-#
-
-
 def add_parallel_nodes(count: int, workflow: Workflow, resource_queue: ResourceQueue):
     """Add the 'count' number of nodes to run in parallel to a workflow"""
     for task in ALL_WAIT_TASKS[:count]:
         workflow.add_node(task=task, upstreams=None, resource_queue=resource_queue)
 
 
-single_default = Workflow(
-    input_data="ops",
-    output_data="scale",
-    category="default",
-    detail="1",
-    workflow_package=__package__,
-)
-add_parallel_nodes(count=1, workflow=single_default, resource_queue=ResourceQueue.DEFAULT)
-
-
-two_default = Workflow(
-    input_data="ops",
-    output_data="scale",
-    category="default",
-    detail="2",
-    workflow_package=__package__,
-)
-add_parallel_nodes(count=2, workflow=two_default, resource_queue=ResourceQueue.DEFAULT)
-
-
-four_default = Workflow(
-    input_data="ops",
-    output_data="scale",
-    category="default",
-    detail="4",
-    workflow_package=__package__,
-)
-add_parallel_nodes(count=4, workflow=four_default, resource_queue=ResourceQueue.DEFAULT)
-
-
-eight_default = Workflow(
-    input_data="ops",
-    output_data="scale",
-    category="default",
-    detail="8",
-    workflow_package=__package__,
-)
-add_parallel_nodes(count=8, workflow=eight_default, resource_queue=ResourceQueue.DEFAULT)
-
-
-sixteen_default = Workflow(
-    input_data="ops",
-    output_data="scale",
-    category="default",
-    detail="16",
-    workflow_package=__package__,
-)
-add_parallel_nodes(count=16, workflow=sixteen_default, resource_queue=ResourceQueue.DEFAULT)
-
-
+# Default resource queue
 thirty_two_default = Workflow(
     input_data="ops",
     output_data="scale",
@@ -142,60 +88,7 @@ thirty_two_default = Workflow(
 )
 add_parallel_nodes(count=32, workflow=thirty_two_default, resource_queue=ResourceQueue.DEFAULT)
 
-#
-# High Mem Resource Queue
-#
-
-single_high_mem = Workflow(
-    input_data="ops",
-    output_data="scale",
-    category="high_mem",
-    detail="1",
-    workflow_package=__package__,
-)
-add_parallel_nodes(count=1, workflow=single_high_mem, resource_queue=ResourceQueue.HIGH_MEMORY)
-
-
-two_high_mem = Workflow(
-    input_data="ops",
-    output_data="scale",
-    category="high_mem",
-    detail="2",
-    workflow_package=__package__,
-)
-add_parallel_nodes(count=2, workflow=two_high_mem, resource_queue=ResourceQueue.HIGH_MEMORY)
-
-
-four_high_mem = Workflow(
-    input_data="ops",
-    output_data="scale",
-    category="high_mem",
-    detail="4",
-    workflow_package=__package__,
-)
-add_parallel_nodes(count=4, workflow=four_high_mem, resource_queue=ResourceQueue.HIGH_MEMORY)
-
-
-eight_high_mem = Workflow(
-    input_data="ops",
-    output_data="scale",
-    category="high_mem",
-    detail="8",
-    workflow_package=__package__,
-)
-add_parallel_nodes(count=8, workflow=eight_high_mem, resource_queue=ResourceQueue.HIGH_MEMORY)
-
-
-sixteen_high_mem = Workflow(
-    input_data="ops",
-    output_data="scale",
-    category="high_mem",
-    detail="16",
-    workflow_package=__package__,
-)
-add_parallel_nodes(count=16, workflow=sixteen_high_mem, resource_queue=ResourceQueue.HIGH_MEMORY)
-
-
+# High memory resource queue
 thirty_two_high_mem = Workflow(
     input_data="ops",
     output_data="scale",

{dkist-processing-ops-1.0.0rc2 → dkist-processing-ops-1.0.0rc3}/dkist_processing_ops.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-ops
-Version: 1.0.0rc2
+Version: 1.0.0rc3
 Summary: Automated Processing smoke test and operations workflows
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD 3-Clause
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.rst
-Requires-Dist: dkist-processing-core==3.0.1
+Requires-Dist: dkist-processing-core==3.0.2rc1
 Requires-Dist: dkist-service-configuration==1.1.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"

{dkist-processing-ops-1.0.0rc2 → dkist-processing-ops-1.0.0rc3}/dkist_processing_ops.egg-info/requires.txt

@@ -1,4 +1,4 @@
-dkist-processing-core==3.0.1
+dkist-processing-core==3.0.2rc1
 dkist-service-configuration==1.1.0
 
 [test]

{dkist-processing-ops-1.0.0rc2 → dkist-processing-ops-1.0.0rc3}/pyproject.toml

@@ -23,7 +23,7 @@ authors = [
 ]
 
 dependencies = [
-    "dkist-processing-core==3.0.1",
+    "dkist-processing-core==3.0.2rc1",
     "dkist-service-configuration==1.1.0",
 ]
 dynamic = ["version"]