diff options
author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2013-10-07 14:43:50 +0900 |
---|---|---|
committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-10-07 18:08:34 +0900 |
commit | a861730cfba8633b4c86202f6cda635c3c5610c4 (patch) | |
tree | ef9f904bbdab5534f899166052812801d7b3a090 | |
parent | c19e0a20cdff38503fe50f64e7dc784ca5be92d2 (diff) |
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 <yamamoto@valinux.co.jp>
|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 <yamamoto@valinux.co.jp>
| Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
the problem reported by Satoshi Kobayashi on ryu-devel.
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r-- | setup.cfg | 1 | ||||
-rw-r--r-- | setup.py | 10 |
2 files changed, 3 insertions, 8 deletions
@@ -43,7 +43,6 @@ doc_files = LICENSE [global] setup-hooks = - pbr.hooks.setup_hook ryu.hooks.setup_hook [entry_points] @@ -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) |