fix test_engine

Author: fantix

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gino"
-version = "1.1.0-beta.1"
+version = "2.0.0-alpha.1"
 description = "GINO Is Not ORM - a Python asyncio ORM on SQLAlchemy core."
 license = "BSD-3-Clause"
 authors = ["Fantix King <fantix.king@gmail.com>"]
@@ -16,27 +16,25 @@ classifiers = [
     "License :: OSI Approved :: BSD License",
     "Natural Language :: English",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.5",
-    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
 ]
 
 [tool.poetry.dependencies]
-python = "^3.5"
-asyncpg = ">=0.18,<1.0"
-SQLAlchemy = ">=1.3,<1.4"
+python = "^3.7"
+asyncpg = "^0.21.0,<1.0"
+sqlalchemy = {path = "../sqlalchemy"}
+#SQLAlchemy = {git = "https://github.com/sqlalchemy/sqlalchemy.git"}
 
 # compatibility
-contextvars = { version = "^2.4", python = "<3.7" }
-importlib_metadata = { version = "^1.3.0", python = "<3.8" }
+importlib_metadata = {version = "^1.7.0", python = "<3.8"}
 
 # extensions
-gino-starlette = { version = "^0.1.1", optional = true, python = "^3.6" }
-gino-aiohttp = { version = "^0.1.0", optional = true, python = "^3.5.3" }
-gino-tornado = { version = "^0.1.0", optional = true, python = "^3.5.2" }
-gino-sanic = { version = "^0.1.0", optional = true, python = "^3.6" }
-gino-quart = { version = "^0.1.0", optional = true, python = "^3.7" }
+gino-starlette = { version = "^0.1.1", optional = true }
+gino-aiohttp = { version = "^0.1.0", optional = true }
+gino-tornado = { version = "^0.1.0", optional = true }
+gino-sanic = { version = "^0.1.0", optional = true }
+gino-quart = { version = "^0.1.0", optional = true }
 
 [tool.poetry.extras]
 starlette = ["gino-starlette"]
@@ -47,27 +45,22 @@ quart = ["gino-quart"]
 
 [tool.poetry.dev-dependencies]
 psycopg2-binary = "^2.8.5"
-async_generator = "^1.10"
-click = "^7.1"
+click = "^7.1.2"
 
 # tests
-pytest = "^5.4.1"
-pytest-asyncio = "^0.10.0"
-pytest-mock = "^3.0.0"
-pytest-cov = "^2.8.1"
-black = { version = "^19.10b0", python = ">=3.6" }
-mypy = "^0.770"
+pytest = "^6.0.1"
+pytest-asyncio = "^0.14.0"
+pytest-mock = "^3.3.0"
+pytest-cov = "^2.10.1"
+black = "^19.10b0"
+mypy = "^0.782"
 
 # docs
-sphinx = "^3.0.3"
-sphinx-rtd-theme = "^0.4.3"
+sphinx = "^3.2.1"
+sphinx-rtd-theme = "^0.5.0"
 sphinxcontrib-apidoc = "^0.3.0"
 sphinx-autobuild = "^0.7.1"
-sphinx-intl = {extras = ["transifex"], version = "^2.0.1"}
-
-[tool.poetry.plugins."sqlalchemy.dialects"]
-"postgresql.asyncpg" = "gino.dialects.asyncpg:AsyncpgDialect"
-"asyncpg" = "gino.dialects.asyncpg:AsyncpgDialect"
+sphinx-intl = {version = "^2.0.1", extras = ["transifex"]}
 
 [build-system]
 requires = ["poetry>=1.0"]

pyproject.toml

@@ -1,39 +1,16 @@
 from .api import Gino  # NOQA
 from .bakery import Bakery
-from .engine import GinoEngine, GinoConnection  # NOQA
 from .exceptions import *  # NOQA
-from .strategies import GinoStrategy  # NOQA
-
-
-def create_engine(*args, **kwargs):
-    """
-    Shortcut for :func:`sqlalchemy.create_engine` with ``strategy="gino"``.
-
-    .. versionchanged:: 1.1
-       Added the ``bakery`` keyword argument, please see :class:`~.bakery.Bakery`.
-
-    .. versionchanged:: 1.1
-       Added the ``prebake`` keyword argument to choose when to create the prepared
-       statements for the queries in the bakery:
-
-       * **Pre-bake** immediately when connected to the database (default).
-       * No **pre-bake** but create prepared statements lazily when needed for the first
-         time.
-    """
-
-    from sqlalchemy import create_engine
-
-    kwargs.setdefault("strategy", "gino")
-    return create_engine(*args, **kwargs)
+from .engine import GinoEngine, GinoConnection, create_engine  # NOQA
 
 
 def get_version():
     """Get current GINO version."""
 
     try:
-        from importlib.metadata import version
-    except ImportError:
         from importlib_metadata import version
+    except ImportError:
+        from importlib.metadata import version
     return version("gino")
 
 

src/gino/__init__.py

@@ -3,13 +3,12 @@
 import sqlalchemy as sa
 from sqlalchemy.engine.url import make_url, URL
 from sqlalchemy.sql.base import Executable
-from sqlalchemy.sql.schema import SchemaItem
 
 from . import json_support
+from .engine import create_engine
 from .crud import CRUDModel
 from .declarative import declarative_base, declared_attr
 from .exceptions import UninitializedError
-from .schema import GinoSchemaVisitor, patch_schema
 
 
 class GinoExecutor:
@@ -302,7 +301,7 @@ class Gino(sa.MetaData):
 
     """
 
-    schema_visitor = GinoSchemaVisitor
+    # schema_visitor = GinoSchemaVisitor
     """
     The overridable ``gino`` extension class on
     :class:`~sqlalchemy.schema.SchemaItem`.
@@ -321,6 +320,11 @@ class Gino(sa.MetaData):
 
     """
 
+    Column = sa.Column
+    Integer = sa.Integer
+    String = sa.String
+    DateTime = sa.DateTime
+
     def __init__(
         self,
         bind=None,
@@ -371,9 +375,9 @@ def __init__(
         if ext:
             if query_ext:
                 Executable.gino = property(self.query_executor)
-            if schema_ext:
-                SchemaItem.gino = property(self.schema_visitor)
-                patch_schema(self)
+            # if schema_ext:
+            # SchemaItem.gino = property(self.schema_visitor)
+            # patch_schema(self)
 
     # noinspection PyPep8Naming
     @property
@@ -422,9 +426,7 @@ async def set_bind(self, bind, loop=None, **kwargs):
         if isinstance(bind, str):
             bind = make_url(bind)
         if isinstance(bind, URL):
-            from . import create_engine
-
-            bind = await create_engine(bind, loop=loop, bakery=self._bakery, **kwargs)
+            bind = await create_engine(bind, **kwargs)
         self.bind = bind
         return bind