diff --git a/poetry.lock b/poetry.lock index 2055717..9cf7834 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,20 +1,3 @@ -[[package]] -name = "aerich" -version = "0.4.4" -description = "A database migrations tool for Tortoise ORM." -category = "main" -optional = false -python-versions = ">=3.7,<4.0" - -[package.dependencies] -click = "*" -ddlparse = "*" -pydantic = "*" -tortoise-orm = "*" - -[package.extras] -dbdrivers = ["aiomysql", "asyncpg"] - [[package]] name = "aiomysql" version = "0.0.21" @@ -31,7 +14,7 @@ sa = ["sqlalchemy (>=1.0)"] [[package]] name = "aiosqlite" -version = "0.17.0" +version = "0.16.1" description = "asyncio bridge to the standard sqlite3 module" category = "main" optional = false @@ -148,17 +131,6 @@ category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -[[package]] -name = "ddlparse" -version = "1.9.0" -description = "DDL parase and Convert to BigQuery JSON schema" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -pyparsing = "*" - [[package]] name = "fastapi" version = "0.63.0" @@ -591,17 +563,24 @@ rsa = ["cryptography"] name = "pyparsing" version = "2.4.7" description = "Python parsing module" -category = "main" +category = "dev" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] -name = "pypika" -version = "0.48.0" +name = "PyPika" +version = "0.47.6" description = "A SQL query builder API for Python" category = "main" optional = false python-versions = "*" +develop = false + +[package.source] +type = "git" +url = "https://github.com/long2ice/pypika.git" +reference = "master" +resolved_reference = "b2e513e5e4d2af440d3099edf4bde58364195866" [[package]] name = "pytest" @@ -644,6 +623,14 @@ category = "main" optional = false python-versions = ">=3.6" +[[package]] +name = "pytz" +version = "2020.5" +description = "World timezone definitions, modern and historical" +category = "main" +optional = false +python-versions = "*" + [[package]] name = "pyyaml" version = "5.4.1" @@ -717,21 +704,31 @@ python-versions = ">= 3.5" [[package]] name = "tortoise-orm" -version = "0.16.17" +version = "0.17.0" description = "Easy async ORM for python, built with relations in mind" category = "main" optional = false -python-versions = "*" +python-versions = "^3.7" +develop = false [package.dependencies] -aerich = ">=0.3.2" -aiosqlite = ">=0.11.0" -iso8601 = ">=0.1.12" -pypika = ">=0.39.0" -typing-extensions = ">=3.7" +aiosqlite = "^0.16.0" +iso8601 = "^0.1.13" +pypika = "branch master" +pytz = "^2020.4" [package.extras] -accel = ["python-rapidjson", "ciso8601 (>=2.1.2)", "uvloop (>=0.12.0)"] +accel = ["ciso8601 (>=2.1.2,<3.0.0)", "uvloop (>=0.14.0,<0.15.0)", "python-rapidjson"] +asyncpg = ["asyncpg"] +aiomysql = ["aiomysql"] +asyncmy = ["asyncmy"] +docs = ["sphinx", "cloud-sptheme", "pygments", "docutils"] + +[package.source] +type = "git" +url = "https://github.com/tortoise/tortoise-orm" +reference = "develop" +resolved_reference = "2056b768ca0a1ff5e99fdb6cfbc36096aa0ec7c0" [[package]] name = "tqdm" @@ -848,20 +845,16 @@ uvloop = ["uvloop"] [metadata] lock-version = "1.1" python-versions = "^3.7" -content-hash = "ad15c59e8ef6821f3c7a5185cd85fe49da2be8b83c76729ac44bbf1c536e8424" +content-hash = "71724ed32465460758a19c8f8813693edeefe9ffac72d8e694b56b5984165ff8" [metadata.files] -aerich = [ - {file = "aerich-0.4.4-py3-none-any.whl", hash = "sha256:259b8a3b9bc21839e7ef6466d5000309b1e0a86d9569cd7bcf481aa50426d429"}, - {file = "aerich-0.4.4.tar.gz", hash = "sha256:4a2e6452ba4a44b4877f62dd8acd978f319cd21834480cefe6710bf3150a5cda"}, -] aiomysql = [ {file = "aiomysql-0.0.21-py3-none-any.whl", hash = "sha256:a81a97da3dd732635926a8ea6adbbf2d1345799680bf61b5f89e730bcec88cc5"}, {file = "aiomysql-0.0.21.tar.gz", hash = "sha256:811569c0db118dd2685f0878f5cebf17a11e89a995fa14261d5fa0254113842c"}, ] aiosqlite = [ - {file = "aiosqlite-0.17.0-py3-none-any.whl", hash = "sha256:6c49dc6d3405929b1d08eeccc72306d3677503cc5e5e43771efc1e00232e8231"}, - {file = "aiosqlite-0.17.0.tar.gz", hash = "sha256:f0e6acc24bc4864149267ac82fb46dfb3be4455f99fe21df82609cc6e6baee51"}, + {file = "aiosqlite-0.16.1-py3-none-any.whl", hash = "sha256:1df802815bb1e08a26c06d5ea9df589bcb8eec56e5f3378103b0f9b223c6703c"}, + {file = "aiosqlite-0.16.1.tar.gz", hash = "sha256:2e915463164efa65b60fd1901aceca829b6090082f03082618afca6fb9c8fdf7"}, ] appdirs = [ {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"}, @@ -939,10 +932,6 @@ colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] -ddlparse = [ - {file = "ddlparse-1.9.0-py3-none-any.whl", hash = "sha256:a7962615a9325be7d0f182cbe34011e6283996473fb98c784c6f675b9783bc18"}, - {file = "ddlparse-1.9.0.tar.gz", hash = "sha256:cdffcf2f692f304a23c8e903b00afd7e83a920b79a2ff4e2f25c875b369d4f58"}, -] fastapi = [ {file = "fastapi-0.63.0-py3-none-any.whl", hash = "sha256:98d8ea9591d8512fdadf255d2a8fa56515cdd8624dca4af369da73727409508e"}, {file = "fastapi-0.63.0.tar.gz", hash = "sha256:63c4592f5ef3edf30afa9a44fa7c6b7ccb20e0d3f68cd9eba07b44d552058dcb"}, @@ -1172,9 +1161,7 @@ pyparsing = [ {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, ] -pypika = [ - {file = "PyPika-0.48.0.tar.gz", hash = "sha256:8bdf5265076628c10e1ea2d0306d68f0559e27c5d3253b696778d191057ef7b0"}, -] +PyPika = [] pytest = [ {file = "pytest-6.2.2-py3-none-any.whl", hash = "sha256:b574b57423e818210672e07ca1fa90aaf194a4f63f3ab909a2c67ebb22913839"}, {file = "pytest-6.2.2.tar.gz", hash = "sha256:9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9"}, @@ -1214,6 +1201,10 @@ python-rapidjson = [ {file = "python_rapidjson-1.0-cp39-cp39-win32.whl", hash = "sha256:c446153975c5d9467fcdb8ea8545a7d2a991e0693fa84e38865eec821cc66584"}, {file = "python_rapidjson-1.0-cp39-cp39-win_amd64.whl", hash = "sha256:00b7679ed075e4353beb2a728743d24096942faa008065ea4fd242dc91dc496b"}, ] +pytz = [ + {file = "pytz-2020.5-py2.py3-none-any.whl", hash = "sha256:16962c5fb8db4a8f63a26646d8886e9d769b6c511543557bc84e9569fb9a9cb4"}, + {file = "pytz-2020.5.tar.gz", hash = "sha256:180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5"}, +] pyyaml = [ {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, @@ -1343,9 +1334,7 @@ tornado = [ {file = "tornado-6.1-cp39-cp39-win_amd64.whl", hash = "sha256:548430be2740e327b3fe0201abe471f314741efcb0067ec4f2d7dcfb4825f3e4"}, {file = "tornado-6.1.tar.gz", hash = "sha256:33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791"}, ] -tortoise-orm = [ - {file = "tortoise-orm-0.16.17.tar.gz", hash = "sha256:bcb978d302ba1d71ee2089352ca07b3ed73fd55936b5d580e29ffed5a0784c03"}, -] +tortoise-orm = [] tqdm = [ {file = "tqdm-4.59.0-py2.py3-none-any.whl", hash = "sha256:9fdf349068d047d4cfbe24862c425883af1db29bcddf4b0eeb2524f6fbdb23c7"}, {file = "tqdm-4.59.0.tar.gz", hash = "sha256:d666ae29164da3e517fcf125e41d4fe96e5bb375cd87ff9763f6b38b5592fe33"}, diff --git a/pyproject.toml b/pyproject.toml index 9b0d29b..7d2624f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ include = ["LICENSE", "README.md", "CHANGELOG.md"] [tool.poetry.dependencies] python = "^3.7" -tortoise-orm = "*" +tortoise-orm = { git = "https://github.com/tortoise/tortoise-orm", branch = "develop" } aiomysql = "*" python-dotenv = "*" uvloop = { version = "*", optional = true }