From b6c89f69e0372caf5e77c2cde30a5220eca8b1cd Mon Sep 17 00:00:00 2001 From: Grzegorz Szczepanczyk Date: Mon, 15 Sep 2014 15:04:35 +0200 Subject: [PATCH 1/2] drop pbr --- swiftclient/version.py | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/swiftclient/version.py b/swiftclient/version.py index 0be287d2..498ba073 100644 --- a/swiftclient/version.py +++ b/swiftclient/version.py @@ -1,28 +1 @@ -# Copyright 2012 OpenStack LLC -# -# 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 pkg_resources - -try: - # First, try to get our version out of PKG-INFO. If we're installed, - # this'll let us find our version without pulling in pbr. After all, if - # we're installed on a system, we're not in a Git-managed source tree, so - # pbr doesn't really buy us anything. - version_string = pkg_resources.get_provider( - pkg_resources.Requirement.parse('python-swiftclient')).version -except pkg_resources.DistributionNotFound: - # No PKG-INFO? We're probably running from a checkout, then. Let pbr do - # its thing to figure out a version number. - import pbr.version - version_string = str(pbr.version.VersionInfo('python-swiftclient')) +version_string = '2.2.0' \ No newline at end of file From 5522a9b2d9b2f747f490e86f298e978e71b5caf0 Mon Sep 17 00:00:00 2001 From: Grzegorz Szczepanczyk Date: Wed, 17 Sep 2014 10:38:31 +0200 Subject: [PATCH 2/2] pbx ow env --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2064ff3a..d127577d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ cover/ coverage.xml doc/build doc/source/api/ +.idea \ No newline at end of file