@@ -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
|
||||||
=====
|
=====
|
||||||
|
@@ -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__)
|
||||||
|
|
||||||
|
@@ -1,3 +1 @@
|
|||||||
blist
|
|
||||||
futures
|
futures
|
||||||
scales
|
|
||||||
|
5
setup.py
5
setup.py
@@ -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',
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
scales
|
||||||
nose
|
nose
|
||||||
mock
|
mock
|
||||||
ccm
|
ccm
|
||||||
|
Reference in New Issue
Block a user