This is an automated email from the ASF dual-hosted git repository. akitouni pushed a commit to branch abderrahim/simplify-jobs in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 15c57fd45516c15334d31f50de0ea783796f95aa Author: Abderrahim Kitouni <[email protected]> AuthorDate: Tue Jul 26 16:27:05 2022 +0200 job.py: replace the jobs module This is the only package remaining in the module --- src/buildstream/_scheduler/__init__.py | 2 +- src/buildstream/_scheduler/{jobs => }/job.py | 12 ++++++------ src/buildstream/_scheduler/jobs/__init__.py | 19 ------------------- src/buildstream/_scheduler/queues/buildqueue.py | 2 +- src/buildstream/_scheduler/queues/cachequeryqueue.py | 2 +- src/buildstream/_scheduler/queues/fetchqueue.py | 2 +- src/buildstream/_scheduler/queues/pullqueue.py | 2 +- src/buildstream/_scheduler/queues/queue.py | 2 +- src/buildstream/_scheduler/queues/trackqueue.py | 2 +- src/buildstream/_scheduler/scheduler.py | 2 +- 10 files changed, 14 insertions(+), 33 deletions(-) diff --git a/src/buildstream/_scheduler/__init__.py b/src/buildstream/_scheduler/__init__.py index c6dbe3642..19568b795 100644 --- a/src/buildstream/_scheduler/__init__.py +++ b/src/buildstream/_scheduler/__init__.py @@ -27,4 +27,4 @@ from .queues.pullqueue import PullQueue from .queues.cachequeryqueue import CacheQueryQueue from .scheduler import Scheduler, SchedStatus -from .jobs import Job, JobStatus +from .job import Job, JobStatus diff --git a/src/buildstream/_scheduler/jobs/job.py b/src/buildstream/_scheduler/job.py similarity index 98% rename from src/buildstream/_scheduler/jobs/job.py rename to src/buildstream/_scheduler/job.py index 90fa1765c..c81b2e73d 100644 --- a/src/buildstream/_scheduler/jobs/job.py +++ b/src/buildstream/_scheduler/job.py @@ -27,12 +27,12 @@ import threading import traceback # BuildStream toplevel imports -from ... import utils -from ..._utils import terminate_thread -from ..._exceptions import ImplError, BstError, set_last_task_error, SkipJob -from ..._message import Message, MessageType -from ...types import FastEnum -from ..._signals import TerminateException +from .. import utils +from .._utils import terminate_thread +from .._exceptions import ImplError, BstError, set_last_task_error, SkipJob +from .._message import Message, MessageType +from ..types import FastEnum +from .._signals import TerminateException # Return code values shutdown of job handling child processes diff --git a/src/buildstream/_scheduler/jobs/__init__.py b/src/buildstream/_scheduler/jobs/__init__.py deleted file mode 100644 index 68dedc8b0..000000000 --- a/src/buildstream/_scheduler/jobs/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2018 Codethink Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Authors: -# Tristan Maat <[email protected]> - -from .job import Job, JobStatus diff --git a/src/buildstream/_scheduler/queues/buildqueue.py b/src/buildstream/_scheduler/queues/buildqueue.py index 5a6ca75bc..e014864ce 100644 --- a/src/buildstream/_scheduler/queues/buildqueue.py +++ b/src/buildstream/_scheduler/queues/buildqueue.py @@ -19,7 +19,7 @@ from . import Queue, QueueStatus from ..resources import ResourceType -from ..jobs import JobStatus +from ..job import JobStatus # A queue which assembles elements diff --git a/src/buildstream/_scheduler/queues/cachequeryqueue.py b/src/buildstream/_scheduler/queues/cachequeryqueue.py index b650a91b8..5071cbd81 100644 --- a/src/buildstream/_scheduler/queues/cachequeryqueue.py +++ b/src/buildstream/_scheduler/queues/cachequeryqueue.py @@ -16,7 +16,7 @@ from . import Queue, QueueStatus from ..resources import ResourceType -from ..jobs import JobStatus +from ..job import JobStatus from ...types import _KeyStrength diff --git a/src/buildstream/_scheduler/queues/fetchqueue.py b/src/buildstream/_scheduler/queues/fetchqueue.py index b6c915802..29bc6069d 100644 --- a/src/buildstream/_scheduler/queues/fetchqueue.py +++ b/src/buildstream/_scheduler/queues/fetchqueue.py @@ -20,7 +20,7 @@ # Local imports from . import Queue, QueueStatus from ..resources import ResourceType -from ..jobs import JobStatus +from ..job import JobStatus # A queue which fetches element sources diff --git a/src/buildstream/_scheduler/queues/pullqueue.py b/src/buildstream/_scheduler/queues/pullqueue.py index 1ab095399..0b192ff4d 100644 --- a/src/buildstream/_scheduler/queues/pullqueue.py +++ b/src/buildstream/_scheduler/queues/pullqueue.py @@ -20,7 +20,7 @@ # Local imports from . import Queue, QueueStatus from ..resources import ResourceType -from ..jobs import JobStatus +from ..job import JobStatus from ..._exceptions import SkipJob diff --git a/src/buildstream/_scheduler/queues/queue.py b/src/buildstream/_scheduler/queues/queue.py index 110f14944..034a781d6 100644 --- a/src/buildstream/_scheduler/queues/queue.py +++ b/src/buildstream/_scheduler/queues/queue.py @@ -25,7 +25,7 @@ import traceback from typing import TYPE_CHECKING # Local imports -from ..jobs import Job, JobStatus +from ..job import Job, JobStatus from ..resources import ResourceType # BuildStream toplevel imports diff --git a/src/buildstream/_scheduler/queues/trackqueue.py b/src/buildstream/_scheduler/queues/trackqueue.py index 26e22eb10..f9ca0d65b 100644 --- a/src/buildstream/_scheduler/queues/trackqueue.py +++ b/src/buildstream/_scheduler/queues/trackqueue.py @@ -23,7 +23,7 @@ from ...plugin import Plugin # Local imports from . import Queue, QueueStatus from ..resources import ResourceType -from ..jobs import JobStatus +from ..job import JobStatus # A queue which tracks sources diff --git a/src/buildstream/_scheduler/scheduler.py b/src/buildstream/_scheduler/scheduler.py index 9d8e1c0f3..c8a78eb62 100644 --- a/src/buildstream/_scheduler/scheduler.py +++ b/src/buildstream/_scheduler/scheduler.py @@ -31,7 +31,7 @@ from concurrent.futures import ThreadPoolExecutor # Local imports from .resources import Resources -from .jobs import JobStatus +from .job import JobStatus from ..types import FastEnum from .._profile import Topics, PROFILER from ..plugin import Plugin
