Update dependencies

* No longer depending on asyncpg by default
* Removed mysqlclient dependency
* Upgraded black and reformatted code

Closes: #740

Author: fantix

.github/workflows/cd.yml

@@ -35,7 +35,7 @@ jobs:
           pip install pip==20.3.1 setuptools==50.3.2
           curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
           source $HOME/.poetry/env
-          poetry install --no-interaction
+          poetry install --no-interaction -E pg -E mysql
 
       - name: Log currently installed packages and versions
         run: pip list

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
           pip install pip==20.3.1 setuptools==50.3.2
           curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
           source $HOME/.poetry/env
-          poetry install --no-interaction
+          poetry install --no-interaction -E pg -E mysql
 
       - name: Log currently installed packages and versions
         run: pip list

HISTORY.rst

@@ -11,7 +11,9 @@ GINO 1.1
 * Added baked query feature (#478 #659 #667)
 * Added ``Query.gino.execution_options`` shortcut (#659)
 * Added ``@db.declared_attr(with_table=True)`` (#659)
-* [Breaking] empty object instead of ``None`` being returned for objects with values of all selected columns are None (#729)
+* [Breaking] Empty object instead of ``None`` being returned for objects with values of all selected columns are None (#729)
+* Added MySQL support (#381 #685)
+* [Breaking] asyncpg is no longer installed as a dependency by default, install ``gino[pg]`` for the old behavior
 
 
 GINO 1.0

Makefile

@@ -64,4 +64,4 @@ dist: clean ## builds source and wheel package
 	ls -l dist
 
 install: clean ## install the package to the active Python's site-packages
-	poetry install
+	poetry install -E pg -E mysql

docs/tutorials/fastapi.rst

@@ -45,7 +45,7 @@ extension for Starlette <https://github.com/python-gino/gino-starlette>`_. Simpl
 
 .. code-block:: console
 
-    $ poetry add gino[starlette]
+    $ poetry add gino[pg,starlette]
 
 Then let's add FastAPI_, together with the lightning-fast ASGI_ server Uvicorn_, and
 Gunicorn_ as a production application server:
@@ -87,7 +87,7 @@ That's all, this is my ``pyproject.toml`` created by Poetry_, yours should look
 
     [tool.poetry.dependencies]
     python = "^3.8"
-    gino = {version = "^1.0", extras = ["starlette"]}
+    gino = {version = "^1.0", extras = ["pg", "starlette"]}
     fastapi = "^0.54.1"
     uvicorn = "^0.11.3"
     gunicorn = "^20.0.4"

mysql_tests/conftest.py

@@ -13,7 +13,9 @@
 
 @pytest.fixture(scope="module")
 def sa_engine():
-    rv = sqlalchemy.create_engine(MYSQL_URL, echo=ECHO)
+    rv = sqlalchemy.create_engine(
+        MYSQL_URL.replace("mysql://", "mysql+pymysql://"), echo=ECHO
+    )
     db.create_all(rv)
     yield rv
     db.drop_all(rv)

poetry.lock

@@ -20,27 +20,35 @@ classifiers = [
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
 ]
 
 [tool.poetry.dependencies]
 python = "^3.5"
-asyncpg = ">=0.18,<1.0"
 SQLAlchemy = ">=1.3,<1.4"
-mysqlclient = "^1.4"
+
+# drivers
+asyncpg = { version = ">=0.18,<1.0", optional = true }
+aiomysql = { version = "^0.0.21", optional = true }
 
 # compatibility
 contextvars = { version = "^2.4", python = "<3.7" }
-importlib_metadata = { version = "^1.3.0", python = "<3.8" }
+importlib_metadata = { version = "^2.0.0", python = "<3.8" }
 
 # extensions
 gino-starlette = { version = "^0.1.1", optional = true, python = "^3.6" }
 gino-aiohttp = {version = "^0.2.0", optional = true, python = "^3.6"}
 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" }
-aiomysql = "^0.0.21"
 
 [tool.poetry.extras]
+postgresql = ["asyncpg"]
+postgres = ["asyncpg"]
+pg = ["asyncpg"]
+asyncpg = ["asyncpg"]
+mysql = ["aiomysql"]
+aiomysql = ["aiomysql"]
 starlette = ["gino-starlette"]
 aiohttp = ["gino-aiohttp"]
 tornado = ["gino-tornado"]
@@ -57,7 +65,7 @@ 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" }
+black = { version = "^20.8b1", python = ">=3.6" }
 mypy = "^0.790"
 
 # docs

pyproject.toml

@@ -166,8 +166,12 @@ async def apply(self, bind=None, timeout=DEFAULT):
             opts["timeout"] = timeout
         clause = (
             type(self._instance)
-            .update.where(self._locator,)
-            .values(**self._instance._get_sa_values(values),)
+            .update.where(
+                self._locator,
+            )
+            .values(
+                **self._instance._get_sa_values(values),
+            )
             .execution_options(**opts)
         )
         await _query_and_update(

src/gino/crud.py

@@ -372,7 +372,9 @@ def _init_table(cls, sub_cls):
                         raise AttributeError(
                             '{} "{}" requires a JSON[B] column "{}" '
                             "which is not found or has a wrong type.".format(
-                                type(v).__name__, v.name, v.prop_name,
+                                type(v).__name__,
+                                v.name,
+                                v.prop_name,
                             )
                         )
         sub_cls.__json_prop_names__ = json_prop_names