diff --git a/CHANGELOG.md b/CHANGELOG.md index c70434f..15bb92a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,6 @@ All notable changes to wuttaweb will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## v0.27.3 (2026-02-07) - -### Fix - -- prefer new setting name for buefy_css liburl - ## v0.27.2 (2026-02-04) ### Fix diff --git a/pyproject.toml b/pyproject.toml index 8242013..bd7ff97 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "WuttaWeb" -version = "0.27.3" +version = "0.27.2" description = "Web App for Wutta Framework" readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@wuttaproject.org"}] diff --git a/src/wuttaweb/templates/base.mako b/src/wuttaweb/templates/base.mako index 2c231ca..9425438 100644 --- a/src/wuttaweb/templates/base.mako +++ b/src/wuttaweb/templates/base.mako @@ -113,7 +113,7 @@ <%def name="buefy_styles()"> - ${h.stylesheet_link(h.get_liburl(request, 'buefy_css'))} + ${h.stylesheet_link(h.get_liburl(request, 'buefy.css'))} <%def name="base_styles()"> diff --git a/src/wuttaweb/util.py b/src/wuttaweb/util.py index 1080820..5492485 100644 --- a/src/wuttaweb/util.py +++ b/src/wuttaweb/util.py @@ -188,14 +188,6 @@ def get_libver( # pylint: disable=too-many-return-statements,too-many-branches """ config = request.wutta_config - if key == "buefy.css": - warnings.warn( - "libver key 'buefy.css' is deprecated; please use 'buefy_css' instead", - DeprecationWarning, - stacklevel=2, - ) - key = "buefy_css" - # nb. we prefer a setting to be named like: wuttaweb.libver.vue # but for back-compat this also can work: tailbone.libver.vue # and for more back-compat this can work: wuttaweb.vue_version @@ -208,17 +200,6 @@ def get_libver( # pylint: disable=too-many-return-statements,too-many-branches if version: return version - # maybe try deprecated key for buefy.css - if key == "buefy_css": - version = config.get("wuttaweb.libver.buefy.css") - if version: - warnings.warn( - "config for wuttaweb.libver.buefy.css is deprecated; " - "please set wuttaweb.libver.buefy_css instead", - DeprecationWarning, - ) - return version - # fallback to caller-specified prefix if prefix != "wuttaweb": version = config.get(f"{prefix}.libver.{key}") @@ -230,17 +211,6 @@ def get_libver( # pylint: disable=too-many-return-statements,too-many-branches ) return version - # maybe try deprecated key for buefy.css - if key == "buefy_css": - version = config.get(f"{prefix}.libver.buefy.css") - if version: - warnings.warn( - f"config for {prefix}.libver.buefy.css is deprecated; " - "please set wuttaweb.libver.buefy_css instead", - DeprecationWarning, - ) - return version - if key == "buefy": if not default_only: # nb. old/legacy setting @@ -255,7 +225,7 @@ def get_libver( # pylint: disable=too-many-return-statements,too-many-branches if not configured_only: return "0.9.25" - elif key == "buefy_css": + elif key == "buefy.css": # nb. this always returns something return get_libver( request, "buefy", default_only=default_only, configured_only=configured_only @@ -310,13 +280,13 @@ def get_libver( # pylint: disable=too-many-return-statements,too-many-branches return None -def get_liburl( +def get_liburl( # pylint: disable=too-many-return-statements,too-many-branches request, key, configured_only=False, default_only=False, prefix="wuttaweb", -): # pylint: disable=too-many-return-statements,too-many-branches,too-many-statements +): """ Return the appropriate URL for the web resource library identified by ``key``. @@ -351,7 +321,7 @@ def get_liburl( * ``vue`` * ``vue_resource`` * ``buefy`` - * ``buefy_css`` + * ``buefy.css`` * ``fontawesome`` Vue 3 + Oruga @@ -383,14 +353,6 @@ def get_liburl( """ config = request.wutta_config - if key == "buefy.css": - warnings.warn( - "liburl key 'buefy.css' is deprecated; please use 'buefy_css' instead", - DeprecationWarning, - stacklevel=2, - ) - key = "buefy_css" - if not default_only: # nb. new/preferred setting @@ -398,17 +360,6 @@ def get_liburl( if url: return url - # maybe try deprecated key for buefy.css - if key == "buefy_css": - version = config.get("wuttaweb.liburl.buefy.css") - if version: - warnings.warn( - "config for wuttaweb.liburl.buefy.css is deprecated; " - "please set wuttaweb.liburl.buefy_css instead", - DeprecationWarning, - ) - return version - # fallback to caller-specified prefix url = config.get(f"{prefix}.liburl.{key}") if url: @@ -419,17 +370,6 @@ def get_liburl( ) return url - # maybe try deprecated key for buefy.css - if key == "buefy_css": - version = config.get(f"{prefix}.liburl.buefy.css") - if version: - warnings.warn( - f"config for {prefix}.liburl.buefy.css is deprecated; " - "please set wuttaweb.liburl.buefy_css instead", - DeprecationWarning, - ) - return version - if configured_only: return None @@ -460,7 +400,7 @@ def get_liburl( return liburl + static.buefy_js.relpath return f"https://unpkg.com/buefy@{version}/dist/buefy.min.js" - if key == "buefy_css": + if key == "buefy.css": if static and hasattr(static, "buefy_css"): return liburl + static.buefy_css.relpath return f"https://unpkg.com/buefy@{version}/dist/buefy.min.css" diff --git a/src/wuttaweb/views/settings.py b/src/wuttaweb/views/settings.py index a1c9c1c..d365da2 100644 --- a/src/wuttaweb/views/settings.py +++ b/src/wuttaweb/views/settings.py @@ -115,7 +115,7 @@ class AppInfoView(MasterView): # pylint: disable=abstract-method ("vue", "(Vue2) Vue"), ("vue_resource", "(Vue2) vue-resource"), ("buefy", "(Vue2) Buefy"), - ("buefy_css", "(Vue2) Buefy CSS"), + ("buefy.css", "(Vue2) Buefy CSS"), ("fontawesome", "(Vue2) FontAwesome"), ("bb_vue", "(Vue3) vue"), ("bb_oruga", "(Vue3) @oruga-ui/oruga-next"), diff --git a/tests/test_util.py b/tests/test_util.py index dbc4050..a0285a1 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -95,73 +95,27 @@ class TestGetLibVer(TestCase): self.assertEqual(version, "0.9.25") def test_buefy_css_default(self): - version = mod.get_libver(self.request, "buefy_css") - self.assertEqual(version, "0.9.25") version = mod.get_libver(self.request, "buefy.css") self.assertEqual(version, "0.9.25") def test_buefy_css_custom_old(self): # nb. this uses same setting as buefy (js) self.config.setdefault("wuttaweb.buefy_version", "0.9.29") - version = mod.get_libver(self.request, "buefy_css") - self.assertEqual(version, "0.9.29") version = mod.get_libver(self.request, "buefy.css") self.assertEqual(version, "0.9.29") def test_buefy_css_custom_new(self): # nb. this uses same setting as buefy (js) self.config.setdefault("wuttaweb.libver.buefy", "0.9.29") - version = mod.get_libver(self.request, "buefy_css") - self.assertEqual(version, "0.9.29") version = mod.get_libver(self.request, "buefy.css") self.assertEqual(version, "0.9.29") def test_buefy_css_configured_only(self): - version = mod.get_libver(self.request, "buefy_css", configured_only=True) - self.assertIsNone(version) version = mod.get_libver(self.request, "buefy.css", configured_only=True) self.assertIsNone(version) - # legacy prefix + deprecated setting name - self.config.setdefault("tailbone.libver.buefy.css", "0.9.23") - version = mod.get_libver( - self.request, "buefy_css", configured_only=True, prefix="tailbone" - ) - self.assertEqual(version, "0.9.23") - version = mod.get_libver( - self.request, "buefy.css", configured_only=True, prefix="tailbone" - ) - self.assertEqual(version, "0.9.23") - - # legacy prefix + preferred setting name - self.config.setdefault("tailbone.libver.buefy_css", "0.9.22") - version = mod.get_libver( - self.request, "buefy_css", configured_only=True, prefix="tailbone" - ) - self.assertEqual(version, "0.9.22") - version = mod.get_libver( - self.request, "buefy.css", configured_only=True, prefix="tailbone" - ) - self.assertEqual(version, "0.9.22") - - # deprecated setting name - self.config.setdefault("wuttaweb.libver.buefy.css", "0.9.29") - version = mod.get_libver(self.request, "buefy_css", configured_only=True) - self.assertEqual(version, "0.9.29") - version = mod.get_libver(self.request, "buefy.css", configured_only=True) - self.assertEqual(version, "0.9.29") - - # preferred setting name - self.config.setdefault("wuttaweb.libver.buefy_css", "0.9.27") - version = mod.get_libver(self.request, "buefy_css", configured_only=True) - self.assertEqual(version, "0.9.27") - version = mod.get_libver(self.request, "buefy.css", configured_only=True) - self.assertEqual(version, "0.9.27") - def test_buefy_css_default_only(self): self.config.setdefault("wuttaweb.libver.buefy", "0.9.29") - version = mod.get_libver(self.request, "buefy_css", default_only=True) - self.assertEqual(version, "0.9.25") version = mod.get_libver(self.request, "buefy.css", default_only=True) self.assertEqual(version, "0.9.25") @@ -337,31 +291,16 @@ class TestGetLibUrl(TestCase): self.assertEqual(url, "/wutta/fanstatic/buefy.js") def test_buefy_css_default(self): - url = mod.get_liburl(self.request, "buefy_css") - self.assertEqual(url, "https://unpkg.com/buefy@0.9.25/dist/buefy.min.css") url = mod.get_liburl(self.request, "buefy.css") self.assertEqual(url, "https://unpkg.com/buefy@0.9.25/dist/buefy.min.css") def test_buefy_css_custom(self): - - # deprecated setting name - self.config.setdefault("wuttaweb.liburl.buefy.css", "/lib/deprecated-buefy.css") - url = mod.get_liburl(self.request, "buefy_css") - self.assertEqual(url, "/lib/deprecated-buefy.css") - url = mod.get_liburl(self.request, "buefy.css") - self.assertEqual(url, "/lib/deprecated-buefy.css") - - # preferred setting name - self.config.setdefault("wuttaweb.liburl.buefy_css", "/lib/buefy.css") - url = mod.get_liburl(self.request, "buefy_css") - self.assertEqual(url, "/lib/buefy.css") + self.config.setdefault("wuttaweb.liburl.buefy.css", "/lib/buefy.css") url = mod.get_liburl(self.request, "buefy.css") self.assertEqual(url, "/lib/buefy.css") def test_buefy_css_fanstatic(self): self.setup_fanstatic() - url = mod.get_liburl(self.request, "buefy_css") - self.assertEqual(url, "/wutta/fanstatic/buefy.css") url = mod.get_liburl(self.request, "buefy.css") self.assertEqual(url, "/wutta/fanstatic/buefy.css")