summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>2014-01-13 12:24:55 +0100
committerGerrit Code Review <review@openstack.org>2014-01-23 18:08:03 +0000
commita5195c5033eb8eeb3aede15d569f4f66a4318004 (patch)
tree47c5043cfc807ebeb40a3e0fea0fcb0598d9dce6 /tools
parentdaa33c56c9a0dca2ab2cbd9ed99cb9765a42c30c (diff)
downloadpython-novaclient-a5195c5033eb8eeb3aede15d569f4f66a4318004.tar.gz
Updates nova client to use the latest oslo files
This patchset updates modules based on the config file: openstack-common.conf Notes: Some corrections has been added to work with new files. + utils.py: The method safe_decode from strutils.py was updated and it is now not necessary to check for decode string with py33. + base.py: base64 needs a 8-bit string for py33 + test_shell.py: stdin.encoding is needed for strutils Change-Id: Iebe474f1226f8b5faa7fb5722e65f41b80d1973c Related to blueprint common-client-library-2 Closes-Bug: #1265473
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv_common.py44
1 files changed, 1 insertions, 43 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index 0999e2c2..46822e32 100644
--- a/tools/install_venv_common.py
+++ b/tools/install_venv_common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
# Copyright 2013 OpenStack Foundation
# Copyright 2013 IBM Corp.
#
@@ -119,11 +117,7 @@ class InstallVenv(object):
self.pip_install('setuptools')
self.pip_install('pbr')
- self.pip_install('-r', self.requirements)
- self.pip_install('-r', self.test_requirements)
-
- def post_process(self):
- self.get_distro().post_process()
+ self.pip_install('-r', self.requirements, '-r', self.test_requirements)
def parse_args(self, argv):
"""Parses command-line arguments."""
@@ -157,14 +151,6 @@ class Distro(InstallVenv):
' requires virtualenv, please install it using your'
' favorite package management tool' % self.project)
- def post_process(self):
- """Any distribution-specific post-processing gets done here.
-
- In particular, this is useful for applying patches to code inside
- the venv.
- """
- pass
-
class Fedora(Distro):
"""This covers all Fedora-based distributions.
@@ -176,10 +162,6 @@ class Fedora(Distro):
return self.run_command_with_code(['rpm', '-q', pkg],
check_exit_code=False)[1] == 0
- def apply_patch(self, originalfile, patchfile):
- self.run_command(['patch', '-N', originalfile, patchfile],
- check_exit_code=False)
-
def install_virtualenv(self):
if self.check_cmd('virtualenv'):
return
@@ -188,27 +170,3 @@ class Fedora(Distro):
self.die("Please install 'python-virtualenv'.")
super(Fedora, self).install_virtualenv()
-
- def post_process(self):
- """Workaround for a bug in eventlet.
-
- This currently affects RHEL6.1, but the fix can safely be
- applied to all RHEL and Fedora distributions.
-
- This can be removed when the fix is applied upstream.
-
- Nova: https://bugs.launchpad.net/nova/+bug/884915
- Upstream: https://bitbucket.org/eventlet/eventlet/issue/89
- RHEL: https://bugzilla.redhat.com/958868
- """
-
- if os.path.exists('contrib/redhat-eventlet.patch'):
- # Install "patch" program if it's not there
- if not self.check_pkg('patch'):
- self.die("Please install 'patch'.")
-
- # Apply the eventlet patch
- self.apply_patch(os.path.join(self.venv, 'lib', self.py_version,
- 'site-packages',
- 'eventlet/green/subprocess.py'),
- 'contrib/redhat-eventlet.patch')