From 0021487167bf3567d90074dd36bd1634b770f889 Mon Sep 17 00:00:00 2001 From: long2ice Date: Thu, 2 Jul 2020 00:11:08 +0800 Subject: [PATCH] Make `uvloop` dependency optional. --- CHANGELOG.rst | 1 + fastapi_admin/__init__.py | 9 ++++----- poetry.lock | 41 ++++++--------------------------------- pyproject.toml | 11 ++++++----- 4 files changed, 17 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5108917..6506d96 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,7 @@ ChangeLog ----- - Add password auto hash. - `Field` description as help text for form. +- Make `uvloop` dependency optional. 0.2.7 ----- diff --git a/fastapi_admin/__init__.py b/fastapi_admin/__init__.py index 3aaac8a..b2207f3 100644 --- a/fastapi_admin/__init__.py +++ b/fastapi_admin/__init__.py @@ -1,9 +1,8 @@ -import re - from . import routes def version(): - with open("pyproject.toml") as f: - ret = re.findall('version = "(\d+\.\d+\.\d+)"', f.read()) - return ret[0] + # with open("pyproject.toml") as f: + # ret = re.findall(r'version = "(\d+\.\d+\.\d+)"', f.read()) + # return ret[0] + return "0.2.8" diff --git a/poetry.lock b/poetry.lock index 43a2c64..471805e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -36,14 +36,6 @@ optional = false python-versions = "*" version = "1.4.4" -[[package]] -category = "dev" -description = "Enhance the standard unittest package with features for testing asyncio libraries" -name = "asynctest" -optional = false -python-versions = ">=3.5" -version = "0.13.0" - [[package]] category = "dev" description = "Atomic file writes." @@ -437,7 +429,7 @@ description = "A SQL query builder API for Python" name = "pypika" optional = false python-versions = "*" -version = "0.37.13" +version = "0.37.15" [[package]] category = "dev" @@ -539,17 +531,6 @@ version = "0.13.4" [package.extras] full = ["aiofiles", "graphene", "itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "ujson"] -[[package]] -category = "dev" -description = "tasks runner for python projects" -name = "taskipy" -optional = false -python-versions = ">=3.6,<4.0" -version = "1.2.1" - -[package.dependencies] -toml = ">=0.10.0,<0.11.0" - [[package]] category = "dev" description = "Python Library for Tom's Obvious, Minimal Language" @@ -654,8 +635,11 @@ version = "3.1.0" docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["jaraco.itertools", "func-timeout"] +[extras] +uvloop = ["uvloop"] + [metadata] -content-hash = "e0dc79bd1d74584e026ef28c1e1c4e26835281cb70034edcc6aa3c50c515591a" +content-hash = "883220f33d114dd17912e15b114be9dcba0f18c3c4bcd093c8e2b11b95030b11" python-versions = "^3.7" [metadata.files] @@ -675,10 +659,6 @@ appdirs = [ {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"}, {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, ] -asynctest = [ - {file = "asynctest-0.13.0-py3-none-any.whl", hash = "sha256:5da6118a7e6d6b54d83a8f7197769d046922a44d2a99c21382f0a6e4fadae676"}, - {file = "asynctest-0.13.0.tar.gz", hash = "sha256:c27862842d15d83e6a34eb0b2866c323880eb3a75e4485b079ea11748fd77fac"}, -] atomicwrites = [ {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, @@ -845,11 +825,6 @@ markupsafe = [ {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"}, {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, ] mccabe = [ @@ -928,7 +903,7 @@ pyparsing = [ {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, ] pypika = [ - {file = "PyPika-0.37.13.tar.gz", hash = "sha256:d10ffa51cba8e08660fd444ef2c0c9bff66189d27b21a42a93e43bf113a49408"}, + {file = "PyPika-0.37.15.tar.gz", hash = "sha256:f00c217330d91bbb5bc26c4cb54a8016b899fb8d5a8f7cb25b30861260fa4239"}, ] pytest = [ {file = "pytest-5.4.3-py3-none-any.whl", hash = "sha256:5c0db86b698e8f170ba4582a492248919255fcd4c79b1ee64ace34301fb589a1"}, @@ -1008,10 +983,6 @@ starlette = [ {file = "starlette-0.13.4-py3-none-any.whl", hash = "sha256:0fb4b38d22945b46acb880fedee7ee143fd6c0542992501be8c45c0ed737dd1a"}, {file = "starlette-0.13.4.tar.gz", hash = "sha256:04fe51d86fd9a594d9b71356ed322ccde5c9b448fc716ac74155e5821a922f8d"}, ] -taskipy = [ - {file = "taskipy-1.2.1-py3-none-any.whl", hash = "sha256:99bdaf5b19791c2345806847147e0fc2d28e1ac9446058def5a8b6b3fc9f23e2"}, - {file = "taskipy-1.2.1.tar.gz", hash = "sha256:5eb2c3b1606c896c7fa799848e71e8883b880759224958d07ba760e5db263175"}, -] toml = [ {file = "toml-0.10.1-py2.py3-none-any.whl", hash = "sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88"}, {file = "toml-0.10.1.tar.gz", hash = "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"}, diff --git a/pyproject.toml b/pyproject.toml index 000fd12..d8ba262 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "fastapi-admin" -version = "0.2.7" +version = "0.2.8" description = "Fast Admin Dashboard based on fastapi and tortoise-orm and rest-admin." authors = ["long2ice "] license = "Apache-2.0" @@ -19,7 +19,7 @@ python = "^3.7" tortoise-orm = "*" aiomysql = "*" python-dotenv = "*" -uvloop = "*" +uvloop = {version = "*", optional = true} uvicorn = "*" python-rapidjson = "*" fastapi = "*" @@ -33,8 +33,6 @@ prompt_toolkit = "*" jinja2 = "*" [tool.poetry.dev-dependencies] -taskipy = "*" -asynctest = "*" flake8 = "*" isort = "*" black = "^19.10b0" @@ -46,4 +44,7 @@ requires = ["poetry>=0.12"] build-backend = "poetry.masonry.api" [tool.poetry.scripts] -fastapi-admin = "fastapi_admin.cli:main" \ No newline at end of file +fastapi-admin = "fastapi_admin.cli:main" + +[tool.poetry.extras] +uvloop = ["uvloop"] \ No newline at end of file