From b097680f3c95e99ac1e8070852ed2f5e131b9c56 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Wed, 6 May 2020 01:42:40 +0300 Subject: [PATCH] Fix package --- aiogram/__init__.py | 3 +-- build.py | 18 ------------------ poetry.lock | 25 ++++++++++--------------- pyproject.toml | 3 +-- 4 files changed, 12 insertions(+), 37 deletions(-) delete mode 100644 build.py diff --git a/aiogram/__init__.py b/aiogram/__init__.py index 3eacb117..2b93781a 100644 --- a/aiogram/__init__.py +++ b/aiogram/__init__.py @@ -1,4 +1,3 @@ -from ._meta import VERSION from .api import methods, types from .api.client import session from .api.client.bot import Bot @@ -29,5 +28,5 @@ __all__ = ( "handler", ) -__version__ = VERSION +__version__ = '3.0.0a4' __api_version__ = "4.8" diff --git a/build.py b/build.py deleted file mode 100644 index 376523a6..00000000 --- a/build.py +++ /dev/null @@ -1,18 +0,0 @@ -from pathlib import Path -from typing import Any, Dict - -BUILD_PATH: Path = Path(__file__).parent -META_PATH: Path = BUILD_PATH / "aiogram" / "_meta.py" - - -def write_metadata(setup_kwargs: Dict[str, Any]) -> None: - version = setup_kwargs["version"] - description = setup_kwargs["description"] - - content = [f"VERSION = {version!r}", f"DESCRIPTION = {description!r}"] - - META_PATH.write_text("\n".join(content + [""])) - - -def build(setup_kwargs: Dict[str, Any]): - write_metadata(setup_kwargs) diff --git a/poetry.lock b/poetry.lock index 0a5da5a0..ca646b19 100644 --- a/poetry.lock +++ b/poetry.lock @@ -767,8 +767,8 @@ category = "dev" description = "pytest plugin for test session metadata" name = "pytest-metadata" optional = false -python-versions = "*" -version = "1.8.0" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +version = "1.9.0" [package.dependencies] pytest = ">=2.9.0" @@ -862,7 +862,7 @@ description = "Fast, Extensible Progress Meter" name = "tqdm" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*" -version = "4.45.0" +version = "4.46.0" [package.extras] dev = ["py-make (>=0.1.0)", "twine", "argopt", "pydoc-markdown"] @@ -892,7 +892,7 @@ python-versions = "*" version = "1.4.1" [[package]] -category = "dev" +category = "main" description = "Backported and Experimental Type Hints for Python 3.5+" name = "typing-extensions" optional = false @@ -931,7 +931,7 @@ multidict = ">=4.0" [[package]] category = "dev" description = "Backport of pathlib-compatible object wrapper for zip files" -marker = "python_version >= \"3.5\" and python_version < \"3.8\" or python_version < \"3.8\"" +marker = "python_version >= \"3.5\" and python_version < \"3.8\" or python_version < \"3.8\" or python_version >= \"3.5\" and python_version < \"3.8\" and (python_version >= \"3.5\" and python_version < \"3.8\" or python_version < \"3.8\")" name = "zipp" optional = false python-versions = ">=3.6" @@ -946,7 +946,7 @@ fast = ["uvloop"] proxy = ["aiohttp-socks"] [metadata] -content-hash = "8c2dc4c18c8de6ffe48c634e96e9a057d4a2ef211d21459fa4c8e23b87dd8456" +content-hash = "cd83723d922c4c0a645ef6f9f78447f83f2c1a933be928f8174ef897970acb2a" python-versions = "^3.7" [metadata.files] @@ -1183,11 +1183,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 = [ @@ -1343,8 +1338,8 @@ pytest-html = [ {file = "pytest_html-2.1.1-py2.py3-none-any.whl", hash = "sha256:9e4817e8be8ddde62e8653c8934d0f296b605da3d2277a052f762c56a8b32df2"}, ] pytest-metadata = [ - {file = "pytest-metadata-1.8.0.tar.gz", hash = "sha256:2071a59285de40d7541fde1eb9f1ddea1c9db165882df82781367471238b66ba"}, - {file = "pytest_metadata-1.8.0-py2.py3-none-any.whl", hash = "sha256:c29a1fb470424926c63154c1b632c02585f2ba4282932058a71d35295ff8c96d"}, + {file = "pytest-metadata-1.9.0.tar.gz", hash = "sha256:168d203abba8cabb65cf1b5fa675b0ba60dccbf1825d147960876a7e6f7c219c"}, + {file = "pytest_metadata-1.9.0-py2.py3-none-any.whl", hash = "sha256:91d09c0e367e93c63c98461e9960833f465bff53d00ed2f8ccf680205e5053a4"}, ] pytest-mock = [ {file = "pytest-mock-2.0.0.tar.gz", hash = "sha256:b35eb281e93aafed138db25c8772b95d3756108b601947f89af503f8c629413f"}, @@ -1415,8 +1410,8 @@ tornado = [ {file = "tornado-6.0.4.tar.gz", hash = "sha256:0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc"}, ] tqdm = [ - {file = "tqdm-4.45.0-py2.py3-none-any.whl", hash = "sha256:ea9e3fd6bd9a37e8783d75bfc4c1faf3c6813da6bd1c3e776488b41ec683af94"}, - {file = "tqdm-4.45.0.tar.gz", hash = "sha256:00339634a22c10a7a22476ee946bbde2dbe48d042ded784e4d88e0236eca5d81"}, + {file = "tqdm-4.46.0-py2.py3-none-any.whl", hash = "sha256:acdafb20f51637ca3954150d0405ff1a7edde0ff19e38fb99a80a66210d2a28f"}, + {file = "tqdm-4.46.0.tar.gz", hash = "sha256:4733c4a10d0f2a4d098d801464bdaf5240c7dadd2a7fde4ee93b0a0efd9fb25e"}, ] traitlets = [ {file = "traitlets-4.3.3-py2.py3-none-any.whl", hash = "sha256:70b4c6a1d9019d7b4f6846832288f86998aa3b9207c6821f3578a6a6a467fe44"}, diff --git a/pyproject.toml b/pyproject.toml index a732f01a..5e1812bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,8 +30,6 @@ classifiers = [ "Framework :: AsyncIO", "Typing :: Typed", ] -build = "build.py" -include = ["aiogram/_meta.py"] [tool.poetry.dependencies] python = "^3.7" @@ -42,6 +40,7 @@ aiofiles = "^0.4.0" uvloop = {version = "^0.14.0", markers = "sys_platform == 'darwin' or sys_platform == 'linux'", optional = true} async_lru = "^1.0" aiohttp-socks = {version = "^0.3.8", optional = true} +typing-extensions = "^3.7.4" [tool.poetry.dev-dependencies] uvloop = {version = "^0.14.0", markers = "sys_platform == 'darwin' or sys_platform == 'linux'"}