From 44ae56514994aee1f598231622d25abc50dd3fbc Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Sun, 2 Oct 2022 18:24:26 +0300 Subject: [PATCH] Change changelog categories, update dependencies --- .github/workflows/deploy.yml | 17 ++++++++------ CHANGES/{898.misc.rst => 898.bugfix.rst} | 0 CHANGES/{925.docs.rst => 925.doc.rst} | 0 CHANGES/{942.misc.rst => 942.removal.rst} | 0 CHANGES/{985.feature => 985.feature.rst} | 0 CHANGES/{988.feature => 988.feature.rst} | 0 CHANGES/{995.misc.rst => 995.bugfix.rst} | 0 Makefile | 6 +++-- docs/api/upload_file.rst | 4 ++-- docs/conf.py | 2 +- poetry.lock | 28 +++++++++++------------ pyproject.toml | 25 ++++++++++++-------- requirements/base.txt | 2 +- requirements/docs.txt | 4 ++-- 14 files changed, 49 insertions(+), 39 deletions(-) rename CHANGES/{898.misc.rst => 898.bugfix.rst} (100%) rename CHANGES/{925.docs.rst => 925.doc.rst} (100%) rename CHANGES/{942.misc.rst => 942.removal.rst} (100%) rename CHANGES/{985.feature => 985.feature.rst} (100%) rename CHANGES/{988.feature => 988.feature.rst} (100%) rename CHANGES/{995.misc.rst => 995.bugfix.rst} (100%) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f6c0d175..baf46ac3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,15 +12,18 @@ jobs: steps: - uses: actions/checkout@master - - name: Set up Python 3.9 - uses: actions/setup-python@v2 + - name: Set up Python 3.10 + uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.10 + + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.2.1 + virtualenvs-create: false + installer-parallel: true - - name: Install dependencies - run: | - pip install -U pip virtualenv poetry - poetry config virtualenvs.create false - name: Build run: | poetry build diff --git a/CHANGES/898.misc.rst b/CHANGES/898.bugfix.rst similarity index 100% rename from CHANGES/898.misc.rst rename to CHANGES/898.bugfix.rst diff --git a/CHANGES/925.docs.rst b/CHANGES/925.doc.rst similarity index 100% rename from CHANGES/925.docs.rst rename to CHANGES/925.doc.rst diff --git a/CHANGES/942.misc.rst b/CHANGES/942.removal.rst similarity index 100% rename from CHANGES/942.misc.rst rename to CHANGES/942.removal.rst diff --git a/CHANGES/985.feature b/CHANGES/985.feature.rst similarity index 100% rename from CHANGES/985.feature rename to CHANGES/985.feature.rst diff --git a/CHANGES/988.feature b/CHANGES/988.feature.rst similarity index 100% rename from CHANGES/988.feature rename to CHANGES/988.feature.rst diff --git a/CHANGES/995.misc.rst b/CHANGES/995.bugfix.rst similarity index 100% rename from CHANGES/995.misc.rst rename to CHANGES/995.bugfix.rst diff --git a/Makefile b/Makefile index 885e7550..bfbcaa0c 100644 --- a/Makefile +++ b/Makefile @@ -107,10 +107,12 @@ test-coverage-view: locales := en uk_UA locale_targets := $(addprefix docs-serve-, $(locales)) +locales_pot := _build/gettext +docs_dir := docs docs-gettext: - cd docs && make gettext - cd docs && sphinx-intl update -p _build/gettext $(addprefix -l , $(locales)) + cd $(docs_dir) && make gettext + cd $(docs_dir) && sphinx-intl update -p $(locales_pot) $(addprefix -l , $(locales)) .PHONY: docs-gettext docs-serve: diff --git a/docs/api/upload_file.rst b/docs/api/upload_file.rst index 4579700e..f28bdcf4 100644 --- a/docs/api/upload_file.rst +++ b/docs/api/upload_file.rst @@ -45,7 +45,7 @@ Then you can use it: .. autoclass:: aiogram.types.input_file.FSInputFile - :members: + :members: __init__ Upload from buffer @@ -68,7 +68,7 @@ And then you can use it: text_file = BufferedInputFile(b"Hello, world!", filename="file.txt") .. autoclass:: aiogram.types.input_file.BufferedInputFile - :members: + :members: __init__ Upload from url =============== diff --git a/docs/conf.py b/docs/conf.py index 3b0e1c91..42bf33ec 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -63,4 +63,4 @@ texinfo_documents = [ ), ] -add_module_names = False +# add_module_names = False diff --git a/poetry.lock b/poetry.lock index 45b03e5a..08c13db3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -325,7 +325,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "importlib-metadata" -version = "4.13.0" +version = "5.0.0" description = "Read metadata from Python packages" category = "dev" optional = false @@ -675,7 +675,7 @@ testing = ["coverage (>=6.2)", "flaky (>=3.5.0)", "hypothesis (>=5.7.1)", "mypy [[package]] name = "pytest-cov" -version = "3.0.0" +version = "4.0.0" description = "Pytest plugin for measuring coverage." category = "dev" optional = false @@ -738,11 +738,11 @@ dev = ["pre-commit", "pytest-asyncio", "tox"] [[package]] name = "pytest-mypy" -version = "0.9.1" +version = "0.10.0" description = "Mypy static type checker plugin for Pytest" category = "dev" optional = false -python-versions = ">=3.5" +python-versions = ">=3.6" [package.dependencies] attrs = ">=19.0" @@ -775,7 +775,7 @@ trio = ["trio (>=0.16.0)"] [[package]] name = "pytz" -version = "2022.2.1" +version = "2022.4" description = "World timezone definitions, modern and historical" category = "main" optional = false @@ -1190,7 +1190,7 @@ redis = ["redis"] [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "e4eccd56f1032cf61cfa0ae73b89a1f70c4937ee872cfbb2090dfbff92409e46" +content-hash = "ee5c55fdf1dfa75f942e6a26c5a7d6111a2c8eb313ac9850097fb2b951e5aa64" [metadata.files] aiofiles = [ @@ -1520,8 +1520,8 @@ imagesize = [ {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.13.0-py3-none-any.whl", hash = "sha256:8a8a81bcf996e74fee46f0d16bd3eaa382a7eb20fd82445c3ad11f4090334116"}, - {file = "importlib_metadata-4.13.0.tar.gz", hash = "sha256:dd0173e8f150d6815e098fd354f6414b0f079af4644ddfe90c71e2fc6174346d"}, + {file = "importlib_metadata-5.0.0-py3-none-any.whl", hash = "sha256:ddb0e35065e8938f867ed4928d0ae5bf2a53b7773871bfe6bcc7e4fcdc7dea43"}, + {file = "importlib_metadata-5.0.0.tar.gz", hash = "sha256:da31db32b304314d044d3c12c79bd59e307889b287ad12ff387b3500835fc2ab"}, ] incremental = [ {file = "incremental-21.3.0-py2.py3-none-any.whl", hash = "sha256:92014aebc6a20b78a8084cdd5645eeaa7f74b8933f70fa3ada2cfbd1e3b54321"}, @@ -1789,8 +1789,8 @@ pytest-asyncio = [ {file = "pytest_asyncio-0.19.0-py3-none-any.whl", hash = "sha256:7a97e37cfe1ed296e2e84941384bdd37c376453912d397ed39293e0916f521fa"}, ] pytest-cov = [ - {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"}, - {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"}, + {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"}, + {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"}, ] pytest-html = [ {file = "pytest-html-3.1.1.tar.gz", hash = "sha256:3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3"}, @@ -1809,16 +1809,16 @@ pytest-mock = [ {file = "pytest_mock-3.9.0-py3-none-any.whl", hash = "sha256:1a1b9264224d026932d6685a0f9cef3b61d91563c3e74af9fe5afb2767e13812"}, ] pytest-mypy = [ - {file = "pytest-mypy-0.9.1.tar.gz", hash = "sha256:9ffa3bf405c12c5c6be9e92e22bebb6ab2c91b9c32f45b0f0c93af473269ab5c"}, - {file = "pytest_mypy-0.9.1-py3-none-any.whl", hash = "sha256:a2505fcf61f1c0c51f950d4623ea8ca2daf6fb2101a5603554bad2e130202083"}, + {file = "pytest-mypy-0.10.0.tar.gz", hash = "sha256:e74d632685f15a39c31c551a9d8cec4619e24bd396245a6335c5db0ec6d17b6f"}, + {file = "pytest_mypy-0.10.0-py3-none-any.whl", hash = "sha256:83843dce75a7ce055efb264ff40dad2ecf7abd4e7bd5e5eda015261d11616abb"}, ] python-socks = [ {file = "python-socks-2.0.3.tar.gz", hash = "sha256:e3a9ca8e554733862ce4d8ce1d10efb480fd3a3acdafd03393943ec00c98ba8a"}, {file = "python_socks-2.0.3-py3-none-any.whl", hash = "sha256:950723f27d2cf401e193a9e0a0d45baab848341298f5b397d27fda0c4635e9a9"}, ] pytz = [ - {file = "pytz-2022.2.1-py2.py3-none-any.whl", hash = "sha256:220f481bdafa09c3955dfbdddb7b57780e9a94f5127e35456a48589b9e0c0197"}, - {file = "pytz-2022.2.1.tar.gz", hash = "sha256:cea221417204f2d1a2aa03ddae3e867921971d0d76f14d87abb4414415bbdcf5"}, + {file = "pytz-2022.4-py2.py3-none-any.whl", hash = "sha256:2c0784747071402c6e99f0bafdb7da0fa22645f06554c7ae06bf6358897e9c91"}, + {file = "pytz-2022.4.tar.gz", hash = "sha256:48ce799d83b6f8aab2020e369b627446696619e79645419610b9facd909b3174"}, ] PyYAML = [ {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, diff --git a/pyproject.toml b/pyproject.toml index 9aa27a6b..9c016d66 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,12 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", +# "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Software Development :: Libraries :: Application Frameworks", + "Topic :: Software Development :: Libraries :: Python Modules", + "Topic :: Communications :: Chat", + ] packages = [ { include = "aiogram" } @@ -56,35 +61,35 @@ redis = { version = "^4.3.4", optional = true } [tool.poetry.group.docs.dependencies] -Sphinx = "^5.2.2" +Sphinx = "^5.2.3" sphinx-intl = "^2.0.1" sphinx-autobuild = "^2021.3.14" sphinx-copybutton = "^0.5.0" -furo = "^2022.6.21" +furo = "^2022.9.29" sphinx-prompt = "^1.5.0" Sphinx-Substitution-Extensions = "^2022.2.16" towncrier = "^22.8.0" pygments = "^2.4" -pymdown-extensions = "^9.5" +pymdown-extensions = "^9.6" markdown-include = "^0.7.0" -Pygments = "^2.12.0" +Pygments = "^2.13.0" [tool.poetry.group.test.dependencies] -pytest = "^7.1.2" +pytest = "^7.1.3" pytest-html = "^3.1.1" pytest-asyncio = "^0.19.0" pytest-lazy-fixture = "^0.6.3" -pytest-mock = "^3.8.2" -pytest-mypy = "^0.9.1" -pytest-cov = "^3.0.0" +pytest-mock = "^3.9.0" +pytest-mypy = "^0.10.0" +pytest-cov = "^4.0.0" pytest-aiohttp = "^1.0.4" aresponses = "^2.1.6" asynctest = "^0.13.0" [tool.poetry.group.dev.dependencies] -black = "^22.6.0" +black = "^22.8.0" isort = "^5.10.1" flake8 = "^5.0.4" mypy = "^0.981" @@ -168,5 +173,5 @@ name = "Misc" showcontent = true [build-system] -requires = ["poetry-core>=1.0.0"] +requires = ["poetry-core"] build-backend = "poetry.core.masonry.api" diff --git a/requirements/base.txt b/requirements/base.txt index d2a78c1f..2268fdfb 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,6 +10,6 @@ idna==3.4 ; python_version >= "3.8" and python_version < "4.0" magic-filter==1.0.9 ; python_version >= "3.8" and python_version < "4.0" multidict==6.0.2 ; python_version >= "3.8" and python_version < "4.0" pydantic==1.10.2 ; python_version >= "3.8" and python_version < "4.0" -pytz==2022.2.1 ; python_version >= "3.8" and python_version < "4.0" +pytz==2022.4 ; python_version >= "3.8" and python_version < "4.0" typing-extensions==4.3.0 ; python_version >= "3.8" and python_version < "4.0" yarl==1.8.1 ; python_version >= "3.8" and python_version < "4.0" diff --git a/requirements/docs.txt b/requirements/docs.txt index d50395c8..23374012 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -18,7 +18,7 @@ frozenlist==1.3.1 ; python_version >= "3.8" and python_version < "4.0" furo==2022.9.29 ; python_version >= "3.8" and python_version < "4.0" idna==3.4 ; python_version >= "3.8" and python_version < "4.0" imagesize==1.4.1 ; python_version >= "3.8" and python_version < "4.0" -importlib-metadata==4.13.0 ; python_version >= "3.8" and python_version < "3.10" +importlib-metadata==5.0.0 ; python_version >= "3.8" and python_version < "3.10" incremental==21.3.0 ; python_version >= "3.8" and python_version < "4.0" jinja2==3.1.2 ; python_version >= "3.8" and python_version < "4.0" livereload==2.6.3 ; python_version >= "3.8" and python_version < "4.0" @@ -33,7 +33,7 @@ pygments==2.13.0 ; python_version >= "3.8" and python_version < "4.0" pymdown-extensions==9.6 ; python_version >= "3.8" and python_version < "4.0" pyparsing==3.0.9 ; python_version >= "3.8" and python_version < "4.0" python-socks[asyncio]==2.0.3 ; python_version >= "3.8" and python_version < "4.0" -pytz==2022.2.1 ; python_version >= "3.8" and python_version < "4.0" +pytz==2022.4 ; python_version >= "3.8" and python_version < "4.0" redis==4.3.4 ; python_version >= "3.8" and python_version < "4.0" requests==2.28.1 ; python_version >= "3.8" and python_version < "4" setuptools==65.4.1 ; python_version >= "3.8" and python_version < "4.0"