diff --git a/CHANGELOG.md b/CHANGELOG.md index 35d527e..4483972 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,6 @@ All notable changes to WuttJamaican 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.28.2 (2025-12-31) - -### Fix - -- render db engine with password intact, for installer config - ## v0.28.1 (2025-12-31) ### Fix diff --git a/pyproject.toml b/pyproject.toml index 7ac1f4f..a8c75f8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "WuttJamaican" -version = "0.28.2" +version = "0.28.1" description = "Base package for Wutta Framework" readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@wuttaproject.org"}] diff --git a/src/wuttjamaican/install.py b/src/wuttjamaican/install.py index 395a4a9..5077644 100644 --- a/src/wuttjamaican/install.py +++ b/src/wuttjamaican/install.py @@ -298,9 +298,6 @@ class InstallHandler(GenericHandler): """ envname = os.path.basename(sys.prefix) appdir = os.path.join(sys.prefix, "app") - dburl = dbinfo["dburl"] - if not isinstance(dburl, str): - dburl = dburl.render_as_string(hide_password=False) context = { "envdir": sys.prefix, "envname": envname, @@ -308,7 +305,7 @@ class InstallHandler(GenericHandler): "app_title": self.app_title, "pypi_name": self.pypi_name, "appdir": appdir, - "db_url": dburl, + "db_url": dbinfo["dburl"], "egg_name": self.egg_name, } context.update(kwargs) diff --git a/tests/test_install.py b/tests/test_install.py index 603485c..a58725f 100644 --- a/tests/test_install.py +++ b/tests/test_install.py @@ -170,8 +170,6 @@ class TestInstallHandler(ConfigTestCase): def test_make_template_context(self): handler = self.make_handler() - - # can handle dburl as string dbinfo = {"dburl": "sqlite:///poser.sqlite"} context = handler.make_template_context(dbinfo) self.assertEqual(context["envdir"], sys.prefix) @@ -182,22 +180,6 @@ class TestInstallHandler(ConfigTestCase): self.assertEqual(context["appdir"], os.path.join(sys.prefix, "app")) self.assertEqual(context["db_url"], "sqlite:///poser.sqlite") - try: - import sqlalchemy as sa - except ImportError: - pytest.skip("remainder of test is not relevant without sqlalchemy") - - # but also can handle dburl as object - dbinfo = {"dburl": sa.create_engine("sqlite:///poser.sqlite").url} - context = handler.make_template_context(dbinfo) - self.assertEqual(context["envdir"], sys.prefix) - self.assertEqual(context["pkg_name"], "poser") - self.assertEqual(context["app_title"], "poser") - self.assertEqual(context["pypi_name"], "poser") - self.assertEqual(context["egg_name"], "poser") - self.assertEqual(context["appdir"], os.path.join(sys.prefix, "app")) - self.assertEqual(context["db_url"], "sqlite:///poser.sqlite") - def test_make_appdir(self): handler = self.make_handler() handler.templates = TemplateLookup(