crate 0.35.2__py2.py3-none-any.whl → 1.0.0.dev0__py2.py3-none-any.whl

crate/client/__init__.py

@@ -29,7 +29,7 @@ __all__ = [
 
 # version string read from setup.py using a regex. Take care not to break the
 # regex!
-__version__ = "0.35.2"
+__version__ = "1.0.0dev0"
 
 apilevel = "2.0"
 threadsafety = 2

crate/testing/test_datetime_old.py

@@ -0,0 +1,90 @@
+# -*- coding: utf-8; -*-
+#
+# Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  Crate licenses
+# this file to you under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.  You may
+# obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# However, if you have executed another commercial license agreement
+# with Crate these terms will supersede the license and you may use the
+# software solely pursuant to the terms of the relevant commercial agreement.
+
+import os
+import sys
+import unittest
+from datetime import datetime, date
+from unittest import TestCase, mock
+
+import time_machine
+
+
+class DateTodayTest(TestCase):
+    """
+    `date.today()` returns the current local date, as advertised in the
+    documentation [1]. Thus, it depends on the system time zone.
+
+    The following test cases demonstrate that the test suite previously
+    failed around midnight, where the UTC vs. non-UTC days overlapped,
+    and when running on machines with non-UTC time zone.
+
+    On the other hand, `datetime.utcnow().date()` works equally well in all
+    situations, so we want to use that within the SQLAlchemy test cases.
+
+    Funny enough, the problem is not observable on Linux?
+
+    [1] https://docs.python.org/3/library/datetime.html#datetime.date.today
+    """
+
+    @mock.patch.dict(os.environ, {"TZ": "UTC"})
+    @time_machine.travel("2022-07-22T00:42:00+0200")
+    def test_date_today_depends_on_system_timezone_success_on_utc(self):
+        today_local = date.today()
+        today_utc = datetime.utcnow().date()
+        self.assertEqual(today_local, today_utc)
+        self.assertEqual(today_local, date(2022, 7, 21))
+        self.assertEqual(today_utc, date(2022, 7, 21))
+
+    @unittest.skipIf(sys.platform == "linux", "Problem not observable on Linux")
+    @mock.patch.dict(os.environ, {"TZ": "Europe/Prague"})
+    @time_machine.travel("2022-07-22T00:42:00+0200")
+    def test_date_today_depends_on_system_timezone_failure_on_non_utc(self):
+        today_local = date.today()
+        today_utc = datetime.utcnow().date()
+        self.assertNotEqual(today_local, today_utc)
+        self.assertEqual(today_local, date(2022, 7, 22))
+        self.assertEqual(today_utc, date(2022, 7, 21))
+
+    @mock.patch.dict(os.environ, {"TZ": "UTC"})
+    @time_machine.travel("2022-07-22T00:42:00+0200")
+    def test_date_today_utc(self):
+        today_local = date.today()
+        self.assertEqual(today_local, date(2022, 7, 21))
+
+    @unittest.skipIf(sys.platform == "linux", "Problem not observable on Linux")
+    @mock.patch.dict(os.environ, {"TZ": "Europe/Prague"})
+    @time_machine.travel("2022-07-22T00:42:00+0200")
+    def test_date_today_non_utc(self):
+        today_local = date.today()
+        self.assertEqual(today_local, date(2022, 7, 22))
+
+    @mock.patch.dict(os.environ, {"TZ": "UTC"})
+    @time_machine.travel("2022-07-22T00:42:00+0200")
+    def test_utcnow_date_utc(self):
+        today_utc = datetime.utcnow().date()
+        self.assertEqual(today_utc, date(2022, 7, 21))
+
+    @mock.patch.dict(os.environ, {"TZ": "Europe/Prague"})
+    @time_machine.travel("2022-07-22T00:42:00+0200")
+    def test_utcnow_date_non_utc(self):
+        today_utc = datetime.utcnow().date()
+        self.assertEqual(today_utc, date(2022, 7, 21))

crate-1.0.0.dev0-py3.11-nspkg.pth

@@ -0,0 +1 @@
+import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('crate',));importlib = __import__('importlib.util');__import__('importlib.machinery');m = sys.modules.setdefault('crate', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('crate', [os.path.dirname(p)])));m = m or sys.modules.setdefault('crate', types.ModuleType('crate'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)

{crate-0.35.2.dist-info → crate-1.0.0.dev0.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: crate
-Version: 0.35.2
+Version: 1.0.0.dev0
 Summary: CrateDB Python Client
 Home-page: https://github.com/crate/crate-python
 Author: Crate.io
 Author-email: office@crate.io
 License: Apache License 2.0
-Keywords: crate db api sqlalchemy
+Keywords: cratedb db api dbapi database sql http rdbms olap
 Platform: any
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -28,15 +28,11 @@ Requires-Python: >=3.6
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: urllib3 <2.2
+Requires-Dist: urllib3 <2.3
 Requires-Dist: verlib2 ==0.2.0
 Provides-Extra: doc
 Requires-Dist: sphinx <8,>=3.5 ; extra == 'doc'
 Requires-Dist: crate-docs-theme >=0.26.5 ; extra == 'doc'
-Provides-Extra: sqlalchemy
-Requires-Dist: sqlalchemy <2.1,>=1.0 ; extra == 'sqlalchemy'
-Requires-Dist: geojson <4,>=2.5.0 ; extra == 'sqlalchemy'
-Requires-Dist: backports.zoneinfo <1 ; (python_version < "3.9") and extra == 'sqlalchemy'
 Provides-Extra: test
 Requires-Dist: tox <5,>=3 ; extra == 'test'
 Requires-Dist: zope.testing <6,>=4 ; extra == 'test'
@@ -44,11 +40,13 @@ Requires-Dist: zope.testrunner <7,>=5 ; extra == 'test'
 Requires-Dist: zc.customdoctests <2,>=1.0.1 ; extra == 'test'
 Requires-Dist: certifi ; extra == 'test'
 Requires-Dist: createcoverage <2,>=1 ; extra == 'test'
-Requires-Dist: dask ; extra == 'test'
+Requires-Dist: dask[dataframe] ; extra == 'test'
 Requires-Dist: stopit <2,>=1.1.2 ; extra == 'test'
 Requires-Dist: flake8 <8,>=4 ; extra == 'test'
-Requires-Dist: pandas <2.2 ; extra == 'test'
+Requires-Dist: pandas <2.3 ; extra == 'test'
+Requires-Dist: pueblo >=0.0.7 ; extra == 'test'
 Requires-Dist: pytz ; extra == 'test'
+Requires-Dist: backports.zoneinfo <1 ; (python_version < "3.9") and extra == 'test'
 
 =====================
 CrateDB Python Client
@@ -93,12 +91,11 @@ CrateDB Python Client
 
 |
 
-A Python client library for CrateDB_.
+A Python client library for `CrateDB`_, implementing the Python `DB API 2.0`_
+specification.
 
-This library:
-
-- Implements the Python `DB API 2.0`_ specification.
-- Includes support for SQLAlchemy_ in form of an `SQLAlchemy dialect`_.
+The CrateDB dialect for `SQLAlchemy`_ is provided by the `sqlalchemy-cratedb`_
+package.
 
 
 Installation
@@ -106,10 +103,9 @@ Installation
 
 The CrateDB Python client is available as package `crate`_ on `PyPI`_.
 
-To install the most recent driver version, including the SQLAlchemy dialect
-extension, run::
+To install the most recent driver version, run::
 
-    $ pip install "crate[sqlalchemy]" --upgrade
+    $ pip install --upgrade crate
 
 
 Documentation and help
@@ -139,7 +135,7 @@ GitHub`_. We appreciate contributions of any kind.
 .. _Developer documentation: DEVELOP.rst
 .. _managed on GitHub: https://github.com/crate/crate-python
 .. _PyPI: https://pypi.org/
-.. _SQLAlchemy: https://www.sqlalchemy.org
-.. _SQLAlchemy dialect: https://docs.sqlalchemy.org/dialects/
+.. _SQLAlchemy: https://www.sqlalchemy.org/
+.. _sqlalchemy-cratedb: https://github.com/crate-workbench/sqlalchemy-cratedb
 .. _StackOverflow: https://stackoverflow.com/tags/cratedb
 .. _support channels: https://crate.io/support/

crate-1.0.0.dev0.dist-info/RECORD

@@ -0,0 +1,26 @@
+crate-1.0.0.dev0-py3.11-nspkg.pth,sha256=gvLEjpsSy1-MTRTFCtBSJShbzWEQV_F4w4da9cFYG5Y,462
+crate/client/__init__.py,sha256=6yl8zUjQTIyoaLVzENhAUj5gUekkEDYGEOwPEdI_gjA,1308
+crate/client/_pep440.py,sha256=iwY5wopxbgbwsT0ImANrwN3V_ZYQHhSr7lEdVT5dQRM,42
+crate/client/blob.py,sha256=plTwGEULg5s1VdKIMW6a0Zljdkng7xw0WXkXyiwNaSU,3496
+crate/client/connection.py,sha256=5vmtGZF20vxoeExHTeQ-DqJX4BPNT8ebzH_HOvdcqdE,8432
+crate/client/converter.py,sha256=9_-FBp8l9LwCfBsoWO0YOW0ASkwJ-le-YJFfJMLKCew,4301
+crate/client/cursor.py,sha256=qnrNM9QDQgo9RFVGU7HPmCxK15EFUWiOxW3BNlZcuNw,10758
+crate/client/exceptions.py,sha256=RINQtVF9jD5f_tcKpZ8A1haztKilf9HUwjESYx-W1Bk,2242
+crate/client/http.py,sha256=aA6L-9i7-UovLKG3ICymRq7S0KPOIZiNejv1jzPrn4A,22559
+crate/client/test_connection.py,sha256=sGsnqgpxe9sgD6TllVbQGHozf4Binrzxe_ydfAQJgWE,3670
+crate/client/test_cursor.py,sha256=Q9Npq55zTY4g51kf3P7DnmTsYdv0iRwqDptKOj9ffxA,12858
+crate/client/test_http.py,sha256=LvUC0QeAhH2-LJDfp2zVT6OEVTG6GKqid6qUTM9rjGY,23534
+crate/client/test_util.py,sha256=k8j3Ya1fPwdfrbRkUNsqxqcyoi5Rj7O_r4HpOEdK_yA,2508
+crate/testing/__init__.py,sha256=UnxmjVrk-eNORsitiM48W0pB6yfsaErOak8RYh_ELt8,10
+crate/testing/layer.py,sha256=-AvRsTysqncns5IqUFWKZFppC3KwQxDJt0tnBWjxlMs,13382
+crate/testing/settings.py,sha256=YTqod79NO4Lv_agPgMLGlB_fMe6baAhLXFKBZnuytBk,1652
+crate/testing/test_datetime_old.py,sha256=SI0HzI8CfcbOYIj9MJz_XACrnwWyMQCZzM_Gu5PUDkI,3799
+crate/testing/test_layer.py,sha256=S0QgY7TgD52EyYWrMoSLUfRVjVzw-oiUdR-g5fJ_zmQ,11512
+crate/testing/util.py,sha256=qtc72rKfvfTA9VMKjE2JSukffobd7ffCcddoTiAdO6A,690
+crate-1.0.0.dev0.dist-info/LICENSE,sha256=1QGh4tR_JmDKn33ztoDv2UkER0Q4Zh1kC5J3vMWwRso,12854
+crate-1.0.0.dev0.dist-info/METADATA,sha256=6pYNFZUglxlJ6D8DrKMnukptx7EewcBQqgp4Aye6wqU,4801
+crate-1.0.0.dev0.dist-info/NOTICE,sha256=vwbBS8sykCOndA1kjuu8dUInljH27kk3lcPBzQ2SMns,1159
+crate-1.0.0.dev0.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+crate-1.0.0.dev0.dist-info/namespace_packages.txt,sha256=2wP2HlpxdhgTLMl9ipi168xkm6FMq9_2bf0xGGxF_OI,6
+crate-1.0.0.dev0.dist-info/top_level.txt,sha256=2wP2HlpxdhgTLMl9ipi168xkm6FMq9_2bf0xGGxF_OI,6
+crate-1.0.0.dev0.dist-info/RECORD,,

{crate-0.35.2.dist-info → crate-1.0.0.dev0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

crate/client/sqlalchemy/__init__.py

@@ -1,50 +0,0 @@
-# -*- coding: utf-8; -*-
-#
-# Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
-# license agreements.  See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership.  Crate licenses
-# this file to you under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.  You may
-# obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# However, if you have executed another commercial license agreement
-# with Crate these terms will supersede the license and you may use the
-# software solely pursuant to the terms of the relevant commercial agreement.
-
-from .compat.api13 import monkeypatch_add_exec_driver_sql
-from .dialect import CrateDialect
-from .sa_version import SA_1_4, SA_VERSION
-
-
-if SA_VERSION < SA_1_4:
-    import textwrap
-    import warnings
-
-    # SQLAlchemy 1.3 is effectively EOL.
-    SA13_DEPRECATION_WARNING = textwrap.dedent("""
-    WARNING: SQLAlchemy 1.3 is effectively EOL.
-
-    SQLAlchemy 1.3 is EOL since 2023-01-27.
-    Future versions of the CrateDB SQLAlchemy dialect will drop support for SQLAlchemy 1.3.
-    It is recommended that you transition to using SQLAlchemy 1.4 or 2.0:
-
-    - https://docs.sqlalchemy.org/en/14/changelog/migration_14.html
-    - https://docs.sqlalchemy.org/en/20/changelog/migration_20.html
-    """.lstrip("\n"))
-    warnings.warn(message=SA13_DEPRECATION_WARNING, category=DeprecationWarning)
-
-    # SQLAlchemy 1.3 does not have the `exec_driver_sql` method, so add it.
-    monkeypatch_add_exec_driver_sql()
-
-
-__all__ = [
-    CrateDialect,
-]

crate/client/sqlalchemy/compat/api13.py

@@ -1,156 +0,0 @@
-# -*- coding: utf-8; -*-
-#
-# Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
-# license agreements.  See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership.  Crate licenses
-# this file to you under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.  You may
-# obtain a copy of the License at
-#
-#   https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# However, if you have executed another commercial license agreement
-# with Crate these terms will supersede the license and you may use the
-# software solely pursuant to the terms of the relevant commercial agreement.
-
-"""
-Compatibility module for running a subset of SQLAlchemy 2.0 programs on
-SQLAlchemy 1.3. By using monkey-patching, it can do two things:
-
-1. Add the `exec_driver_sql` method to SA's `Connection` and `Engine`.
-2. Amend the `sql.select` function to accept the calling semantics of
-   the modern variant.
-
-Reason: `exec_driver_sql` gets used within the CrateDB dialect already,
-and the new calling semantics of `sql.select` already get used within
-many of the test cases already. Please note that the patch for
-`sql.select` is only applied when running the test suite.
-"""
-
-import collections.abc as collections_abc
-
-from sqlalchemy import exc
-from sqlalchemy.sql import Select
-from sqlalchemy.sql import select as original_select
-from sqlalchemy.util import immutabledict
-
-
-# `_distill_params_20` copied from SA14's `sqlalchemy.engine.{base,util}`.
-_no_tuple = ()
-_no_kw = immutabledict()
-
-
-def _distill_params_20(params):
-    if params is None:
-        return _no_tuple, _no_kw
-    elif isinstance(params, list):
-        # collections_abc.MutableSequence): # avoid abc.__instancecheck__
-        if params and not isinstance(params[0], (collections_abc.Mapping, tuple)):
-            raise exc.ArgumentError(
-                "List argument must consist only of tuples or dictionaries"
-            )
-
-        return (params,), _no_kw
-    elif isinstance(
-        params,
-        (tuple, dict, immutabledict),
-        # only do abc.__instancecheck__ for Mapping after we've checked
-        # for plain dictionaries and would otherwise raise
-    ) or isinstance(params, collections_abc.Mapping):
-        return (params,), _no_kw
-    else:
-        raise exc.ArgumentError("mapping or sequence expected for parameters")
-
-
-def exec_driver_sql(self, statement, parameters=None, execution_options=None):
-    """
-    Adapter for `exec_driver_sql`, which is available since SA14, for SA13.
-    """
-    if execution_options is not None:
-        raise ValueError(
-            "SA13 backward-compatibility: "
-            "`exec_driver_sql` does not support `execution_options`"
-        )
-    args_10style, kwargs_10style = _distill_params_20(parameters)
-    return self.execute(statement, *args_10style, **kwargs_10style)
-
-
-def monkeypatch_add_exec_driver_sql():
-    """
-    Transparently add SA14's `exec_driver_sql()` method to SA13.
-
-    AttributeError: 'Connection' object has no attribute 'exec_driver_sql'
-    AttributeError: 'Engine' object has no attribute 'exec_driver_sql'
-    """
-    from sqlalchemy.engine.base import Connection, Engine
-
-    # Add `exec_driver_sql` method to SA's `Connection` and `Engine` classes.
-    Connection.exec_driver_sql = exec_driver_sql
-    Engine.exec_driver_sql = exec_driver_sql
-
-
-def select_sa14(*columns, **kw) -> Select:
-    """
-    Adapt SA14/SA20's calling semantics of `sql.select()` to SA13.
-
-    With SA20, `select()` no longer accepts varied constructor arguments, only
-    the "generative" style of `select()` will be supported. The list of columns
-    / tables to select from should be passed positionally.
-
-    Derived from https://github.com/sqlalchemy/alembic/blob/b1fad6b6/alembic/util/sqla_compat.py#L557-L558
-
-    sqlalchemy.exc.ArgumentError: columns argument to select() must be a Python list or other iterable
-    """
-    if isinstance(columns, tuple) and isinstance(columns[0], list):
-        if "whereclause" in kw:
-            raise ValueError(
-                "SA13 backward-compatibility: "
-                "`whereclause` is both in kwargs and columns tuple"
-            )
-        columns, whereclause = columns
-        kw["whereclause"] = whereclause
-    return original_select(columns, **kw)
-
-
-def monkeypatch_amend_select_sa14():
-    """
-    Make SA13's `sql.select()` transparently accept calling semantics of SA14
-    and SA20, by swapping in the newer variant of `select_sa14()`.
-
-    This supports the test suite of `crate-python`, because it already uses the
-    modern calling semantics.
-    """
-    import sqlalchemy
-
-    sqlalchemy.select = select_sa14
-    sqlalchemy.sql.select = select_sa14
-    sqlalchemy.sql.expression.select = select_sa14
-
-
-@property
-def connectionfairy_driver_connection_sa14(self):
-    """The connection object as returned by the driver after a connect.
-
-    .. versionadded:: 1.4.24
-
-    .. seealso::
-
-        :attr:`._ConnectionFairy.dbapi_connection`
-
-        :attr:`._ConnectionRecord.driver_connection`
-
-        :ref:`faq_dbapi_connection`
-
-    """
-    return self.connection
-
-
-def monkeypatch_add_connectionfairy_driver_connection():
-    import sqlalchemy.pool.base
-    sqlalchemy.pool.base._ConnectionFairy.driver_connection = connectionfairy_driver_connection_sa14