From eaa211aa96822e0b63c9e41e5882994541309a85 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 24 Nov 2024 14:09:02 -0600 Subject: [PATCH] build: move package to `src/` subdir and cleanup `pyproject.toml` a bit --- pyproject.toml | 39 +++++++----------- {wuttademo => src/wuttademo}/__init__.py | 0 {wuttademo => src/wuttademo}/_version.py | 0 {wuttademo => src/wuttademo}/commands.py | 0 {wuttademo => src/wuttademo}/config.py | 0 {wuttademo => src/wuttademo}/db/__init__.py | 0 .../b41448a639e6_add_wuttademo_branch.py | 0 .../wuttademo}/db/model/__init__.py | 0 {wuttademo => src/wuttademo}/web/__init__.py | 0 {wuttademo => src/wuttademo}/web/app.py | 0 {wuttademo => src/wuttademo}/web/menus.py | 0 .../wuttademo}/web/static/__init__.py | 0 .../wuttademo}/web/static/libcache/README | 0 .../wuttademo}/web/subscribers.py | 0 .../wuttademo}/web/templates/base_meta.mako | 0 .../wuttademo}/web/views/__init__.py | 0 ...a639e6_add_wuttademo_branch.cpython-39.pyc | Bin 912 -> 0 bytes 17 files changed, 15 insertions(+), 24 deletions(-) rename {wuttademo => src/wuttademo}/__init__.py (100%) rename {wuttademo => src/wuttademo}/_version.py (100%) rename {wuttademo => src/wuttademo}/commands.py (100%) rename {wuttademo => src/wuttademo}/config.py (100%) rename {wuttademo => src/wuttademo}/db/__init__.py (100%) rename {wuttademo => src/wuttademo}/db/alembic/versions/b41448a639e6_add_wuttademo_branch.py (100%) rename {wuttademo => src/wuttademo}/db/model/__init__.py (100%) rename {wuttademo => src/wuttademo}/web/__init__.py (100%) rename {wuttademo => src/wuttademo}/web/app.py (100%) rename {wuttademo => src/wuttademo}/web/menus.py (100%) rename {wuttademo => src/wuttademo}/web/static/__init__.py (100%) rename {wuttademo => src/wuttademo}/web/static/libcache/README (100%) rename {wuttademo => src/wuttademo}/web/subscribers.py (100%) rename {wuttademo => src/wuttademo}/web/templates/base_meta.mako (100%) rename {wuttademo => src/wuttademo}/web/views/__init__.py (100%) delete mode 100644 wuttademo/db/alembic/versions/__pycache__/b41448a639e6_add_wuttademo_branch.cpython-39.pyc diff --git a/pyproject.toml b/pyproject.toml index 5983a84..7b5a76b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,8 +9,9 @@ name = "Wutta-Demo" version = "0.1.0" description = "" readme = "README.md" -authors = [{name = "Your Name", email = "you@example.com"}] -keywords = ["Wutta Demo"] +authors = [{name = "Lance Edgar", email = "lance@wuttaproject.org"}] +license = {text = "GNU GPL v3+"} +keywords = ["Wutta"] classifiers = [ "Development Status :: 3 - Alpha", "Environment :: Web Environment", @@ -19,21 +20,11 @@ classifiers = [ "Natural Language :: English", "Programming Language :: Python", "Programming Language :: Python :: 3", - - # TODO: remove this if you intend to publish your project - # (it's here by default, to prevent accidental publishing) - "Private :: Do Not Upload", ] -# requires-python = ">= 3.9" dependencies = [ "psycopg2", "Wutta-Continuum", "WuttaWeb", - - # TODO: these may be needed to build/release package - #'build', - #'invoke', - #'twine', ] @@ -42,25 +33,25 @@ wuttademo = "wuttademo.commands:wuttademo_typer" [project.entry-points."wutta.config.extensions"] - "wuttademo" = "wuttademo.config:WuttaDemoConfig" -[project.entry-points."paste.app_factory"] + +[project.entry-points."paste.app_factory"] "main" = "wuttademo.web.app:main" -# [project.urls] -# Homepage = "https://example.com/" -# Repository = "https://github.com/example/wuttademo" -# Issues = "https://github.com/example/wuttademo/issues" -# Changelog = "https://github.com/example/wuttademo/blob/master/CHANGELOG.md" +[project.urls] +Homepage = "https://wuttaproject.org/" +Repository = "https://forgejo.wuttaproject.org/wutta/wutta-demo" +Issues = "https://forgejo.wuttaproject.org/wutta/wutta-demo/issues" +Changelog = "https://forgejo.wuttaproject.org/wutta/wutta-demo/src/branch/master/CHANGELOG.md" -# [tool.commitizen] -# version_provider = "pep621" -# tag_format = "v$version" -# update_changelog_on_bump = true +[tool.commitizen] +version_provider = "pep621" +tag_format = "v$version" +update_changelog_on_bump = true [tool.hatch.build.targets.wheel] -packages = ["wuttademo"] +packages = ["src/wuttademo"] diff --git a/wuttademo/__init__.py b/src/wuttademo/__init__.py similarity index 100% rename from wuttademo/__init__.py rename to src/wuttademo/__init__.py diff --git a/wuttademo/_version.py b/src/wuttademo/_version.py similarity index 100% rename from wuttademo/_version.py rename to src/wuttademo/_version.py diff --git a/wuttademo/commands.py b/src/wuttademo/commands.py similarity index 100% rename from wuttademo/commands.py rename to src/wuttademo/commands.py diff --git a/wuttademo/config.py b/src/wuttademo/config.py similarity index 100% rename from wuttademo/config.py rename to src/wuttademo/config.py diff --git a/wuttademo/db/__init__.py b/src/wuttademo/db/__init__.py similarity index 100% rename from wuttademo/db/__init__.py rename to src/wuttademo/db/__init__.py diff --git a/wuttademo/db/alembic/versions/b41448a639e6_add_wuttademo_branch.py b/src/wuttademo/db/alembic/versions/b41448a639e6_add_wuttademo_branch.py similarity index 100% rename from wuttademo/db/alembic/versions/b41448a639e6_add_wuttademo_branch.py rename to src/wuttademo/db/alembic/versions/b41448a639e6_add_wuttademo_branch.py diff --git a/wuttademo/db/model/__init__.py b/src/wuttademo/db/model/__init__.py similarity index 100% rename from wuttademo/db/model/__init__.py rename to src/wuttademo/db/model/__init__.py diff --git a/wuttademo/web/__init__.py b/src/wuttademo/web/__init__.py similarity index 100% rename from wuttademo/web/__init__.py rename to src/wuttademo/web/__init__.py diff --git a/wuttademo/web/app.py b/src/wuttademo/web/app.py similarity index 100% rename from wuttademo/web/app.py rename to src/wuttademo/web/app.py diff --git a/wuttademo/web/menus.py b/src/wuttademo/web/menus.py similarity index 100% rename from wuttademo/web/menus.py rename to src/wuttademo/web/menus.py diff --git a/wuttademo/web/static/__init__.py b/src/wuttademo/web/static/__init__.py similarity index 100% rename from wuttademo/web/static/__init__.py rename to src/wuttademo/web/static/__init__.py diff --git a/wuttademo/web/static/libcache/README b/src/wuttademo/web/static/libcache/README similarity index 100% rename from wuttademo/web/static/libcache/README rename to src/wuttademo/web/static/libcache/README diff --git a/wuttademo/web/subscribers.py b/src/wuttademo/web/subscribers.py similarity index 100% rename from wuttademo/web/subscribers.py rename to src/wuttademo/web/subscribers.py diff --git a/wuttademo/web/templates/base_meta.mako b/src/wuttademo/web/templates/base_meta.mako similarity index 100% rename from wuttademo/web/templates/base_meta.mako rename to src/wuttademo/web/templates/base_meta.mako diff --git a/wuttademo/web/views/__init__.py b/src/wuttademo/web/views/__init__.py similarity index 100% rename from wuttademo/web/views/__init__.py rename to src/wuttademo/web/views/__init__.py diff --git a/wuttademo/db/alembic/versions/__pycache__/b41448a639e6_add_wuttademo_branch.cpython-39.pyc b/wuttademo/db/alembic/versions/__pycache__/b41448a639e6_add_wuttademo_branch.cpython-39.pyc deleted file mode 100644 index 3070a5a8d0423ad2ca18c35ab8d61f26e5dc5476..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 912 zcmah`J8#=C5T+is9+B*{Xi+4SRu73{$4+V^C<-J?mkbTEXdx)^lDO3?q--OdI`n50 z-Sd~YcIsa!P@qRU4-Ex+06*N_NAm8wV`1nMv^QT*um2c?{M13)Yz*Gxkv|YF2`35R z1~+q~FcY(|63fuBmD@!p>8yP_?`ZPO=3Sc-+1+cL?TO%y~(mb6|qE zLy)o7jE{_+g#Tc+G{b}M1`m1fo1OF?qCVfosL$;SGI;T&Vw^{-Mbj`2MHQujmD!E& ze}v^+&Z{!|a5jt5@o+qT%Z?7GaI|4S<+p@g$vI0b|GhsQ}hMbcQgCMhBzu-f*}# z8b`y!+2Le18SYOGrpM!v@BhM~kb$Y(3%FfCnSttDmRM+DD6^{1lb~Hpx#FP@6|~E# zkXNgcK9U0?@t!28aHE0dEQMSupF<5LmvmjDE1+43GSgkO4HrpH@kqTrPANa=v9Ixrh!qV@Y2OUDsOZoCPXL)u5#ho%G6CItjWFu6cQdX8#!x}A? yQsL+?Tn(NEEkfvWt;W_vUw7x86cu0O@J_EszC`Fc+h$<6c3`|Rc8y)DXa5B%VBIbN