Make scales, blist optional dependencies

Fixes #114
This commit is contained in:
Tyler Hobbs
2014-05-07 10:46:00 -05:00
parent e6d56ba000
commit 7d992b85d5
6 changed files with 10 additions and 7 deletions

View File

@@ -19,6 +19,7 @@ Other
----- -----
* Don't log at ERROR when a connection is closed during the startup * Don't log at ERROR when a connection is closed during the startup
communications communications
* Mke scales, blist optional dependencies
1.1.1 1.1.1
===== =====

View File

@@ -15,7 +15,12 @@
from itertools import chain from itertools import chain
import logging import logging
from greplin import scales try:
from greplin import scales
except ImportError:
raise ImportError(
"The scales library is required for metrics support: "
"https://pypi.python.org/pypi/scales")
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

View File

@@ -1,3 +1 @@
blist
futures futures
scales

View File

@@ -31,7 +31,6 @@ from distutils.errors import (CCompilerError, DistutilsPlatformError,
from distutils.cmd import Command from distutils.cmd import Command
import platform
import os import os
import warnings import warnings
@@ -181,9 +180,7 @@ def run_setup(extensions):
kw['cmdclass']['build_ext'] = build_extensions kw['cmdclass']['build_ext'] = build_extensions
kw['ext_modules'] = extensions kw['ext_modules'] = extensions
dependencies = ['futures', 'scales', 'blist'] dependencies = ['futures']
if platform.python_implementation() != "CPython":
dependencies.remove('blist')
setup( setup(
name='cassandra-driver', name='cassandra-driver',

View File

@@ -1,3 +1,4 @@
scales
nose nose
mock mock
ccm ccm

View File

@@ -8,5 +8,6 @@ deps = nose
unittest2 unittest2
pip pip
PyYAML PyYAML
scales
commands = {envpython} setup.py build_ext --inplace commands = {envpython} setup.py build_ext --inplace
nosetests --verbosity=2 tests/unit/ nosetests --verbosity=2 tests/unit/