This is an automated email from the ASF dual-hosted git repository.
tn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-atr-experiments.git
The following commit(s) were added to refs/heads/main by this push:
new 513a299 cleanup dependency groups for poetry, update lock files,
reomve build args from build script as they are not necessary anymore
513a299 is described below
commit 513a299f3ca80dfea10d92f1fe93332ded293e25
Author: Thomas Neidhart <[email protected]>
AuthorDate: Tue Mar 4 20:34:07 2025 +0100
cleanup dependency groups for poetry, update lock files, reomve build args
from build script as they are not necessary anymore
---
poetry.lock | 42 +++++++++++++++++++++---------------------
pyproject.toml | 1 -
scripts/build | 11 +----------
uv.lock | 4 ++--
4 files changed, 24 insertions(+), 34 deletions(-)
diff --git a/poetry.lock b/poetry.lock
index 0ceb278..cdb0165 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.0.1 and should not be
changed by hand.
+# This file is automatically @generated by Poetry 2.1.1 and should not be
changed by hand.
[[package]]
name = "aiofiles"
@@ -125,7 +125,7 @@ propcache = ">=0.2.0"
yarl = ">=1.17.0,<2.0"
[package.extras]
-speedups = ["Brotli", "aiodns (>=3.2.0)", "brotlicffi"]
+speedups = ["Brotli ; platform_python_implementation == \"CPython\"", "aiodns
(>=3.2.0) ; sys_platform == \"linux\" or sys_platform == \"darwin\"",
"brotlicffi ; platform_python_implementation != \"CPython\""]
[[package]]
name = "aiosignal"
@@ -179,7 +179,7 @@ SQLAlchemy = ">=1.3.0"
typing-extensions = ">=4"
[package.extras]
-tz = ["backports.zoneinfo", "tzdata"]
+tz = ["backports.zoneinfo ; python_version < \"3.9\"", "tzdata"]
[[package]]
name = "annotated-types"
@@ -211,7 +211,7 @@ sniffio = ">=1.1"
[package.extras]
doc = ["Sphinx (>=7.4,<8.0)", "packaging", "sphinx-autodoc-typehints
(>=1.2.0)", "sphinx_rtd_theme"]
-test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)",
"hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "trustme",
"truststore (>=0.9.1)", "uvloop (>=0.21)"]
+test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)",
"hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "trustme",
"truststore (>=0.9.1) ; python_version >= \"3.10\"", "uvloop (>=0.21) ;
platform_python_implementation == \"CPython\" and platform_system !=
\"Windows\" and python_version < \"3.14\""]
trio = ["trio (>=0.26.1)"]
[[package]]
@@ -284,12 +284,12 @@ files = [
]
[package.extras]
-benchmark = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler",
"pytest (>=4.3.0)", "pytest-codspeed", "pytest-mypy-plugins",
"pytest-xdist[psutil]"]
-cov = ["cloudpickle", "coverage[toml] (>=5.3)", "hypothesis", "mypy
(>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins",
"pytest-xdist[psutil]"]
-dev = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pre-commit-uv",
"pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
+benchmark = ["cloudpickle ; platform_python_implementation == \"CPython\"",
"hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\"
and python_version >= \"3.10\"", "pympler", "pytest (>=4.3.0)",
"pytest-codspeed", "pytest-mypy-plugins ; platform_python_implementation ==
\"CPython\" and python_version >= \"3.10\"", "pytest-xdist[psutil]"]
+cov = ["cloudpickle ; platform_python_implementation == \"CPython\"",
"coverage[toml] (>=5.3)", "hypothesis", "mypy (>=1.11.1) ;
platform_python_implementation == \"CPython\" and python_version >= \"3.10\"",
"pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins ;
platform_python_implementation == \"CPython\" and python_version >= \"3.10\"",
"pytest-xdist[psutil]"]
+dev = ["cloudpickle ; platform_python_implementation == \"CPython\"",
"hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\"
and python_version >= \"3.10\"", "pre-commit-uv", "pympler", "pytest
(>=4.3.0)", "pytest-mypy-plugins ; platform_python_implementation ==
\"CPython\" and python_version >= \"3.10\"", "pytest-xdist[psutil]"]
docs = ["cogapp", "furo", "myst-parser", "sphinx", "sphinx-notfound-page",
"sphinxcontrib-towncrier", "towncrier (<24.7)"]
-tests = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest
(>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
-tests-mypy = ["mypy (>=1.11.1)", "pytest-mypy-plugins"]
+tests = ["cloudpickle ; platform_python_implementation == \"CPython\"",
"hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\"
and python_version >= \"3.10\"", "pympler", "pytest (>=4.3.0)",
"pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and
python_version >= \"3.10\"", "pytest-xdist[psutil]"]
+tests-mypy = ["mypy (>=1.11.1) ; platform_python_implementation == \"CPython\"
and python_version >= \"3.10\"", "pytest-mypy-plugins ;
platform_python_implementation == \"CPython\" and python_version >= \"3.10\""]
[[package]]
name = "blinker"
@@ -602,10 +602,10 @@ files = [
cffi = {version = ">=1.12", markers = "platform_python_implementation !=
\"PyPy\""}
[package.extras]
-docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=3.0.0)"]
+docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=3.0.0) ; python_version >=
\"3.8\""]
docstest = ["pyenchant (>=3)", "readme-renderer (>=30.0)",
"sphinxcontrib-spelling (>=7.3.1)"]
-nox = ["nox (>=2024.4.15)", "nox[uv] (>=2024.3.2)"]
-pep8test = ["check-sdist", "click (>=8.0.1)", "mypy (>=1.4)", "ruff (>=0.3.6)"]
+nox = ["nox (>=2024.4.15)", "nox[uv] (>=2024.3.2) ; python_version >= \"3.8\""]
+pep8test = ["check-sdist ; python_version >= \"3.8\"", "click (>=8.0.1)",
"mypy (>=1.4)", "ruff (>=0.3.6)"]
sdist = ["build (>=1.0.0)"]
ssh = ["bcrypt (>=3.1.5)"]
test = ["certifi (>=2024)", "cryptography-vectors (==44.0.2)", "pretend
(>=0.7)", "pytest (>=7.4.0)", "pytest-benchmark (>=4.0)", "pytest-cov
(>=2.10.1)", "pytest-xdist (>=3.5.0)"]
@@ -689,7 +689,7 @@ version = "1.23.0"
description = "Dynamic version generation"
optional = false
python-versions = ">=3.5"
-groups = ["main", "dev"]
+groups = ["main"]
files = [
{file = "dunamai-1.23.0-py3-none-any.whl", hash =
"sha256:a0906d876e92441793c6a423e16a4802752e723e9c9a5aabdc5535df02dbe041"},
{file = "dunamai-1.23.0.tar.gz", hash =
"sha256:a163746de7ea5acb6dacdab3a6ad621ebc612ed1e528aaa8beedb8887fccd2c4"},
@@ -748,7 +748,7 @@ files = [
[package.extras]
docs = ["furo (>=2024.8.6)", "sphinx (>=8.1.3)", "sphinx-autodoc-typehints
(>=3)"]
testing = ["covdefaults (>=2.3)", "coverage (>=7.6.10)", "diff-cover
(>=9.2.1)", "pytest (>=8.3.4)", "pytest-asyncio (>=0.25.2)", "pytest-cov
(>=6)", "pytest-mock (>=3.14)", "pytest-timeout (>=2.3.1)", "virtualenv
(>=20.28.1)"]
-typing = ["typing-extensions (>=4.12.2)"]
+typing = ["typing-extensions (>=4.12.2) ; python_version < \"3.11\""]
[[package]]
name = "flask"
@@ -1054,7 +1054,7 @@ httpcore = "==1.*"
idna = "*"
[package.extras]
-brotli = ["brotli", "brotlicffi"]
+brotli = ["brotli ; platform_python_implementation == \"CPython\"",
"brotlicffi ; platform_python_implementation != \"CPython\""]
cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
http2 = ["h2 (>=3,<5)"]
socks = ["socksio (==1.*)"]
@@ -1082,7 +1082,7 @@ wsproto = ">=0.14.0"
docs = ["pydata_sphinx_theme", "sphinxcontrib_mermaid"]
h3 = ["aioquic (>=0.9.0,<1.0)"]
trio = ["trio (>=0.22.0)"]
-uvloop = ["uvloop (>=0.18)"]
+uvloop = ["uvloop (>=0.18) ; platform_system != \"Windows\""]
[[package]]
name = "hyperframe"
@@ -1475,7 +1475,7 @@ version = "24.2"
description = "Core utilities for Python packages"
optional = false
python-versions = ">=3.8"
-groups = ["main", "dev", "test"]
+groups = ["main", "test"]
files = [
{file = "packaging-24.2-py3-none-any.whl", hash =
"sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759"},
{file = "packaging-24.2.tar.gz", hash =
"sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"},
@@ -1697,7 +1697,7 @@ typing-extensions = ">=4.12.2"
[package.extras]
email = ["email-validator (>=2.0.0)"]
-timezone = ["tzdata"]
+timezone = ["tzdata ; python_version >= \"3.9\" and platform_system ==
\"Windows\""]
[[package]]
name = "pydantic-core"
@@ -2368,7 +2368,7 @@ files = [
]
[package.extras]
-brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"]
+brotli = ["brotli (>=1.0.9) ; platform_python_implementation == \"CPython\"",
"brotlicffi (>=0.8.0) ; platform_python_implementation != \"CPython\""]
h2 = ["h2 (>=4,<5)"]
socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"]
zstd = ["zstandard (>=0.18.0)"]
@@ -2392,7 +2392,7 @@ platformdirs = ">=3.9.1,<5"
[package.extras]
docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2,!=7.3)",
"sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier
(>=23.6)"]
-test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)",
"coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)",
"pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)",
"pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)",
"setuptools (>=68)", "time-machine (>=2.10)"]
+test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)",
"coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)",
"pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8) ;
platform_python_implementation == \"PyPy\" or platform_python_implementation ==
\"CPython\" and sys_platform == \"win32\" and python_version >= \"3.13\"",
"pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)",
"setuptools (>=68)", "time-machine (>=2.10) ; platform_pyth [...]
[[package]]
name = "watchfiles"
@@ -2623,4 +2623,4 @@ propcache = ">=0.2.0"
[metadata]
lock-version = "2.1"
python-versions = "~=3.13"
-content-hash =
"0f21c2914ae6a0d5a7f28f1dcad5bf58610469c705ace76f0d68d0af13da1e27"
+content-hash =
"4299d87c5aabfe30a4a23876a3e58bf06891aaeecebaedecdcc9d970b94fdbf8"
diff --git a/pyproject.toml b/pyproject.toml
index d5218b0..1db2632 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -65,7 +65,6 @@ pre-commit = ">=2.20.0"
pyright = ">=1.1.393"
ruff = ">=0.9.4"
types-aiofiles = ">=24.1.0.20241221,<25.0.0.0"
-dunamai = ">=1.23.0"
# UV specific configuration
diff --git a/scripts/build b/scripts/build
index edb6fd2..634f0cd 100755
--- a/scripts/build
+++ b/scripts/build
@@ -1,12 +1,3 @@
#!/bin/sh
set -eu
-
-COMMIT=$(dunamai from git --format "{commit}")
-DISTANCE=$(dunamai from git --format "{distance}")
-if [ "${DISTANCE}" = "0" ]; then
- VERSION=$(dunamai from git --format "v{base}")
-else
- VERSION=$(dunamai from git --bump --format "v{base}+{distance}.{commit}")
-fi
-
-docker build -t tooling-atr-experiments --build-arg BIND=0.0.0.0:443
--build-arg VERSION="${VERSION}" --build-arg COMMIT="${COMMIT}" -f
Dockerfile.alpine .
+docker build -t tooling-atr-experiments --build-arg BIND=0.0.0.0:443 -f
Dockerfile.alpine .
diff --git a/uv.lock b/uv.lock
index 472fa55..fb8b667 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1119,6 +1119,7 @@ dependencies = [
{ name = "asfquart" },
{ name = "blockbuster" },
{ name = "cryptography" },
+ { name = "dunamai" },
{ name = "greenlet" },
{ name = "httpx" },
{ name = "hypercorn" },
@@ -1131,7 +1132,6 @@ dependencies = [
[package.dev-dependencies]
dev = [
{ name = "djlint" },
- { name = "dunamai" },
{ name = "mypy" },
{ name = "pre-commit" },
{ name = "pyright" },
@@ -1151,6 +1151,7 @@ requires-dist = [
{ name = "asfquart", editable = "asfquart" },
{ name = "blockbuster", specifier = ">=1.5.23,<2.0.0" },
{ name = "cryptography", specifier = "~=44.0" },
+ { name = "dunamai", specifier = ">=1.23.0" },
{ name = "greenlet", specifier = ">=3.1.1,<4.0.0" },
{ name = "httpx", specifier = "~=0.27" },
{ name = "hypercorn", specifier = "~=0.17" },
@@ -1163,7 +1164,6 @@ requires-dist = [
[package.metadata.requires-dev]
dev = [
{ name = "djlint", specifier = ">=1.36.4" },
- { name = "dunamai", specifier = ">=1.23.0" },
{ name = "mypy", specifier = ">=1.15.0" },
{ name = "pre-commit", specifier = ">=2.20.0" },
{ name = "pyright", specifier = ">=1.1.393" },
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
