summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2012-02-07 17:38:17 -0500
committerJason R. Coombs <jaraco@jaraco.com>2012-02-07 17:38:17 -0500
commitd4e8fd23a689318b5b80e2780e72437576636772 (patch)
tree348a436e476ab8bdd6b1a095d31ac4f25a1f36db
parente7fb2440ed0249c038417de1ade7724115ec2bdb (diff)
downloadpytest-runner-d4e8fd23a689318b5b80e2780e72437576636772.tar.gz
Fixed issue with handling of easy_install paramters.
-rw-r--r--command.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/command.py b/command.py
index 36339c1..a9481a7 100644
--- a/command.py
+++ b/command.py
@@ -8,9 +8,9 @@ setup_params = PyTest.install(dict(...))
setuptools.setup(**setup_params)
"""
-import os
+import os as _os
-from setuptools.command import test as _pytest_runner_test
+import setuptools.command.test as _pytest_runner_test
class PyTest(_pytest_runner_test.test):
user_options = [
@@ -30,8 +30,7 @@ class PyTest(_pytest_runner_test.test):
self.allow_hosts = None
def finalize_options(self):
- if self.allow_hosts:
- self.allow_hosts = self.allow_hosts.split(',')
+ pass
def run(self):
"""
@@ -73,11 +72,11 @@ class PyTest(_pytest_runner_test.test):
links = opts['find_links'][1].split() + links
opts['find_links'] = ('setup', links)
if self.allow_hosts:
- opts['allow_hosts'] = self.allow_hosts
+ opts['allow_hosts'] = ('test', self.allow_hosts)
if self.index_url:
- opts['index_url'] = self.index_url
+ opts['index_url'] = ('test', self.index_url)
cmd = easy_install(
- dist, args=["x"], install_dir=os.curdir, exclude_scripts=True,
+ dist, args=["x"], install_dir=_os.curdir, exclude_scripts=True,
always_copy=False, build_directory=None, editable=False,
upgrade=False, multi_version=True, no_report = True
)