openstack/os-ken
Code Issues Proposed changes

revert "stick with pbr 0.5.19" commit

Browse Source 
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>
This commit is contained in:
YAMAMOTO Takashi 2013-10-07 14:43:50 +09:00 committed by FUJITA Tomonori
parent c19e0a20cd
commit a861730cfb
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.cfg
View File

@ -43,7 +43,6 @@ doc_files = LICENSE
[global]
setup-hooks =
pbr.hooks.setup_hook
ryu.hooks.setup_hook
[entry_points]

10
setup.py
View File

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