From 70e5b030a78ddfdcc8c9eee568009f277dee0872 Mon Sep 17 00:00:00 2001
From: Nicholas Chammas <nicholas.chammas@gmail.com>
Date: Fri, 6 Feb 2015 12:08:22 -0800
Subject: [PATCH] [SPARK-5628] Add version option to spark-ec2
Every proper command line tool should include a `--version` option or something similar.
This PR adds this to `spark-ec2` using the standard functionality provided by `optparse`.
One thing we don't do here is follow the Python convention of setting `__version__`, since it seems awkward given how `spark-ec2` is laid out.
Author: Nicholas Chammas <nicholas.chammas@gmail.com>
Closes #4414 from nchammas/spark-ec2-show-version and squashes the following commits:
914cab5 [Nicholas Chammas] add version info
---
ec2/spark_ec2.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index abab209a05..0de4a62e20 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -39,6 +39,9 @@ from datetime import datetime
from optparse import OptionParser
from sys import stderr
+SPARK_EC2_VERSION = "1.2.0"
+SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__))
+
VALID_SPARK_VERSIONS = set([
"0.7.3",
"0.8.0",
@@ -54,9 +57,8 @@ VALID_SPARK_VERSIONS = set([
"1.2.0",
])
-DEFAULT_SPARK_VERSION = "1.2.0"
+DEFAULT_SPARK_VERSION = SPARK_EC2_VERSION
DEFAULT_SPARK_GITHUB_REPO = "https://github.com/apache/spark"
-SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__))
MESOS_SPARK_EC2_BRANCH = "branch-1.3"
# A URL prefix from which to fetch AMI information
@@ -103,12 +105,10 @@ class UsageError(Exception):
# Configure and parse our command-line arguments
def parse_args():
parser = OptionParser(
- usage="spark-ec2 [options] <action> <cluster_name>"
- + "\n\n<action> can be: launch, destroy, login, stop, start, get-master, reboot-slaves",
- add_help_option=False)
- parser.add_option(
- "-h", "--help", action="help",
- help="Show this help message and exit")
+ prog="spark-ec2",
+ version="%prog {v}".format(v=SPARK_EC2_VERSION),
+ usage="%prog [options] <action> <cluster_name>\n\n"
+ + "<action> can be: launch, destroy, login, stop, start, get-master, reboot-slaves")
parser.add_option(
"-s", "--slaves", type="int", default=1,
help="Number of slaves to launch (default: %default)")
--
GitLab