.gitignore

@@ -1,3 +1,2 @@
 *.pyc
-dist/
 Wutta_Demo.egg-info/

README.md

@@ -2,5 +2,3 @@
 # Wutta Demo
 
 This is a starter Python project.
-
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

pyproject.toml

@@ -31,12 +31,11 @@ dependencies = [
 [project.scripts]
 wuttademo = "wuttademo.commands:wuttademo_typer"
 
-[project.entry-points."fanstatic.libraries"]
-wuttademo_libcache = "wuttademo.web.static:libcache"
 
 [project.entry-points."wutta.config.extensions"]
 "wuttademo" = "wuttademo.config:WuttaDemoConfig"
 
+
 [project.entry-points."paste.app_factory"]
 "main" = "wuttademo.web.app:main"
 

src/wuttademo/_version.py

@@ -3,4 +3,4 @@
 from importlib.metadata import version
 
 
-__version__ = version("Wutta-Demo")
+__version__ = version('Wutta-Demo')

src/wuttademo/commands.py

@@ -8,7 +8,10 @@ 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()
@@ -20,10 +23,8 @@ def install(
     """
     config = ctx.parent.wutta_config
     app = config.get_app()
-    install = app.get_install_handler(
+    install = app.get_install_handler(pkg_name='wuttademo',
-        pkg_name="wuttademo",
                                       app_title="Wutta Demo",
-        pypi_name="Wutta-Demo",
+                                      pypi_name='Wutta-Demo',
-        egg_name="Wutta_Demo",
+                                      egg_name='Wutta_Demo')
-    )
     install.run()

src/wuttademo/config.py

@@ -10,23 +10,20 @@ 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_title', "Wutta Demo")
-        config.setdefault(f"{config.appname}.app_dist", "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(
+        config.setdefault(f'{config.appname}.web.menus.handler_spec',
-            f"{config.appname}.web.menus.handler_spec",
+                          'wuttademo.web.menus:WuttaDemoMenuHandler')
-            "wuttademo.web.menus:WuttaDemoMenuHandler",
-        )
 
         # web app libcache
-        config.setdefault("wuttaweb.static_libcache.module", "wuttademo.web.static")
+        #config.setdefault('tailbone.static_libcache.module', 'wuttademo.web.static')

src/wuttademo/web/app.py

@@ -8,38 +8,21 @@ from wuttaweb import app as base
 
 def main(global_config, **settings):
     """
-    Make and return the WSGI application, per given settings.
+    This function returns a Pyramid WSGI application.
     """
     # prefer Wutta Demo templates over wuttaweb
-    settings.setdefault(
+    settings.setdefault('mako.directories', [
-        "mako.directories",
+        'wuttademo.web:templates',
-        [
+        'wuttaweb:templates',
-            "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.static')
-    pyramid_config.include("wuttademo.web.subscribers")
+    pyramid_config.include('wuttademo.web.subscribers')
-    pyramid_config.include("wuttademo.web.views")
+    pyramid_config.include('wuttademo.web.views')
 
     return pyramid_config.make_wsgi_app()
-
-
-def make_wsgi_app():
-    """
-    Make and return the WSGI app.
-    """
-    return base.make_wsgi_app(main)
-
-
-def make_asgi_app():
-    """
-    Make and return the ASGI app.
-    """
-    return base.make_asgi_app(main)

src/wuttademo/web/static/__init__.py

@@ -3,16 +3,11 @@
 Static assets
 """
 
-from fanstatic import Library, Resource
+# from fanstatic import Library, Resource
 
 
-# fanstatic libcache
+# # libcache
-libcache = Library("wuttademo_libcache", "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")
 # 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')
@@ -20,3 +15,8 @@ fontawesome_js = Resource(libcache, "fontawesome-5.3.1-all.min.js")
 # bb_fontawesome_svg_core_js = Resource(libcache, 'fontawesome-svg-core-6.5.2.js')
 # bb_free_solid_svg_icons_js = Resource(libcache, 'free-solid-svg-icons-6.5.2.js')
 # bb_vue_fontawesome_js = Resource(libcache, 'vue-fontawesome-3.0.6.index.es.js')
+
+
+def includeme(config):
+    config.include('wuttaweb.static')
+    config.add_static_view('wuttademo', 'wuttademo.web:static', cache_max_age=3600)

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.include('wuttaweb.subscribers')
-    config.add_subscriber(add_wuttademo_to_context, "pyramid.events.BeforeRender")
+    config.add_subscriber(add_wuttademo_to_context, 'pyramid.events.BeforeRender')

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')

tasks.py

@@ -9,13 +9,25 @@ import shutil
 from invoke import task
 
 
+here = os.path.abspath(os.path.dirname(__file__))
+exec(open(os.path.join(here, 'wuttademo', '_version.py')).read())
+
+
 @task
 def release(c):
     """
     Release a new version of Wutta Demo
     """
-    if os.path.exists("dist"):
+    # rebuild local tar.gz file for distribution
-        shutil.rmtree("dist")
+    if os.path.exists('Wutta_Demo.egg-info'):
+        shutil.rmtree('Wutta_Demo.egg-info')
+    c.run('python -m build --sdist')
 
-    c.run("python -m build --sdist")
+    # filename of built package
-    c.run("twine upload dist/*")
+    filename = 'Wutta-Demo-{}.tar.gz'.format(__version__)
+
+    # TODO: uncomment and update these details, to upload to private PyPI
+    #c.run('scp dist/{} rattail@pypi.example.com:/srv/pypi/wuttademo/'.format(filename))
+
+    # TODO: or, uncomment this to upload to *public* PyPI
+    #c.run('twine upload dist/{}'.format(filename))