[buildstream] 04/11: _scheduler/*queue.py: Move queues to a subdirectory

[no...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

not-in-ldap pushed a commit to branch 135-expire-artifacts-in-local-cache
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 559848af7439d67a8ebe7c657bde72f59ea78f9e
Author: Tristan Maat <tr...@codethink.co.uk>
AuthorDate: Mon Jul 16 14:38:25 2018 +0100

    _scheduler/*queue.py: Move queues to a subdirectory
---
 buildstream/_scheduler/__init__.py                | 12 ++++++------
 buildstream/_scheduler/queues/__init__.py         |  1 +
 buildstream/_scheduler/{ => queues}/buildqueue.py |  0
 buildstream/_scheduler/{ => queues}/fetchqueue.py |  2 +-
 buildstream/_scheduler/{ => queues}/pullqueue.py  |  0
 buildstream/_scheduler/{ => queues}/pushqueue.py  |  0
 buildstream/_scheduler/{ => queues}/queue.py      |  6 +++---
 buildstream/_scheduler/{ => queues}/trackqueue.py |  4 ++--
 buildstream/_scheduler/scheduler.py               |  2 +-
 9 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/buildstream/_scheduler/__init__.py b/buildstream/_scheduler/__init__.py
index 80523db..a53a133 100644
--- a/buildstream/_scheduler/__init__.py
+++ b/buildstream/_scheduler/__init__.py
@@ -17,12 +17,12 @@
 #  Authors:
 #        Tristan Van Berkom <tr...@codethink.co.uk>
 
-from .queue import Queue, QueueStatus, QueueType
+from .queues import Queue, QueueStatus, QueueType
 
-from .fetchqueue import FetchQueue
-from .trackqueue import TrackQueue
-from .buildqueue import BuildQueue
-from .pushqueue import PushQueue
-from .pullqueue import PullQueue
+from .queues.fetchqueue import FetchQueue
+from .queues.trackqueue import TrackQueue
+from .queues.buildqueue import BuildQueue
+from .queues.pushqueue import PushQueue
+from .queues.pullqueue import PullQueue
 
 from .scheduler import Scheduler, SchedStatus
diff --git a/buildstream/_scheduler/queues/__init__.py b/buildstream/_scheduler/queues/__init__.py
new file mode 100644
index 0000000..b9acef1
--- /dev/null
+++ b/buildstream/_scheduler/queues/__init__.py
@@ -0,0 +1 @@
+from .queue import Queue, QueueStatus, QueueType
diff --git a/buildstream/_scheduler/buildqueue.py b/buildstream/_scheduler/queues/buildqueue.py
similarity index 100%
rename from buildstream/_scheduler/buildqueue.py
rename to buildstream/_scheduler/queues/buildqueue.py
diff --git a/buildstream/_scheduler/fetchqueue.py b/buildstream/_scheduler/queues/fetchqueue.py
similarity index 98%
rename from buildstream/_scheduler/fetchqueue.py
rename to buildstream/_scheduler/queues/fetchqueue.py
index 24512bd..bdff156 100644
--- a/buildstream/_scheduler/fetchqueue.py
+++ b/buildstream/_scheduler/queues/fetchqueue.py
@@ -19,7 +19,7 @@
 #        Jürg Billeter <ju...@codethink.co.uk>
 
 # BuildStream toplevel imports
-from .. import Consistency
+from ... import Consistency
 
 # Local imports
 from . import Queue, QueueStatus, QueueType
diff --git a/buildstream/_scheduler/pullqueue.py b/buildstream/_scheduler/queues/pullqueue.py
similarity index 100%
rename from buildstream/_scheduler/pullqueue.py
rename to buildstream/_scheduler/queues/pullqueue.py
diff --git a/buildstream/_scheduler/pushqueue.py b/buildstream/_scheduler/queues/pushqueue.py
similarity index 100%
rename from buildstream/_scheduler/pushqueue.py
rename to buildstream/_scheduler/queues/pushqueue.py
diff --git a/buildstream/_scheduler/queue.py b/buildstream/_scheduler/queues/queue.py
similarity index 98%
rename from buildstream/_scheduler/queue.py
rename to buildstream/_scheduler/queues/queue.py
index 15caf83..d0c4828 100644
--- a/buildstream/_scheduler/queue.py
+++ b/buildstream/_scheduler/queues/queue.py
@@ -24,11 +24,11 @@ from enum import Enum
 import traceback
 
 # Local imports
-from .job import Job
+from ..job import Job
 
 # BuildStream toplevel imports
-from .._exceptions import BstError, set_last_task_error
-from .._message import Message, MessageType
+from ..._exceptions import BstError, set_last_task_error
+from ..._message import Message, MessageType
 
 
 # Indicates the kind of activity
diff --git a/buildstream/_scheduler/trackqueue.py b/buildstream/_scheduler/queues/trackqueue.py
similarity index 97%
rename from buildstream/_scheduler/trackqueue.py
rename to buildstream/_scheduler/queues/trackqueue.py
index e48e1ae..3a65f01 100644
--- a/buildstream/_scheduler/trackqueue.py
+++ b/buildstream/_scheduler/queues/trackqueue.py
@@ -19,8 +19,8 @@
 #        Jürg Billeter <ju...@codethink.co.uk>
 
 # BuildStream toplevel imports
-from ..plugin import _plugin_lookup
-from .. import SourceError
+from ...plugin import _plugin_lookup
+from ... import SourceError
 
 # Local imports
 from . import Queue, QueueStatus, QueueType
diff --git a/buildstream/_scheduler/scheduler.py b/buildstream/_scheduler/scheduler.py
index f8a66ae..7bfbc95 100644
--- a/buildstream/_scheduler/scheduler.py
+++ b/buildstream/_scheduler/scheduler.py
@@ -26,7 +26,7 @@ import datetime
 from contextlib import contextmanager
 
 # Local imports
-from .queue import QueueType
+from .queues import QueueType
 
 
 # A decent return code for Scheduler.run()