From b72d726bd5d896e3b56438e04751f5606670789e Mon Sep 17 00:00:00 2001 From: thePR0M3TH3AN <53631862+PR0M3TH3AN@users.noreply.github.com> Date: Sat, 21 Jun 2025 12:20:51 -0400 Subject: [PATCH] Move data inside package and update references --- MANIFEST.in | 4 ++-- pyproject.toml | 2 +- tests/test_cli.py | 2 +- voxvera/cli.py | 6 ++++-- {src => voxvera/src}/README.md | 0 {src => voxvera/src}/config.json | 0 {src => voxvera/src}/create_flyer.sh | 0 {src => voxvera/src}/example.pdf | Bin {src => voxvera/src}/generate_qr.sh | 0 {src => voxvera/src}/import_from_json.sh | 0 {src => voxvera/src}/index-master.html | 0 {src => voxvera/src}/index.html | 0 {src => voxvera/src}/nostr-master.html | 0 {src => voxvera/src}/nostr.html | 0 {src => voxvera/src}/obfuscate_index.sh | 0 {src => voxvera/src}/obfuscate_nostr.sh | 0 {src => voxvera/src}/qrcode-content.png | Bin {src => voxvera/src}/qrcode-tear-offs.png | Bin {src => voxvera/src}/submission_form.docx | Bin {src => voxvera/src}/submission_form.oform | Bin {src => voxvera/src}/submission_form.pdf | Bin {src => voxvera/src}/to-do.txt | 0 .../templates}/blank/extract_form_fields.sh | 0 .../templates}/voxvera/config.json | 0 .../templates}/voxvera/download/.gitkeep | 0 .../templates}/voxvera/example.pdf | Bin {templates => voxvera/templates}/voxvera/index.html | 0 {templates => voxvera/templates}/voxvera/nostr.html | 0 .../templates}/voxvera/qrcode-content.png | Bin .../templates}/voxvera/qrcode-tear-offs.png | Bin .../templates}/voxvera/submission_form.pdf | Bin 31 files changed, 8 insertions(+), 6 deletions(-) rename {src => voxvera/src}/README.md (100%) rename {src => voxvera/src}/config.json (100%) rename {src => voxvera/src}/create_flyer.sh (100%) mode change 100755 => 100644 rename {src => voxvera/src}/example.pdf (100%) rename {src => voxvera/src}/generate_qr.sh (100%) mode change 100755 => 100644 rename {src => voxvera/src}/import_from_json.sh (100%) mode change 100755 => 100644 rename {src => voxvera/src}/index-master.html (100%) rename {src => voxvera/src}/index.html (100%) rename {src => voxvera/src}/nostr-master.html (100%) rename {src => voxvera/src}/nostr.html (100%) rename {src => voxvera/src}/obfuscate_index.sh (100%) mode change 100755 => 100644 rename {src => voxvera/src}/obfuscate_nostr.sh (100%) mode change 100755 => 100644 rename {src => voxvera/src}/qrcode-content.png (100%) rename {src => voxvera/src}/qrcode-tear-offs.png (100%) rename {src => voxvera/src}/submission_form.docx (100%) rename {src => voxvera/src}/submission_form.oform (100%) rename {src => voxvera/src}/submission_form.pdf (100%) rename {src => voxvera/src}/to-do.txt (100%) rename {templates => voxvera/templates}/blank/extract_form_fields.sh (100%) rename {templates => voxvera/templates}/voxvera/config.json (100%) rename {templates => voxvera/templates}/voxvera/download/.gitkeep (100%) rename {templates => voxvera/templates}/voxvera/example.pdf (100%) rename {templates => voxvera/templates}/voxvera/index.html (100%) rename {templates => voxvera/templates}/voxvera/nostr.html (100%) rename {templates => voxvera/templates}/voxvera/qrcode-content.png (100%) rename {templates => voxvera/templates}/voxvera/qrcode-tear-offs.png (100%) rename {templates => voxvera/templates}/voxvera/submission_form.pdf (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 21b0d03..12ba981 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ -include templates/** -include src/** +include voxvera/templates/** +include voxvera/src/** diff --git a/pyproject.toml b/pyproject.toml index c3c655a..594cb18 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ include = ["voxvera*"] include-package-data = true [tool.setuptools.package-data] -voxvera = ["../templates/**", "../src/**"] +voxvera = ["templates/**", "src/**"] [project] name = "voxvera" diff --git a/tests/test_cli.py b/tests/test_cli.py index 519c7e1..e299db5 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -15,7 +15,7 @@ from voxvera import cli def _setup_tmp(monkeypatch, tmp_path): repo_root = Path(__file__).resolve().parent.parent - shutil.copytree(repo_root / "src", tmp_path / "src") + shutil.copytree(repo_root / "voxvera" / "src", tmp_path / "src") monkeypatch.setattr(cli, "ROOT", tmp_path) monkeypatch.setattr(cli, "_src_res", lambda *p: tmp_path / "src" / Path(*p)) monkeypatch.setattr(cli, "run", lambda *a, **k: None) diff --git a/voxvera/cli.py b/voxvera/cli.py index 7c4ff25..5360362 100644 --- a/voxvera/cli.py +++ b/voxvera/cli.py @@ -17,11 +17,13 @@ ROOT = Path(__file__).resolve().parent.parent def _template_res(*parts) -> Traversable: - return resources.files(__package__).joinpath('..', 'templates', *parts) + """Return a Traversable for files under the packaged ``templates`` folder.""" + return resources.files(__package__).joinpath('templates', *parts) def _src_res(*parts) -> Traversable: - return resources.files(__package__).joinpath('..', 'src', *parts) + """Return a Traversable for files under the packaged ``src`` folder.""" + return resources.files(__package__).joinpath('src', *parts) def require_cmd(cmd: str): diff --git a/src/README.md b/voxvera/src/README.md similarity index 100% rename from src/README.md rename to voxvera/src/README.md diff --git a/src/config.json b/voxvera/src/config.json similarity index 100% rename from src/config.json rename to voxvera/src/config.json diff --git a/src/create_flyer.sh b/voxvera/src/create_flyer.sh old mode 100755 new mode 100644 similarity index 100% rename from src/create_flyer.sh rename to voxvera/src/create_flyer.sh diff --git a/src/example.pdf b/voxvera/src/example.pdf similarity index 100% rename from src/example.pdf rename to voxvera/src/example.pdf diff --git a/src/generate_qr.sh b/voxvera/src/generate_qr.sh old mode 100755 new mode 100644 similarity index 100% rename from src/generate_qr.sh rename to voxvera/src/generate_qr.sh diff --git a/src/import_from_json.sh b/voxvera/src/import_from_json.sh old mode 100755 new mode 100644 similarity index 100% rename from src/import_from_json.sh rename to voxvera/src/import_from_json.sh diff --git a/src/index-master.html b/voxvera/src/index-master.html similarity index 100% rename from src/index-master.html rename to voxvera/src/index-master.html diff --git a/src/index.html b/voxvera/src/index.html similarity index 100% rename from src/index.html rename to voxvera/src/index.html diff --git a/src/nostr-master.html b/voxvera/src/nostr-master.html similarity index 100% rename from src/nostr-master.html rename to voxvera/src/nostr-master.html diff --git a/src/nostr.html b/voxvera/src/nostr.html similarity index 100% rename from src/nostr.html rename to voxvera/src/nostr.html diff --git a/src/obfuscate_index.sh b/voxvera/src/obfuscate_index.sh old mode 100755 new mode 100644 similarity index 100% rename from src/obfuscate_index.sh rename to voxvera/src/obfuscate_index.sh diff --git a/src/obfuscate_nostr.sh b/voxvera/src/obfuscate_nostr.sh old mode 100755 new mode 100644 similarity index 100% rename from src/obfuscate_nostr.sh rename to voxvera/src/obfuscate_nostr.sh diff --git a/src/qrcode-content.png b/voxvera/src/qrcode-content.png similarity index 100% rename from src/qrcode-content.png rename to voxvera/src/qrcode-content.png diff --git a/src/qrcode-tear-offs.png b/voxvera/src/qrcode-tear-offs.png similarity index 100% rename from src/qrcode-tear-offs.png rename to voxvera/src/qrcode-tear-offs.png diff --git a/src/submission_form.docx b/voxvera/src/submission_form.docx similarity index 100% rename from src/submission_form.docx rename to voxvera/src/submission_form.docx diff --git a/src/submission_form.oform b/voxvera/src/submission_form.oform similarity index 100% rename from src/submission_form.oform rename to voxvera/src/submission_form.oform diff --git a/src/submission_form.pdf b/voxvera/src/submission_form.pdf similarity index 100% rename from src/submission_form.pdf rename to voxvera/src/submission_form.pdf diff --git a/src/to-do.txt b/voxvera/src/to-do.txt similarity index 100% rename from src/to-do.txt rename to voxvera/src/to-do.txt diff --git a/templates/blank/extract_form_fields.sh b/voxvera/templates/blank/extract_form_fields.sh similarity index 100% rename from templates/blank/extract_form_fields.sh rename to voxvera/templates/blank/extract_form_fields.sh diff --git a/templates/voxvera/config.json b/voxvera/templates/voxvera/config.json similarity index 100% rename from templates/voxvera/config.json rename to voxvera/templates/voxvera/config.json diff --git a/templates/voxvera/download/.gitkeep b/voxvera/templates/voxvera/download/.gitkeep similarity index 100% rename from templates/voxvera/download/.gitkeep rename to voxvera/templates/voxvera/download/.gitkeep diff --git a/templates/voxvera/example.pdf b/voxvera/templates/voxvera/example.pdf similarity index 100% rename from templates/voxvera/example.pdf rename to voxvera/templates/voxvera/example.pdf diff --git a/templates/voxvera/index.html b/voxvera/templates/voxvera/index.html similarity index 100% rename from templates/voxvera/index.html rename to voxvera/templates/voxvera/index.html diff --git a/templates/voxvera/nostr.html b/voxvera/templates/voxvera/nostr.html similarity index 100% rename from templates/voxvera/nostr.html rename to voxvera/templates/voxvera/nostr.html diff --git a/templates/voxvera/qrcode-content.png b/voxvera/templates/voxvera/qrcode-content.png similarity index 100% rename from templates/voxvera/qrcode-content.png rename to voxvera/templates/voxvera/qrcode-content.png diff --git a/templates/voxvera/qrcode-tear-offs.png b/voxvera/templates/voxvera/qrcode-tear-offs.png similarity index 100% rename from templates/voxvera/qrcode-tear-offs.png rename to voxvera/templates/voxvera/qrcode-tear-offs.png diff --git a/templates/voxvera/submission_form.pdf b/voxvera/templates/voxvera/submission_form.pdf similarity index 100% rename from templates/voxvera/submission_form.pdf rename to voxvera/templates/voxvera/submission_form.pdf