From a861730cfba8633b4c86202f6cda635c3c5610c4 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 7 Oct 2013 14:43:50 +0900 Subject: [PATCH] revert "stick with pbr 0.5.19" commit revert the following commit because it doesn't work with the latest oslo.config which requires newer pbr. |commit 205485e0520d8f37c49b66bbbf012a9448cd9367 |Author: YAMAMOTO Takashi |Date: Fri Aug 30 14:08:49 2013 +0900 | | stick with pbr 0.5.19 | | the latest versions of pbr generate scripts which don't support | multiversion. to avoid importing modules from older multiversion-aware | installations of ryu, we prefer multiversion-aware scripts. | | Signed-off-by: YAMAMOTO Takashi | Signed-off-by: FUJITA Tomonori the problem reported by Satoshi Kobayashi on ryu-devel. Signed-off-by: YAMAMOTO Takashi Signed-off-by: FUJITA Tomonori --- setup.cfg | 1 - setup.py | 10 +++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/setup.cfg b/setup.cfg index fd497747..a3d33294 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,7 +43,6 @@ doc_files = LICENSE [global] setup-hooks = - pbr.hooks.setup_hook ryu.hooks.setup_hook [entry_points] diff --git a/setup.py b/setup.py index 14553468..b7f3a9b9 100644 --- a/setup.py +++ b/setup.py @@ -22,14 +22,10 @@ except ImportError: import setuptools import os +from ryu import version -# the latest versions of pbr generate scripts which don't support -# multiversion. to avoid importing modules from older multiversion-aware -# installations of ryu, we prefer multiversion-aware scripts. -PBR_VERSION = '0.5.19' - -os.environ["PBR_VERSION"] = PBR_VERSION +os.environ["PBR_VERSION"] = str(version) setuptools.setup(name='ryu', - setup_requires=['pbr==%s' % (PBR_VERSION,)], + setup_requires=['pbr'], pbr=True)