From 223145585a12c944e106b1f87c5345d8007403e9 Mon Sep 17 00:00:00 2001 From: yuji38kwmt Date: Wed, 14 Aug 2024 12:06:18 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E6=83=85=E5=A0=B1=E3=82=92`PEP=20440`=E3=81=AB=E5=BE=93?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E5=BD=A2=E5=BC=8F=E3=81=AB=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82=20(#671)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * format * update lock file --- .github/workflows/publish-to-pypi.yml | 3 +- poetry.lock | 41 +++------------------------ pyproject.toml | 8 ------ 3 files changed, 6 insertions(+), 46 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 1bf95f7c..70415df2 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -17,7 +17,8 @@ jobs: - name: Install poetry run: | python -m pip install "poetry<1.9" - poetry install --only publish + poetry self add "poetry-dynamic-versioning[plugin] < 1.5" + - name: Publish env: PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} diff --git a/poetry.lock b/poetry.lock index 7af28d0f..4380bd5a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -386,20 +386,6 @@ files = [ {file = "docutils-0.21.2.tar.gz", hash = "sha256:3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f"}, ] -[[package]] -name = "dunamai" -version = "1.22.0" -description = "Dynamic version generation" -optional = false -python-versions = ">=3.5" -files = [ - {file = "dunamai-1.22.0-py3-none-any.whl", hash = "sha256:eab3894b31e145bd028a74b13491c57db01986a7510482c9b5fff3b4e53d77b7"}, - {file = "dunamai-1.22.0.tar.gz", hash = "sha256:375a0b21309336f0d8b6bbaea3e038c36f462318c68795166e31f9873fdad676"}, -] - -[package.dependencies] -packaging = ">=20.9" - [[package]] name = "exceptiongroup" version = "1.2.2" @@ -1015,25 +1001,6 @@ files = [ dev = ["pre-commit", "tox"] testing = ["pytest", "pytest-benchmark"] -[[package]] -name = "poetry-dynamic-versioning" -version = "1.4.0" -description = "Plugin for Poetry to enable dynamic versioning based on VCS tags" -optional = false -python-versions = "<4.0,>=3.7" -files = [ - {file = "poetry_dynamic_versioning-1.4.0-py3-none-any.whl", hash = "sha256:d6727d33d1c65850039cd804013a43780e0a3c9a3d693cf557ab87aa3891f148"}, - {file = "poetry_dynamic_versioning-1.4.0.tar.gz", hash = "sha256:725178bd50a22f2dd4035de7f965151e14ecf8f7f19996b9e536f4c5559669a7"}, -] - -[package.dependencies] -dunamai = ">=1.21.0,<2.0.0" -jinja2 = ">=2.11.1,<4" -tomlkit = ">=0.4" - -[package.extras] -plugin = ["poetry (>=1.2.0,<2.0.0)"] - [[package]] name = "prompt-toolkit" version = "3.0.47" @@ -1454,13 +1421,13 @@ files = [ [[package]] name = "tomlkit" -version = "0.13.0" +version = "0.13.1" description = "Style preserving TOML library" optional = false python-versions = ">=3.8" files = [ - {file = "tomlkit-0.13.0-py3-none-any.whl", hash = "sha256:7075d3042d03b80f603482d69bf0c8f345c2b30e41699fd8883227f89972b264"}, - {file = "tomlkit-0.13.0.tar.gz", hash = "sha256:08ad192699734149f5b97b45f1f18dad7eb1b6d16bc72ad0c2335772650d7b72"}, + {file = "tomlkit-0.13.1-py3-none-any.whl", hash = "sha256:fb12e89373b28f3cd6679035324770123d6df04488431e1c7bcecf17820ee2e4"}, + {file = "tomlkit-0.13.1.tar.gz", hash = "sha256:1be06879860054a26faba7acf2af62b45c94aa43b00a5f87fc445c5f930ad754"}, ] [[package]] @@ -1574,4 +1541,4 @@ segmentation = ["numpy", "numpy", "pillow"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "096e63e5432bac956cfbc4375e44468accae3eec9429ed435fb3620249161e06" +content-hash = "71528989e99f91bdaa011eda85f4ca0b67a8828bc95baafffe280c361b384b35" diff --git a/pyproject.toml b/pyproject.toml index e66f4fe9..939b90a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,13 +64,6 @@ optional = true [tool.poetry.group.dev.dependencies] ipython = "*" -[tool.poetry.group.publish] -# PyPIにpublishするのに必要なライブラリ。インストールしなくても開発はできるので、オプショナルにする -optional = true - -[tool.poetry.group.publish.dependencies] -poetry-dynamic-versioning = "*" - [tool.mypy] # スタブが無いパッケージのエラーは無視させる.サードパーティのライブラリに型情報がないケースもあるため @@ -154,7 +147,6 @@ max-args = 10 [tool.poetry-dynamic-versioning] enable = true -format = "{base}" [build-system]