Merge remote-tracking branch 'origin/dev' into dev

.github/workflows/test.yml

@@ -28,4 +28,4 @@ jobs:
           POSTGRES_PASS: 123456
           POSTGRES_HOST: 127.0.0.1
           POSTGRES_PORT: 5432
-        run: make testall
+        run: make ci

Makefile

@@ -58,5 +58,4 @@ build: deps
 publish: deps
 	@poetry publish
 
-ci:
-	@act -P ubuntu-latest=nektos/act-environments-ubuntu:18.04 -b
+ci: testall

poetry.lock

@@ -1,5 +1,5 @@
 [[package]]
-category = "dev"
+category = "main"
 description = "MySQL driver for asyncio."
 name = "aiomysql"
 optional = true
@@ -78,7 +78,7 @@ dev = ["coverage", "pytest-runner", "pytest-trio", "pytest (>=3)", "sphinx", "to
 docs = ["sphinx"]
 
 [[package]]
-category = "dev"
+category = "main"
 description = "An asyncio PostgreSQL driver"
 name = "asyncpg"
 optional = true
@@ -134,7 +134,7 @@ typed-ast = ">=1.4.0"
 d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
-category = "dev"
+category = "main"
 description = "Foreign Function Interface for Python calling C code."
 name = "cffi"
 optional = true
@@ -171,7 +171,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 version = "0.4.3"
 
 [[package]]
-category = "dev"
+category = "main"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 name = "cryptography"
 optional = true
@@ -327,7 +327,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 version = "2.6.0"
 
 [[package]]
-category = "dev"
+category = "main"
 description = "C parser in Python"
 name = "pycparser"
 optional = true
@@ -356,7 +356,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 version = "2.2.0"
 
 [[package]]
-category = "dev"
+category = "main"
 description = "Pure Python MySQL Driver"
 name = "pymysql"
 optional = true
@@ -455,7 +455,7 @@ python-versions = "*"
 version = "2020.5.14"
 
 [[package]]
-category = "dev"
+category = "main"
 description = "Python 2 and 3 compatibility utilities"
 name = "six"
 optional = false
@@ -529,10 +529,10 @@ python-versions = "*"
 version = "0.2.2"
 
 [extras]
-dbdrivers = []
+dbdrivers = ["aiomysql", "asyncpg"]
 
 [metadata]
-content-hash = "e7e2bfd5db53c4c6836d7f7d2827cc275671dc0dbf1a9f4d51100005b60a9548"
+content-hash = "6b1f30cb32cf5915f1ee1f6c6b0e52130bc8f7af92f1a9703dc9632ebce2a977"
 python-versions = "^3.8"
 
 [metadata.files]

pyproject.toml

@@ -31,8 +31,6 @@ pytest = "*"
 pytest-xdist = "*"
 mypy = "*"
 pytest-asyncio = "*"
-aiomysql = {version = "*", optional = true}
-asyncpg = {version = "*", optional = true}
 
 [tool.poetry.extras]
 dbdrivers = ["aiomysql", "asyncpg"]