Update to pbr and flake8.

As part of this, found a discrepancy between the git tags and what was in libra.__version__ - which is the whole reason to do tag-based-versions anyway. After landing this, someone should do a "tag -s 1.2" or something similar to release a properly tagged version of the code. Change-Id: I2bb678bc6928dffebb0abc7c67cec50642b1f43d
stackforge · Apr 9, 2013 · d9c6b58 · d9c6b58
1 parent 5887df9
commit d9c6b58
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 436 deletions.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1 @@
+<shrewsbury.dave@gmail.com> <=>
diff --git a/bin/client.py b/bin/client.py
@@ -2,7 +2,7 @@
 
 import json
 import socket
-from gearman import GearmanClient, DataEncoder
+from gearman import GearmanClient, DataEncoder, JOB_UNKNOWN
 
 
 class JSONDataEncoder(DataEncoder):

diff --git a/libra/__init__.py b/libra/__init__.py
@@ -12,4 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-__version__ = "2.0-alpha"
+import pbr.version
+
+__version__ = pbr.version.VersionInfo('libra')
diff --git a/libra/openstack/common/setup.py b/libra/openstack/common/setup.py
diff --git a/openstack-common.conf b/openstack-common.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 
 # The list of modules to copy from openstack-common
-modules=importutils,setup
+modules=importutils
 
 # The base module to hold the copy of openstack.common
 base=libra