Fix a test so that now tox doesn't require the mesos.native egg.
- This makes it easier to get people started.
diff --git a/README.md b/README.md
index 5cb76f4..3f7fd21 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,7 @@
information.
### Unit Tests
-Make sure [tox](https://tox.readthedocs.org/en/latest/) is installed and a `mesos.native` wheel for
-your platform is placed in `3rdparty/`. Then run:
+Make sure [tox](https://tox.readthedocs.org/en/latest/) is installed and just run:
tox
diff --git a/setup.py b/setup.py
index 4573c1b..8db2a6a 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,6 @@
'kazoo==1.3.1',
'mako==0.4.0',
'mesos.interface{0}'.format(MESOS_VERSION),
- 'mesos.native{0}'.format(MESOS_VERSION),
'mysql-python',
'pyyaml==3.10',
'sqlalchemy',
@@ -62,13 +61,14 @@
],
extras_require={
'test': ['webtest',],
+ 'driver': ['mesos.native{0}'.format(MESOS_VERSION),],
},
entry_points={
'console_scripts': [
- 'mysos_scheduler=mysos.scheduler.mysos_scheduler:proxy_main',
- 'mysos_executor=mysos.executor.mysos_executor:proxy_main',
- 'vagrant_mysos_executor=mysos.executor.testing.vagrant_mysos_executor:proxy_main',
- 'fake_mysos_executor=mysos.executor.testing.fake_mysos_executor:proxy_main',
+ 'mysos_scheduler=mysos.scheduler.mysos_scheduler:proxy_main [driver]',
+ 'mysos_executor=mysos.executor.mysos_executor:proxy_main [driver]',
+ 'vagrant_mysos_executor=mysos.executor.testing.vagrant_mysos_executor:proxy_main [driver]',
+ 'fake_mysos_executor=mysos.executor.testing.fake_mysos_executor:proxy_main [driver]',
'mysos_test_client=mysos.testing.mysos_test_client:proxy_main',
],
},
diff --git a/tests/scheduler/test_mysos_scheduler.py b/tests/scheduler/test_mysos_scheduler.py
index b1e01a3..32dd146 100644
--- a/tests/scheduler/test_mysos_scheduler.py
+++ b/tests/scheduler/test_mysos_scheduler.py
@@ -9,7 +9,6 @@
from kazoo.handlers.threading import SequentialThreadingHandler
import mesos.interface
from mesos.interface.mesos_pb2 import DRIVER_STOPPED, FrameworkInfo
-import mesos.native
from twitter.common import log
from twitter.common.concurrent import deadline
from twitter.common.dirutil import safe_mkdtemp
@@ -31,6 +30,7 @@
NOTE: Due to the limitation of zake the scheduler's ZK operations are not propagated to
executors in separate processes but they are unit-tested separately.
"""
+ import mesos.native
# Make sure fake_mysos_executor.pex is available to be fetched by Mesos slave.
# TODO(xujyan): Fix this as we don't use pex here anymore.
