From ae0263e8496fc701c1682b6fa769496ca595342a Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 17 Oct 2013 07:08:01 +0100 Subject: [PATCH] Remove obsolete redhat-eventlet.patch See I62ce43a330d7ae94eda4c7498782a655e63747fa for the gorey details on why this exists. As of this fix: https://github.com/eventlet/eventlet/pull/34 which was released in eventlet 0.13, we no longer need the patch. This has now been removed from oslo-incubator, so this is really just syncing that removal. Change-Id: I84267f3c6726cb2e750f615e107c48b12c6ed353 --- contrib/redhat-eventlet.patch | 16 --------------- openstack-common.conf | 2 -- requirements.txt | 2 +- tools/install_venv.py | 1 - tools/install_venv_common.py | 37 ---------------------------------- tools/patch_tox_venv.py | 38 ----------------------------------- tox.ini | 1 - 7 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 contrib/redhat-eventlet.patch delete mode 100644 tools/patch_tox_venv.py diff --git a/contrib/redhat-eventlet.patch b/contrib/redhat-eventlet.patch deleted file mode 100644 index cf2ff53d51..0000000000 --- a/contrib/redhat-eventlet.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- .nova-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py.orig -2011-05-25 -23:31:34.597271402 +0000 -+++ .nova-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py -2011-05-25 -23:33:24.055602468 +0000 -@@ -32,7 +32,7 @@ - setattr(self, attr, wrapped_pipe) - __init__.__doc__ = subprocess_orig.Popen.__init__.__doc__ - -- def wait(self, check_interval=0.01): -+ def wait(self, check_interval=0.01, timeout=None): - # Instead of a blocking OS call, this version of wait() uses logic - # borrowed from the eventlet 0.2 processes.Process.wait() method. - try: - diff --git a/openstack-common.conf b/openstack-common.conf index a719ffeb54..773f98c62b 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -15,10 +15,8 @@ module=lockutils module=log module=network_utils module=notifier -module=patch_tox_venv module=policy module=processutils -module=redhat-eventlet.patch module=rootwrap module=rpc module=scheduler diff --git a/requirements.txt b/requirements.txt index c0b12b649b..4d9d37651f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ amqplib>=0.6.1 anyjson>=0.2.4 argparse babel>=0.9.6 -eventlet>=0.9.12 +eventlet>=0.13.0 greenlet>=0.3.1 iso8601>=0.1.4 kombu>=1.0.4 diff --git a/tools/install_venv.py b/tools/install_venv.py index eb40a86798..8ba0cd0727 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -65,7 +65,6 @@ def main(argv): install.check_dependencies() install.create_virtualenv(no_site_packages=options.no_site_packages) install.install_dependencies() - install.post_process() print_help() if __name__ == '__main__': diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 413065640f..a06575bca2 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -126,9 +126,6 @@ class InstallVenv(object): self.pip_install('-r', self.pip_requires) self.pip_install('-r', self.test_requires) - def post_process(self): - self.get_distro().post_process() - def parse_args(self, argv): """Parses command-line arguments.""" parser = argparse.ArgumentParser() @@ -161,14 +158,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. @@ -184,10 +173,6 @@ class Fedora(Distro): print "Attempting to install '%s' via yum" % pkg self.run_command(['sudo', 'yum', 'install', '-y', pkg], **kwargs) - 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 @@ -196,25 +181,3 @@ class Fedora(Distro): self.yum_install('python-virtualenv', check_exit_code=False) 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/which_linden/eventlet/issue/89 - """ - - # Install "patch" program if it's not there - if not self.check_pkg('patch'): - self.yum_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') diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py deleted file mode 100644 index 905d23e449..0000000000 --- a/tools/patch_tox_venv.py +++ /dev/null @@ -1,38 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2013 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import os -import sys - -import install_venv_common as install_venv - - -def main(argv): - root = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) - - venv = os.environ['VIRTUAL_ENV'] - - pip_requires = os.path.join(root, 'requirements.txt') - test_requires = os.path.join(root, 'test-requirements.txt') - py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) - project = 'manila' - install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, - py_version, project) - #NOTE(dprince): For Tox we only run post_process (which patches files, etc) - install.post_process() - -if __name__ == '__main__': - main(sys.argv) diff --git a/tox.ini b/tox.ini index 9e53c0232d..a3c9e702a2 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,6 @@ setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = - python tools/patch_tox_venv.py nosetests {posargs} [testenv:pep8]