Remove openstackclient from requirements.txt

This neededs to be done in reference to:

commit 01605ea864452bb563fa2c276c907703204f1b08
Author: Sean Dague <sean@dague.net>
Date:   Sat Feb 14 14:36:34 2015 -0500

    remove python-openstackclient

    I'm pretty sure there is no valid reason for this to be in here and it
    was only added to let it be installed in devstack when this list
    controlled the pypi mirrors.

    Change-Id: I945ee29e617af276dad59e486cde80306edca4ed

Change-Id: I1ff3460c6420a16f45acbf534f5fe0da4dacec06
This commit is contained in:
Aaron Rosen 2015-02-23 17:21:52 -08:00
parent 9b2436d317
commit 19dcbbc20a
3 changed files with 68 additions and 2 deletions

View File

@ -0,0 +1,67 @@
# Copyright 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
"""argparse Custom Actions"""
import argparse
class KeyValueAction(argparse.Action):
"""A custom action to parse arguments as key=value pairs
Ensures that ``dest`` is a dict
"""
def __call__(self, parser, namespace, values, option_string=None):
# Make sure we have an empty dict rather than None
if getattr(namespace, self.dest, None) is None:
setattr(namespace, self.dest, {})
# Add value if an assignment else remove it
if '=' in values:
getattr(namespace, self.dest, {}).update([values.split('=', 1)])
else:
getattr(namespace, self.dest, {}).pop(values, None)
class RangeAction(argparse.Action):
"""A custom action to parse a single value or a range of values
Parses single integer values or a range of integer values delimited
by a colon and returns a tuple of integers:
'4' sets ``dest`` to (4, 4)
'6:9' sets ``dest`` to (6, 9)
"""
def __call__(self, parser, namespace, values, option_string=None):
range = values.split(':')
if len(range) == 0:
# Nothing passed, return a zero default
setattr(namespace, self.dest, (0, 0))
elif len(range) == 1:
# Only a single value is present
setattr(namespace, self.dest, (int(range[0]), int(range[0])))
elif len(range) == 2:
# Range of two values
if int(range[0]) <= int(range[1]):
setattr(namespace, self.dest, (int(range[0]), int(range[1])))
else:
msg = ("Invalid range, %s is not less than %s" %
(range[0], range[1]))
raise argparse.ArgumentError(self, msg)
else:
# Too many values
msg = "Invalid range, too many values"
raise argparse.ArgumentError(self, msg)

View File

@ -20,9 +20,9 @@ from cliff import command
from cliff import lister
from cliff import show
from keystoneclient.openstack.common.apiclient import exceptions
from openstackclient.common import parseractions
import six
from congressclient.common import parseractions
from congressclient.common import utils

View File

@ -6,6 +6,5 @@ Babel>=1.3
cliff>=1.7.0 # Apache-2.0
oslo.i18n>=1.3.0 # Apache-2.0
python-keystoneclient>=1.1.0
python-openstackclient>=0.3.0
requests>=2.2.0,!=2.4.0
six>=1.7.0