From a936f9396846da0c836135b473ac3f8daba2dac0 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 5 Jul 2016 12:58:11 +0100 Subject: Don't import dirq unless we actually need it Don't import dirq unless we actually need it, i.e. if the experimental option --queuedir is used. Also remove dirq from setuptools requires --- calm/queue.py | 2 +- setup.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/calm/queue.py b/calm/queue.py index d9b1d8f..94ad04c 100644 --- a/calm/queue.py +++ b/calm/queue.py @@ -21,7 +21,6 @@ # THE SOFTWARE. # -from dirq.QueueSimple import QueueSimple import logging import os import re @@ -42,6 +41,7 @@ def add(args, movelist, fromdir): queue_root = os.path.join(args.queuedir, 'dirq') upload_root = os.path.join(args.queuedir, 'uploads') + from dirq.QueueSimple import QueueSimple dirq = QueueSimple(os.path.join(queue_root, QUEUE)) # clean up empty directories diff --git a/setup.py b/setup.py index 9f7f513..80af272 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,6 @@ setup( author_email='jon.turney@dronecode.org.uk', license='MIT', packages=['calm'], - install_requires=['dirq'], entry_points= { 'console_scripts': [ 'calm = calm.calm:main', -- cgit v1.2.3