aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-03-20 15:54:03 -0700
committerGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-03-20 15:54:03 -0700
commit68edc15796793e2ef761f574a1bece3d1920b130 (patch)
tree8046b4b570aac713cd3fdb8d3e726697ee8f2b19 /src
parent950ecbd7267ddf0481bdb75c50b717bbef4753c4 (diff)
parentaa212374ee6ccd21a403b2196bbdcbf5092da9bf (diff)
Merge pull request #5679 from makdharma/master
Cleaned up installation/test requirement fetching
Diffstat (limited to 'src')
-rw-r--r--src/python/grpcio/commands.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
index c1f444f6f1..1d43547419 100644
--- a/src/python/grpcio/commands.py
+++ b/src/python/grpcio/commands.py
@@ -288,15 +288,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):