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 7e1c867856..ff221b109e 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -16,11 +16,9 @@ module=log module=loopingcall module=network_utils module=notifier -module=patch_tox_venv module=periodic_task module=policy module=processutils -module=redhat-eventlet.patch module=rpc module=service module=rootwrap diff --git a/tools/install_venv.py b/tools/install_venv.py index 0f189b4ca9..1db58ae0c4 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -68,7 +68,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() diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index f428c1e021..b5ec5092f0 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -121,9 +121,6 @@ class InstallVenv(object): self.pip_install('-r', self.requirements) self.pip_install('-r', self.test_requirements) - def post_process(self): - self.get_distro().post_process() - def parse_args(self, argv): """Parses command-line arguments.""" parser = optparse.OptionParser() @@ -156,14 +153,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. @@ -175,10 +164,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 @@ -187,26 +172,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 - """ - - # 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') diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py deleted file mode 100644 index a3cb46aaf1..0000000000 --- a/tools/patch_tox_venv.py +++ /dev/null @@ -1,50 +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 first_file(file_list): - for candidate in file_list: - if os.path.exists(candidate): - return candidate - - -def main(argv): - root = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) - - venv = os.environ['VIRTUAL_ENV'] - - pip_requires = first_file([ - os.path.join(root, 'requirements.txt'), - os.path.join(root, 'tools', 'pip-requires'), - ]) - test_requires = first_file([ - os.path.join(root, 'test-requirements.txt'), - os.path.join(root, 'tools', 'test-requires'), - ]) - py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) - project = 'neutron' - 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 cfd19a5ba9..1644ad960b 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt setuptools_git>=0.4 commands = - python tools/patch_tox_venv.py python setup.py testr --slowest --testr-args='{posargs}' [tox:jenkins] @@ -23,7 +22,6 @@ commands = python ./tools/check_i18n.py ./neutron ./tools/i18n_cfg.py [testenv:cover] commands = - python tools/patch_tox_venv.py python setup.py testr --coverage --testr-args='{posargs}' [testenv:venv]