summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-10-09 21:49:43 +0100
committerMark McLoughlin <markmc@redhat.com>2013-10-09 21:49:43 +0100
commit0c5f6cbdfb39f48de8864c776590690c3b7e2a17 (patch)
tree670dae5e447a28675e571af0bc42976732d7b09c /tools
parente6860cc9a603501926c7da348d8e62002bc334cc (diff)
downloadironic-0c5f6cbdfb39f48de8864c776590690c3b7e2a17.tar.gz
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
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv_common.py38
-rw-r--r--tools/patch_tox_venv.py50
2 files changed, 0 insertions, 88 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index f428c1e02..b5ec5092f 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 d91958380..000000000
--- 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 = 'ironic'
- 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)