From 5a1745dd22c6fb1618b07eb2095154e266ba8559 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 10 Nov 2015 14:13:01 -0500 Subject: [PATCH] Remove duplicate version code Change-Id: I209ec158bde5a45522dddda78531bf5ec9d3a0b8 Signed-off-by: Paul Belanger --- grafana_dashboards/cmd.py | 4 ++-- grafana_dashboards/version.py | 17 ----------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 grafana_dashboards/version.py diff --git a/grafana_dashboards/cmd.py b/grafana_dashboards/cmd.py index 9d5f9c2..e8a7d46 100644 --- a/grafana_dashboards/cmd.py +++ b/grafana_dashboards/cmd.py @@ -17,9 +17,9 @@ import logging import os import sys +from grafana_dashboards import __version__ from grafana_dashboards.builder import Builder from grafana_dashboards.config import Config -from grafana_dashboards import version LOG = logging.getLogger(__name__) @@ -49,7 +49,7 @@ class Client(object): ' of default INFO level)') parser.add_argument( '--version', dest='version', action='version', - version=version.version_info.release_string(), help="show " + version=__version__, help="show " "program's version number and exit") subparsers = parser.add_subparsers( diff --git a/grafana_dashboards/version.py b/grafana_dashboards/version.py deleted file mode 100644 index 78f5f85..0000000 --- a/grafana_dashboards/version.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2015 Red Hat, Inc. -# -# 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. - -from pbr.version import VersionInfo - -version_info = VersionInfo('grafyaml')