Move cqlengine to cassandra package

cassandra/cqlengine/__init__.py

@@ -0,0 +1,9 @@
+# compaction
+SizeTieredCompactionStrategy = "SizeTieredCompactionStrategy"
+LeveledCompactionStrategy = "LeveledCompactionStrategy"
+
+# Caching constants.
+CACHING_ALL = "ALL"
+CACHING_KEYS_ONLY = "KEYS_ONLY"
+CACHING_ROWS_ONLY = "ROWS_ONLY"
+CACHING_NONE = "NONE"

cassandra/cqlengine/columns.py

@@ -3,14 +3,14 @@ from copy import deepcopy, copy
 from datetime import datetime
 from datetime import date
 import re
-from cassandra.cqltypes import DateType
-
-from cqlengine.exceptions import ValidationError
-from cassandra.encoder import cql_quote
 import six
-
 import sys
 
+from cassandra.cqltypes import DateType
+from cassandra.encoder import cql_quote
+from cassandra.cqlengine.exceptions import ValidationError
+
+
 # move to central spot
 class UnicodeMixin(object):
     if sys.version_info > (3, 0):

cassandra/cqlengine/connection.py

@@ -1,17 +1,13 @@
-#http://pypi.python.org/pypi/cql/1.0.4
-#http://code.google.com/a/apache-extras.org/p/cassandra-dbapi2 /
-#http://cassandra.apache.org/doc/cql/CQL.html
-from __future__ import absolute_import
 from collections import namedtuple
-from cassandra.cluster import Cluster, _NOT_SET, NoHostAvailable
-from cassandra.query import SimpleStatement, Statement, dict_factory
-from cqlengine.statements import BaseCQLStatement
-from cqlengine.exceptions import CQLEngineException, UndefinedKeyspaceException
-from cassandra import ConsistencyLevel
-
 import six
 import logging
 
+from cassandra import ConsistencyLevel
+from cassandra.cluster import Cluster, _NOT_SET, NoHostAvailable
+from cassandra.query import SimpleStatement, Statement, dict_factory
+from cassandra.cqlengine.exceptions import CQLEngineException, UndefinedKeyspaceException
+from cassandra.cqlengine.statements import BaseCQLStatement
+
 
 LOG = logging.getLogger('cqlengine.cql')
 NOT_SET = _NOT_SET  # required for passing timeout to Session.execute
@@ -55,7 +51,7 @@ def setup(
     if not default_keyspace:
         raise UndefinedKeyspaceException()
 
-    from cqlengine import models
+    from cassandra.cqlengine import models
     models.DEFAULT_KEYSPACE = default_keyspace
 
     default_consistency_level = consistency

cassandra/cqlengine/functions.py

@@ -1,8 +1,8 @@
 from datetime import datetime
-from uuid import uuid1
-import sys
 import six
-from cqlengine.exceptions import ValidationError
+import sys
+
+from cassandra.cqlengine.exceptions import ValidationError
 # move to central spot
 
 class UnicodeMixin(object):

cassandra/cqlengine/management.py

@@ -1,19 +1,18 @@
-import json
-import warnings
-import six
-from cqlengine import SizeTieredCompactionStrategy, LeveledCompactionStrategy
-from cqlengine import ONE
-from cqlengine.named import NamedTable
-
-from cqlengine.connection import execute, get_cluster
-from cqlengine.exceptions import CQLEngineException
-
-import logging
 from collections import namedtuple
+import json
+import logging
+import six
+
+from cassandra.cqlengine import SizeTieredCompactionStrategy, LeveledCompactionStrategy
+from cassandra.cqlengine.connection import execute, get_cluster
+from cassandra.cqlengine.exceptions import CQLEngineException
+from cassandra.cqlengine.models import Model
+from cassandra.cqlengine.named import NamedTable
+
+
 Field = namedtuple('Field', ['name', 'type'])
 
 logger = logging.getLogger(__name__)
-from cqlengine.models import Model
 
 # system keyspaces
 schema_columnfamilies = NamedTable('system', 'schema_columnfamilies')

cassandra/cqlengine/models.py

@@ -1,12 +1,11 @@
-from collections import OrderedDict
 import re
-import warnings
 
-from cqlengine import columns
-from cqlengine.exceptions import ModelException, CQLEngineException, ValidationError
-from cqlengine.query import ModelQuerySet, DMLQuery, AbstractQueryableColumn, NOT_SET
-from cqlengine.query import DoesNotExist as _DoesNotExist
-from cqlengine.query import MultipleObjectsReturned as _MultipleObjectsReturned
+from cassandra.cqlengine import columns
+from cassandra.cqlengine.exceptions import ModelException, CQLEngineException, ValidationError
+from cassandra.cqlengine.query import ModelQuerySet, DMLQuery, AbstractQueryableColumn, NOT_SET
+from cassandra.cqlengine.query import DoesNotExist as _DoesNotExist
+from cassandra.cqlengine.query import MultipleObjectsReturned as _MultipleObjectsReturned
+from cassandra.util import OrderedDict
 
 class ModelDefinitionException(ModelException): pass
 

cassandra/cqlengine/named.py

@@ -1,8 +1,7 @@
-from cqlengine.exceptions import CQLEngineException
-from cqlengine.query import AbstractQueryableColumn, SimpleQuerySet
-
-from cqlengine.query import DoesNotExist as _DoesNotExist
-from cqlengine.query import MultipleObjectsReturned as _MultipleObjectsReturned
+from cassandra.cqlengine.exceptions import CQLEngineException
+from cassandra.cqlengine.query import AbstractQueryableColumn, SimpleQuerySet
+from cassandra.cqlengine.query import DoesNotExist as _DoesNotExist
+from cassandra.cqlengine.query import MultipleObjectsReturned as _MultipleObjectsReturned
 
 class QuerySetDescriptor(object):
     """

cassandra/cqlengine/operators.py

@@ -1,10 +1,9 @@
 import six
+import sys
 
 
 class QueryOperatorException(Exception): pass
 
-import sys
-
 # move to central spot
 class UnicodeMixin(object):
     if sys.version_info > (3, 0):

cassandra/cqlengine/query.py

@@ -1,20 +1,20 @@
-from __future__ import absolute_import
 import copy
-import time
 from datetime import datetime, timedelta
-from cqlengine import BaseContainerColumn, Map, columns
-from cqlengine.columns import Counter, List, Set
+import time
 
-from .connection import execute, NOT_SET
-
-from cqlengine.exceptions import CQLEngineException, ValidationError, LWTException, IfNotExistsWithCounterColumn
-from cqlengine.functions import Token, BaseQueryFunction, QueryValue, UnicodeMixin
-
-#CQL 3 reference:
-#http://www.datastax.com/docs/1.1/references/cql/index
-from cqlengine.operators import InOperator, EqualsOperator, GreaterThanOperator, GreaterThanOrEqualOperator
-from cqlengine.operators import LessThanOperator, LessThanOrEqualOperator, BaseWhereOperator
-from cqlengine.statements import WhereClause, SelectStatement, DeleteStatement, UpdateStatement, AssignmentClause, InsertStatement, BaseCQLStatement, MapUpdateClause, MapDeleteClause, ListUpdateClause, SetUpdateClause, CounterUpdateClause, TransactionClause
+from cassandra.cqlengine.columns import BaseContainerColumn, Map, Counter, List, Set
+from cassandra.cqlengine.connection import execute, NOT_SET
+from cassandra.cqlengine.exceptions import CQLEngineException, ValidationError, LWTException, IfNotExistsWithCounterColumn
+from cassandra.cqlengine.functions import Token, BaseQueryFunction, QueryValue, UnicodeMixin
+from cassandra.cqlengine.operators import (InOperator, EqualsOperator, GreaterThanOperator,
+                                           GreaterThanOrEqualOperator, LessThanOperator,
+                                           LessThanOrEqualOperator, BaseWhereOperator)
+# import * ?
+from cassandra.cqlengine.statements import (WhereClause, SelectStatement, DeleteStatement,
+                                            UpdateStatement, AssignmentClause, InsertStatement,
+                                            BaseCQLStatement, MapUpdateClause, MapDeleteClause,
+                                            ListUpdateClause, SetUpdateClause, CounterUpdateClause,
+                                            TransactionClause)
 
 
 class QueryException(CQLEngineException): pass

cassandra/cqlengine/statements.py

@@ -1,16 +1,15 @@
-import time
 from datetime import datetime, timedelta
+import time
 import six
-from cqlengine.functions import QueryValue
-from cqlengine.operators import BaseWhereOperator, InOperator
+import sys
+
+from cassandra.cqlengine.functions import QueryValue
+from cassandra.cqlengine.operators import BaseWhereOperator, InOperator
 
 
 class StatementException(Exception): pass
 
 
-
-import sys
-
 class UnicodeMixin(object):
     if sys.version_info > (3, 0):
         __str__ = lambda x: x.__unicode__()

cqlengine/VERSION

@@ -1 +0,0 @@
-0.21.0

cqlengine/__init__.py

@@ -1,33 +0,0 @@
-import pkg_resources
-
-from cassandra import ConsistencyLevel
-
-from cqlengine.columns import *
-from cqlengine.functions import *
-from cqlengine.models import Model
-from cqlengine.query import BatchQuery
-
-
-__cqlengine_version_path__ = pkg_resources.resource_filename('cqlengine',
-                                                             'VERSION')
-__version__ = open(__cqlengine_version_path__, 'r').readline().strip()
-
-# compaction
-SizeTieredCompactionStrategy = "SizeTieredCompactionStrategy"
-LeveledCompactionStrategy = "LeveledCompactionStrategy"
-
-# Caching constants.
-CACHING_ALL = "ALL"
-CACHING_KEYS_ONLY = "KEYS_ONLY"
-CACHING_ROWS_ONLY = "ROWS_ONLY"
-CACHING_NONE = "NONE"
-
-ANY = ConsistencyLevel.ANY
-ONE = ConsistencyLevel.ONE
-TWO = ConsistencyLevel.TWO
-THREE = ConsistencyLevel.THREE
-QUORUM = ConsistencyLevel.QUORUM
-LOCAL_ONE = ConsistencyLevel.LOCAL_ONE
-LOCAL_QUORUM = ConsistencyLevel.LOCAL_QUORUM
-EACH_QUORUM = ConsistencyLevel.EACH_QUORUM
-ALL = ConsistencyLevel.ALL