diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-11-06 09:42:15 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-11-25 15:25:36 -0500 |
commit | 67b4b27a1826c01d68de2922523fa3473dbbd92d (patch) | |
tree | 8775a9f5490f1d9f29ed2e230915127de3e661df | |
parent | 9291144e8631049c9ccc22b9169ca5b66f42b480 (diff) | |
download | meta-cloud-services-67b4b27a1826c01d68de2922523fa3473dbbd92d.tar.gz |
python-stevedore: uprev version
OpenStack Havana requires a newer version of stevedor, so we uprev to 0.12
and drop our one patch (since it is no longer necessary).
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-stevedore/remove-distribute-dependency.patch | 25 | ||||
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-stevedore_0.12.bb (renamed from meta-openstack/recipes-devtools/python/python-stevedore_0.8.bb) | 7 |
2 files changed, 3 insertions, 29 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-stevedore/remove-distribute-dependency.patch b/meta-openstack/recipes-devtools/python/python-stevedore/remove-distribute-dependency.patch deleted file mode 100644 index 49a68de..0000000 --- a/meta-openstack/recipes-devtools/python/python-stevedore/remove-distribute-dependency.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Index: stevedore-0.8/setup.py | ||
2 | =================================================================== | ||
3 | --- stevedore-0.8.orig/setup.py | ||
4 | +++ stevedore-0.8/setup.py | ||
5 | @@ -1,8 +1,8 @@ | ||
6 | #!/usr/bin/env python | ||
7 | |||
8 | # Bootstrap installation of Distribute | ||
9 | -import distribute_setup | ||
10 | -distribute_setup.use_setuptools() | ||
11 | +#import distribute_setup | ||
12 | +#distribute_setup.use_setuptools() | ||
13 | |||
14 | from setuptools import setup, find_packages | ||
15 | |||
16 | @@ -11,8 +11,7 @@ try: | ||
17 | except IOError: | ||
18 | long_description = '' | ||
19 | |||
20 | -install_requires = ['distribute', | ||
21 | - ] | ||
22 | +install_requires = [] | ||
23 | |||
24 | setup( | ||
25 | name='stevedore', | ||
diff --git a/meta-openstack/recipes-devtools/python/python-stevedore_0.8.bb b/meta-openstack/recipes-devtools/python/python-stevedore_0.12.bb index 1309eac..061f6d4 100644 --- a/meta-openstack/recipes-devtools/python/python-stevedore_0.8.bb +++ b/meta-openstack/recipes-devtools/python/python-stevedore_0.12.bb | |||
@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
7 | PR = "r0" | 7 | PR = "r0" |
8 | 8 | ||
9 | SRCNAME = "stevedore" | 9 | SRCNAME = "stevedore" |
10 | SRC_URI = "http://pypi.python.org/packages/source/s/stevedore/stevedore-0.8.tar.gz \ | 10 | SRC_URI = "http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" |
11 | file://remove-distribute-dependency.patch" | ||
12 | 11 | ||
13 | SRC_URI[md5sum] = "8f340230754c2d70e6e34bc6d8678048" | 12 | SRC_URI[md5sum] = "8bf1b7bed06bf5ab636784d161f1a494" |
14 | SRC_URI[sha256sum] = "bf187929f739f86a73ad218193d23bddb34c717c5adb6fd84008c2975043edb6" | 13 | SRC_URI[sha256sum] = "9689a76c09eaeb60b6db5b45aae71de8c53f15d302d790536ac5bf7c47d729eb" |
15 | 14 | ||
16 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 15 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
17 | 16 | ||