From c0ff89fec38e12542b2ac06913f63d673cbfa128 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 31 Aug 2025 13:11:31 -0500 Subject: [PATCH] fix: format all code with black and from now on should not deviate from that... --- src/wuttademo/_version.py | 2 +- src/wuttademo/commands.py | 17 ++++++++--------- src/wuttademo/config.py | 17 ++++++++++------- src/wuttademo/web/app.py | 17 ++++++++++------- src/wuttademo/web/static/__init__.py | 12 ++++++------ src/wuttademo/web/subscribers.py | 6 +++--- src/wuttademo/web/views/__init__.py | 4 ++-- tasks.py | 8 ++++---- 8 files changed, 44 insertions(+), 39 deletions(-) diff --git a/src/wuttademo/_version.py b/src/wuttademo/_version.py index 5e983dc..fe3514d 100644 --- a/src/wuttademo/_version.py +++ b/src/wuttademo/_version.py @@ -3,4 +3,4 @@ from importlib.metadata import version -__version__ = version('Wutta-Demo') +__version__ = version("Wutta-Demo") diff --git a/src/wuttademo/commands.py b/src/wuttademo/commands.py index 1bbce7f..c91f2df 100644 --- a/src/wuttademo/commands.py +++ b/src/wuttademo/commands.py @@ -8,23 +8,22 @@ import typer from wuttjamaican.cli import make_typer -wuttademo_typer = make_typer( - name='wuttademo', - help="Wutta Demo -- " -) +wuttademo_typer = make_typer(name="wuttademo", help="Wutta Demo -- ") @wuttademo_typer.command() def install( - ctx: typer.Context, + ctx: typer.Context, ): """ Install the Wutta Demo app """ config = ctx.parent.wutta_config app = config.get_app() - install = app.get_install_handler(pkg_name='wuttademo', - app_title="Wutta Demo", - pypi_name='Wutta-Demo', - egg_name='Wutta_Demo') + install = app.get_install_handler( + pkg_name="wuttademo", + app_title="Wutta Demo", + pypi_name="Wutta-Demo", + egg_name="Wutta_Demo", + ) install.run() diff --git a/src/wuttademo/config.py b/src/wuttademo/config.py index 8f82bf4..6ed5bc1 100644 --- a/src/wuttademo/config.py +++ b/src/wuttademo/config.py @@ -10,20 +10,23 @@ class WuttaDemoConfig(WuttaConfigExtension): """ Config extension for Wutta Demo """ - key = 'wuttademo' + + key = "wuttademo" def configure(self, config): # app info - config.setdefault(f'{config.appname}.app_title', "Wutta Demo") - config.setdefault(f'{config.appname}.app_dist', "Wutta-Demo") + config.setdefault(f"{config.appname}.app_title", "Wutta Demo") + config.setdefault(f"{config.appname}.app_dist", "Wutta-Demo") # app model - config.setdefault(f'{config.appname}.model_spec', 'wuttademo.db.model') + config.setdefault(f"{config.appname}.model_spec", "wuttademo.db.model") # web app menu - config.setdefault(f'{config.appname}.web.menus.handler_spec', - 'wuttademo.web.menus:WuttaDemoMenuHandler') + config.setdefault( + f"{config.appname}.web.menus.handler_spec", + "wuttademo.web.menus:WuttaDemoMenuHandler", + ) # web app libcache - config.setdefault('wuttaweb.static_libcache.module', 'wuttademo.web.static') + config.setdefault("wuttaweb.static_libcache.module", "wuttademo.web.static") diff --git a/src/wuttademo/web/app.py b/src/wuttademo/web/app.py index 69f9d26..9d3de9d 100644 --- a/src/wuttademo/web/app.py +++ b/src/wuttademo/web/app.py @@ -11,19 +11,22 @@ def main(global_config, **settings): Make and return the WSGI application, per given settings. """ # prefer Wutta Demo templates over wuttaweb - settings.setdefault('mako.directories', [ - 'wuttademo.web:templates', - 'wuttaweb:templates', - ]) + settings.setdefault( + "mako.directories", + [ + "wuttademo.web:templates", + "wuttaweb:templates", + ], + ) # make config objects wutta_config = base.make_wutta_config(settings) pyramid_config = base.make_pyramid_config(settings) # bring in the rest of Wutta Demo - pyramid_config.include('wuttaweb.static') - pyramid_config.include('wuttademo.web.subscribers') - pyramid_config.include('wuttademo.web.views') + pyramid_config.include("wuttaweb.static") + pyramid_config.include("wuttademo.web.subscribers") + pyramid_config.include("wuttademo.web.views") return pyramid_config.make_wsgi_app() diff --git a/src/wuttademo/web/static/__init__.py b/src/wuttademo/web/static/__init__.py index 068764a..49f4aa2 100644 --- a/src/wuttademo/web/static/__init__.py +++ b/src/wuttademo/web/static/__init__.py @@ -7,12 +7,12 @@ from fanstatic import Library, Resource # fanstatic libcache -libcache = Library('wuttademo_libcache', 'libcache') -vue_js = Resource(libcache, 'vue-2.6.14.min.js') -vue_resource_js = Resource(libcache, 'vue-resource-1.5.3.min.js') -buefy_js = Resource(libcache, 'buefy-0.9.25.min.js') -buefy_css = Resource(libcache, 'buefy-0.9.25.min.css') -fontawesome_js = Resource(libcache, 'fontawesome-5.3.1-all.min.js') +libcache = Library("wuttademo_libcache", "libcache") +vue_js = Resource(libcache, "vue-2.6.14.min.js") +vue_resource_js = Resource(libcache, "vue-resource-1.5.3.min.js") +buefy_js = Resource(libcache, "buefy-0.9.25.min.js") +buefy_css = Resource(libcache, "buefy-0.9.25.min.css") +fontawesome_js = Resource(libcache, "fontawesome-5.3.1-all.min.js") # bb_vue_js = Resource(libcache, 'vue.esm-browser-3.3.11.prod.js') # bb_oruga_js = Resource(libcache, 'oruga-0.8.10.js') # bb_oruga_bulma_js = Resource(libcache, 'oruga-bulma-0.3.0.js') diff --git a/src/wuttademo/web/subscribers.py b/src/wuttademo/web/subscribers.py index 7b96e28..9f1d3bd 100644 --- a/src/wuttademo/web/subscribers.py +++ b/src/wuttademo/web/subscribers.py @@ -8,9 +8,9 @@ import wuttademo def add_wuttademo_to_context(event): renderer_globals = event - renderer_globals['wuttademo'] = wuttademo + renderer_globals["wuttademo"] = wuttademo def includeme(config): - config.include('wuttaweb.subscribers') - config.add_subscriber(add_wuttademo_to_context, 'pyramid.events.BeforeRender') + config.include("wuttaweb.subscribers") + config.add_subscriber(add_wuttademo_to_context, "pyramid.events.BeforeRender") diff --git a/src/wuttademo/web/views/__init__.py b/src/wuttademo/web/views/__init__.py index ef50da7..34ab556 100644 --- a/src/wuttademo/web/views/__init__.py +++ b/src/wuttademo/web/views/__init__.py @@ -7,7 +7,7 @@ Wutta Demo Views def includeme(config): # core views for wuttaweb - config.include('wuttaweb.views.essential') + config.include("wuttaweb.views.essential") # TODO: include your own views here - #config.include('wuttademo.web.views.widgets') + # config.include('wuttademo.web.views.widgets') diff --git a/tasks.py b/tasks.py index 0fe3bbe..be9224e 100644 --- a/tasks.py +++ b/tasks.py @@ -14,8 +14,8 @@ def release(c): """ Release a new version of Wutta Demo """ - if os.path.exists('dist'): - shutil.rmtree('dist') + if os.path.exists("dist"): + shutil.rmtree("dist") - c.run('python -m build --sdist') - c.run('twine upload dist/*') + c.run("python -m build --sdist") + c.run("twine upload dist/*")