From 41c2b62da06904ed38512eccc91dde8864475f18 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 21 Aug 2015 09:34:54 -0700 Subject: [PATCH] Fix a bunch of Zulip Voyager related comments. (imported from commit 176e875cbc310ba00d6137930ddb718bd68f1866) --- README.md | 7 ++----- integrations/asana/zulip_asana_config.py | 2 +- integrations/basecamp/zulip_basecamp_config.py | 2 +- integrations/codebase/zulip_codebase_config.py | 2 +- integrations/git/zulip_git_config.py | 2 +- integrations/svn/zulip_svn_config.py | 2 +- integrations/trac/zulip_trac_config.py | 2 +- zulip/__init__.py | 2 +- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 652ea42..5fb82a5 100644 --- a/README.md +++ b/README.md @@ -30,15 +30,12 @@ file is as follows: [api] key= email= - -If you are using Zulip Voyager, you should also add - - site= + site= Alternatively, you may explicitly use "--user" and "--api-key" in our examples, which is especially useful if you are running several bots which share a home directory. There is also a "--site" option for -setting the Zulip Voyager server on the command line. +setting the Zulip server on the command line. You can obtain your Zulip API key, create bots, and manage bots all from your Zulip [settings page](https://zulip.com/#settings). diff --git a/integrations/asana/zulip_asana_config.py b/integrations/asana/zulip_asana_config.py index 971309e..6020f6d 100644 --- a/integrations/asana/zulip_asana_config.py +++ b/integrations/asana/zulip_asana_config.py @@ -49,7 +49,7 @@ RESUME_FILE = "/var/tmp/zulip_asana.state" # When initially started, how many hours of messages to include. ASANA_INITIAL_HISTORY_HOURS = 1 -# If you're using Zulip Voyager, set this to your Zulip Voyager server +# Set this to your Zulip API server URI ZULIP_SITE = "https://api.zulip.com" # If properly installed, the Zulip API should be in your import diff --git a/integrations/basecamp/zulip_basecamp_config.py b/integrations/basecamp/zulip_basecamp_config.py index 28fccbe..c343a69 100644 --- a/integrations/basecamp/zulip_basecamp_config.py +++ b/integrations/basecamp/zulip_basecamp_config.py @@ -41,7 +41,7 @@ ZULIP_STREAM_NAME = "basecamp" ## path, but if not, set a custom path below ZULIP_API_PATH = None -# If you're using Zulip Voyager, set this to your Zulip Voyager server +# Set this to your Zulip API server URI ZULIP_SITE = "https://api.zulip.com" # If you wish to log to a file rather than stdout/stderr, diff --git a/integrations/codebase/zulip_codebase_config.py b/integrations/codebase/zulip_codebase_config.py index 69f303e..d13d80d 100644 --- a/integrations/codebase/zulip_codebase_config.py +++ b/integrations/codebase/zulip_codebase_config.py @@ -50,7 +50,7 @@ ZULIP_TICKETS_STREAM_NAME = "tickets" # path, but if not, set a custom path below ZULIP_API_PATH = None -# If you're using Zulip Voyager, set this to your Zulip Voyager server +# Set this to your Zulip API server URI ZULIP_SITE = "https://api.zulip.com" # If you wish to log to a file rather than stdout/stderr, diff --git a/integrations/git/zulip_git_config.py b/integrations/git/zulip_git_config.py index 37caf63..9b3157a 100644 --- a/integrations/git/zulip_git_config.py +++ b/integrations/git/zulip_git_config.py @@ -61,5 +61,5 @@ def format_commit_message(author, subject, commit_id): ## path, but if not, set a custom path below ZULIP_API_PATH = None -# If you're using Zulip Voyager, set this to your Zulip Voyager server +# Set this to your Zulip server's API URI ZULIP_SITE = "https://api.zulip.com" diff --git a/integrations/svn/zulip_svn_config.py b/integrations/svn/zulip_svn_config.py index 45c2c6b..70a84c9 100644 --- a/integrations/svn/zulip_svn_config.py +++ b/integrations/svn/zulip_svn_config.py @@ -53,5 +53,5 @@ def commit_notice_destination(path, commit): ## path, but if not, set a custom path below ZULIP_API_PATH = None -# If you're using Zulip Voyager, set this to your Zulip Voyager server +# Set this to your Zulip server's API URI ZULIP_SITE = "https://api.zulip.com" diff --git a/integrations/trac/zulip_trac_config.py b/integrations/trac/zulip_trac_config.py index 20eaff0..753c1d1 100644 --- a/integrations/trac/zulip_trac_config.py +++ b/integrations/trac/zulip_trac_config.py @@ -47,5 +47,5 @@ TRAC_NOTIFY_FIELDS = ["description", "summary", "resolution", "comment", "owner" ## path, but if not, set a custom path below ZULIP_API_PATH = None -# If you're using Zulip Voyager, set this to your Zulip Voyager server +# Set this to your Zulip API server URI ZULIP_SITE = "https://api.zulip.com" diff --git a/zulip/__init__.py b/zulip/__init__.py index bdfae31..c0ac410 100644 --- a/zulip/__init__.py +++ b/zulip/__init__.py @@ -97,7 +97,7 @@ def generate_option_group(parser, prefix=''): group = optparse.OptionGroup(parser, 'Zulip API configuration') group.add_option('--%ssite' % (prefix,), dest="zulip_site", - help="Zulip Voyager server URI (if using Zulip Voyager)", + help="Zulip server URI", default=None) group.add_option('--%sapi-key' % (prefix,), dest="zulip_api_key",