From aa212374ee6ccd21a403b2196bbdcbf5092da9bf Mon Sep 17 00:00:00 2001
From: Makarand Dharmapurikar <makarandd@makarand-linux.mtv.corp.google.com>
Date: Wed, 9 Mar 2016 11:15:35 -0800
Subject: [PATCH] Cleaned up installation/test requirement fetching
---
src/python/grpcio/commands.py | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
index 3207ea3052..0e7f02a271 100644
--- a/src/python/grpcio/commands.py
+++ b/src/python/grpcio/commands.py
@@ -289,15 +289,9 @@ class TestLite(setuptools.Command):
sys.exit('Test failure')
def _add_eggs_to_path(self):
- """Adds all egg files under .eggs to sys.path"""
- # TODO(jtattemusch): there has to be a cleaner way to do this
- import pkg_resources
- eggs_dir = os.path.join(PYTHON_STEM, '../../../.eggs')
- eggs = [os.path.join(eggs_dir, filename)
- for filename in os.listdir(eggs_dir)
- if filename.endswith('.egg')]
- for egg in eggs:
- sys.path.insert(0, pkg_resources.normalize_path(egg))
+ """Fetch install and test requirements"""
+ self.distribution.fetch_build_eggs(self.distribution.install_requires)
+ self.distribution.fetch_build_eggs(self.distribution.tests_require)
class RunInterop(test.test):
--
GitLab