Skip to content

Commit

Permalink
Remove obsolete redhat-eventlet.patch
Browse files Browse the repository at this point in the history
See I62ce43a330d7ae94eda4c7498782a655e63747fa for the gorey details on
why this exists.

As of this fix:

eventlet/eventlet#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
  • Loading branch information
markmc committed Oct 9, 2013
1 parent c55dd49 commit fd33285
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 110 deletions.
16 changes: 0 additions & 16 deletions contrib/redhat-eventlet.patch

This file was deleted.

2 changes: 0 additions & 2 deletions openstack-common.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ module=loopingcall
module=memorycache
module=network_utils
module=notifier
module=patch_tox_venv
module=periodic_task
module=policy
module=processutils
module=redhat-eventlet.patch
module=rootwrap
module=rpc
module=service
Expand Down
1 change: 0 additions & 1 deletion tools/install_venv.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,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(venv, root)

if __name__ == '__main__':
Expand Down
39 changes: 0 additions & 39 deletions tools/install_venv_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ def install_dependencies(self):

self.pip_install('-r', self.requirements, '-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()
Expand Down Expand Up @@ -156,14 +153,6 @@ def install_virtualenv(self):
' 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.
Expand All @@ -175,10 +164,6 @@ def check_pkg(self, pkg):
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
Expand All @@ -187,27 +172,3 @@ def install_virtualenv(self):
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')
50 changes: 0 additions & 50 deletions tools/patch_tox_venv.py

This file was deleted.

2 changes: 0 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ setenv = VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
python tools/patch_tox_venv.py
python setup.py test --slowest --testr-args='{posargs}'

[tox:jenkins]
Expand All @@ -36,7 +35,6 @@ commands = bash tools/lintstack.sh
# tests conflict with coverage.
setenv = VIRTUAL_ENV={envdir}
commands =
python tools/patch_tox_venv.py
python setup.py testr --coverage \
--testr-args='^(?!.*test.*coverage).*$'

Expand Down

0 comments on commit fd33285

Please sign in to comment.