diff options
| author | Raoul Hidalgo Charman <raoul.hidalgocharman@codethink.co.uk> | 2019-03-22 14:45:38 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-25 11:46:44 +0000 |
| commit | 19eed4c3f2d652dd48593c3dff8d9aceb05eb05f (patch) | |
| tree | 255f63dd3c38a76ef45160a5cd844dc569963025 | |
| parent | 4930e3f031b09090caffa6c00fc72d96da9b3375 (diff) | |
| download | buildstream-19eed4c3f2d652dd48593c3dff8d9aceb05eb05f.tar.gz | |
PushQueue -> ArtifactPushQueue
Rename to be consistent with SourcePushQueue
Part of #440
| -rw-r--r-- | buildstream/_scheduler/__init__.py | 2 | ||||
| -rw-r--r-- | buildstream/_scheduler/queues/artifactpushqueue.py (renamed from buildstream/_scheduler/queues/pushqueue.py) | 2 | ||||
| -rw-r--r-- | buildstream/_stream.py | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/buildstream/_scheduler/__init__.py b/buildstream/_scheduler/__init__.py index 64eaa455a..d2f458fa5 100644 --- a/buildstream/_scheduler/__init__.py +++ b/buildstream/_scheduler/__init__.py @@ -23,7 +23,7 @@ from .queues.fetchqueue import FetchQueue from .queues.sourcepushqueue import SourcePushQueue from .queues.trackqueue import TrackQueue from .queues.buildqueue import BuildQueue -from .queues.pushqueue import PushQueue +from .queues.artifactpushqueue import ArtifactPushQueue from .queues.pullqueue import PullQueue from .scheduler import Scheduler, SchedStatus diff --git a/buildstream/_scheduler/queues/pushqueue.py b/buildstream/_scheduler/queues/artifactpushqueue.py index 35532d23d..b861d4fc7 100644 --- a/buildstream/_scheduler/queues/pushqueue.py +++ b/buildstream/_scheduler/queues/artifactpushqueue.py @@ -26,7 +26,7 @@ from ..._exceptions import SkipJob # A queue which pushes element artifacts # -class PushQueue(Queue): +class ArtifactPushQueue(Queue): action_name = "Push" complete_name = "Pushed" diff --git a/buildstream/_stream.py b/buildstream/_stream.py index f15657ad2..d2ece163d 100644 --- a/buildstream/_stream.py +++ b/buildstream/_stream.py @@ -35,7 +35,7 @@ from ._artifactelement import verify_artifact_ref from ._exceptions import StreamError, ImplError, BstError, ArtifactElementError, CASCacheError from ._message import Message, MessageType from ._scheduler import Scheduler, SchedStatus, TrackQueue, FetchQueue, \ - SourcePushQueue, BuildQueue, PullQueue, PushQueue + SourcePushQueue, BuildQueue, PullQueue, ArtifactPushQueue from ._pipeline import Pipeline, PipelineSelection from ._profile import Topics, profile_start, profile_end from .types import _KeyStrength @@ -266,7 +266,7 @@ class Stream(): self._add_queue(BuildQueue(self._scheduler)) if self._artifacts.has_push_remotes(): - self._add_queue(PushQueue(self._scheduler)) + self._add_queue(ArtifactPushQueue(self._scheduler)) if self._sourcecache.has_push_remotes(): self._add_queue(SourcePushQueue(self._scheduler)) @@ -439,7 +439,7 @@ class Stream(): self._add_queue(PullQueue(self._scheduler)) self._enqueue_plan(require_buildtrees) - push_queue = PushQueue(self._scheduler) + push_queue = ArtifactPushQueue(self._scheduler) self._add_queue(push_queue) self._enqueue_plan(elements, queue=push_queue) self._run() |