diff --git a/aodhclient/shell.py b/aodhclient/shell.py index 776706a..c80dfeb 100644 --- a/aodhclient/shell.py +++ b/aodhclient/shell.py @@ -25,12 +25,12 @@ from cliff import commandmanager from keystoneauth1 import exceptions from keystoneauth1 import loading +from aodhclient import __version__ from aodhclient import client from aodhclient import noauth from aodhclient.v2 import alarm_cli from aodhclient.v2 import alarm_history_cli from aodhclient.v2 import capabilities_cli -from aodhclient.version import __version__ class AodhCommandManager(commandmanager.CommandManager): @@ -56,7 +56,6 @@ class AodhShell(app.App): def __init__(self): super(AodhShell, self).__init__( description='Aodh command line client', - # FIXME(sileht): get version from pbr version=__version__, command_manager=AodhCommandManager(None), deferred_help=True, diff --git a/aodhclient/version.py b/aodhclient/version.py deleted file mode 100644 index cbe1709..0000000 --- a/aodhclient/version.py +++ /dev/null @@ -1,18 +0,0 @@ -# -# 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. -# - -import pbr.version - - -__version__ = pbr.version.VersionInfo('aodhclient').version_string()