From 9c462379051155cdf834dfd64309cc97da348f4c Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 25 Feb 2025 01:37:17 +0100 Subject: [PATCH] Semver versioning, show version on web page --- pyproject.toml | 1 - src/oidc_test/__init__.py | 11 +++++++++++ src/oidc_test/main.py | 2 ++ src/oidc_test/static/styles.css | 6 ++++++ src/oidc_test/templates/base.html | 1 + 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8770c8d..c44e9f3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,6 @@ packages = ["src/oidc_test"] package = true [tool.uv-dynamic-versioning] -metadata = true style = "semver" [tool.uv] diff --git a/src/oidc_test/__init__.py b/src/oidc_test/__init__.py index e69de29..f449e2b 100644 --- a/src/oidc_test/__init__.py +++ b/src/oidc_test/__init__.py @@ -0,0 +1,11 @@ +import importlib.metadata + +try: + from dunamai import Version, Style + + __version__ = Version.from_git().serialize(style=Style.SemVer, dirty=True) +except ImportError: + # __name__ could be used if the package name is the same + # as the directory - not the case here + # __version__ = importlib.metadata.version(__name__) + __version__ = importlib.metadata.version("oidc-fastapi-test") diff --git a/src/oidc_test/main.py b/src/oidc_test/main.py index e5238c8..e882cda 100644 --- a/src/oidc_test/main.py +++ b/src/oidc_test/main.py @@ -29,6 +29,7 @@ from authlib.oauth2.rfc6749 import OAuth2Token # from fastapi.security import OpenIdConnect # from pkce import generate_code_verifier, generate_pkce_pair +from oidc_test import __version__ from oidc_test.registry import registry from oidc_test.auth.provider import NoPublicKey, Provider from oidc_test.auth.utils import ( @@ -108,6 +109,7 @@ async def home( "show_token": settings.show_token, "user": user, "now": datetime.now(), + "__version__": __version__, } if provider is None or token is None: context["providers"] = providers diff --git a/src/oidc_test/static/styles.css b/src/oidc_test/static/styles.css index 2baa748..1e8dc03 100644 --- a/src/oidc_test/static/styles.css +++ b/src/oidc_test/static/styles.css @@ -21,6 +21,12 @@ hr { .hidden { display: none; } +.version { + position: absolute; + font-size: 75%; + top: 0.3em; + right: 0.3em; +} .center { text-align: center; } diff --git a/src/oidc_test/templates/base.html b/src/oidc_test/templates/base.html index 4cb56f5..157e26f 100644 --- a/src/oidc_test/templates/base.html +++ b/src/oidc_test/templates/base.html @@ -5,6 +5,7 @@ +
v. {{ __version__}}

OIDC-test - FastAPI client

{% block content %} {% endblock %}