From d181d0192ed1408a97e079ee25030b952a0affb6 Mon Sep 17 00:00:00 2001 From: Eeshan Garg Date: Mon, 24 Jul 2017 22:03:09 -0230 Subject: [PATCH] zulip_bots: Use relative paths to find zulip_bots/bots/*. --- tools/test-bots | 4 +++- zulip_bots/zulip_bots/provision.py | 5 +++-- zulip_bots/zulip_bots/run.py | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/test-bots b/tools/test-bots index ec2dc54..10762b8 100755 --- a/tools/test-bots +++ b/tools/test-bots @@ -56,7 +56,9 @@ the tests for xkcd and wikipedia bots): def main(): - glob_pattern = os.path.abspath('../zulip_bots/zulip_bots/bots/*/test_*.py') + current_dir = os.path.dirname(os.path.abspath(__file__)) + bots_dir = os.path.join(current_dir, '..', 'zulip_bots/zulip_bots/bots') + glob_pattern = bots_dir + '/*/test_*.py' test_modules = glob.glob(glob_pattern) # get only the names of bots that have tests diff --git a/zulip_bots/zulip_bots/provision.py b/zulip_bots/zulip_bots/provision.py index de82a75..86686ef 100755 --- a/zulip_bots/zulip_bots/provision.py +++ b/zulip_bots/zulip_bots/provision.py @@ -70,8 +70,9 @@ Example: ./provision.py helloworld xkcd wikipedia def main(): # type: () -> None - bots_dir = os.path.abspath("bots") - bots_subdirs = map(os.path.abspath, glob.glob("bots/*")) + current_dir = os.path.dirname(os.path.abspath(__file__)) + bots_dir = os.path.join(current_dir, "bots") + bots_subdirs = map(os.path.abspath, glob.glob(bots_dir + '/*')) available_bots = filter(lambda d: os.path.isdir(d), bots_subdirs) options = parse_args(available_bots) diff --git a/zulip_bots/zulip_bots/run.py b/zulip_bots/zulip_bots/run.py index 212effe..e8cc7e9 100755 --- a/zulip_bots/zulip_bots/run.py +++ b/zulip_bots/zulip_bots/run.py @@ -95,7 +95,8 @@ def main(): lib_module = import_module_from_source(options.path_to_bot, name=options.name) elif options.name: if options.provision: - bots_parent_dir = os.path.abspath("bots") + current_dir = os.path.dirname(os.path.abspath(__file__)) + bots_parent_dir = os.path.join(current_dir, "bots") bot_dir = os.path.join(bots_parent_dir, options.name) provision_bot(bot_dir, options.force) lib_module = import_module('zulip_bots.bots.{bot}.{bot}'.format(bot=options.name))