Merge "Remove duplicate version code"

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(

grafana_dashboards/version.py

@@ -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')