From 51d7e5281ae40376ed85750c4dea3d7a56d8b5f8 Mon Sep 17 00:00:00 2001 From: Vaughn Kottler Date: Sun, 28 Apr 2024 23:45:24 -0500 Subject: [PATCH] Sync boilerplate --- .github/workflows/python-package.yml | 2 +- README.md | 6 +- config | 2 +- im/pydeps.svg | 1211 +++++++++++++------------- setup.py | 2 +- tasks/conf.py | 16 +- vmklib/__init__.py | 2 +- vmklib/__main__.py | 2 +- vmklib/data/data/header.mk | 2 +- vmklib/entry.py | 2 +- 10 files changed, 603 insertions(+), 644 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 719827d..0715163 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -56,7 +56,7 @@ jobs: env: PY_TEST_EXTRA_ARGS: --cov-report=xml - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v3.1.5 - run: mk pypi-upload-ci env: diff --git a/README.md b/README.md index 76f4208..f0f54fa 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ @@ -69,7 +69,7 @@ else with simple package updates. # Command-line Options ``` -$ ./venv3.11/bin/mk -h +$ ./venv3.12/bin/mk -h usage: mk [-h] [--version] [-v] [-q] [--curses] [--no-uvloop] [-C DIR] [-p PREFIX] [-d] [-D DEFAULT] [-f FILE] [-c CONFIG] [-P PROJ] diff --git a/config b/config index f8271b5..cc472ae 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit f8271b54f578880060f0136fbc9ed9b7c2649902 +Subproject commit cc472ae7257da9c95a2059d7d9134ef880eeb43b diff --git a/im/pydeps.svg b/im/pydeps.svg index 3097bde..7f16c26 100644 --- a/im/pydeps.svg +++ b/im/pydeps.svg @@ -4,1101 +4,1060 @@ - - + + G - - - -__main__ - -__main__ - - - -pkg_resources - -pkg_resources - - - -__main__->pkg_resources - - - - - -vmklib_resources - -vmklib. -resources - - - -pkg_resources->vmklib_resources - - - + - + vcorelib - -vcorelib + +vcorelib - + vmklib_app - -vmklib.app + +vmklib.app - + vcorelib->vmklib_app - - - + + + - + vmklib_entry - -vmklib.entry + +vmklib.entry - + vcorelib->vmklib_entry - - - - - -vcorelib->vmklib_resources - - - + + + + - + vmklib_tasks - -vmklib.tasks + +vmklib.tasks - + vcorelib->vmklib_tasks - - + + - + vmklib_tasks_clean - -vmklib. -tasks. -clean + +vmklib. +tasks. +clean - + vcorelib->vmklib_tasks_clean - - + + - + vmklib_tasks_mixins_concrete - -vmklib. -tasks. -mixins. -concrete + +vmklib. +tasks. +mixins. +concrete - + vcorelib->vmklib_tasks_mixins_concrete - - + + - + vmklib_tasks_mixins_curl - -vmklib. -tasks. -mixins. -curl + +vmklib. +tasks. +mixins. +curl - + vcorelib->vmklib_tasks_mixins_curl - - + + + + - + vmklib_tasks_node - -vmklib. -tasks. -node + +vmklib. +tasks. +node - + vcorelib->vmklib_tasks_node - - + + + - + vmklib_tasks_python - -vmklib. -tasks. -python + +vmklib. +tasks. +python - + vcorelib->vmklib_tasks_python - - - + + + - + vmklib_tasks_python_build - -vmklib. -tasks. -python. -build + +vmklib. +tasks. +python. +build - + vcorelib->vmklib_tasks_python_build - - - + + - + vmklib_tasks_python_datazen - -vmklib. -tasks. -python. -datazen + +vmklib. +tasks. +python. +datazen - + vcorelib->vmklib_tasks_python_datazen - - + + - + vmklib_tasks_python_docs - -vmklib. -tasks. -python. -docs + +vmklib. +tasks. +python. +docs - + vcorelib->vmklib_tasks_python_docs - - + + - + vmklib_tasks_python_lint - -vmklib. -tasks. -python. -lint + +vmklib. +tasks. +python. +lint - + vcorelib->vmklib_tasks_python_lint - - - - - + + + - + vmklib_tasks_python_package - -vmklib. -tasks. -python. -package + +vmklib. +tasks. +python. +package - + vcorelib->vmklib_tasks_python_package - + + + + + - + vmklib_tasks_python_release - -vmklib. -tasks. -python. -release + +vmklib. +tasks. +python. +release - + vcorelib->vmklib_tasks_python_release - - + + + - + vmklib_tasks_python_sa - -vmklib. -tasks. -python. -sa + +vmklib. +tasks. +python. +sa - + vcorelib->vmklib_tasks_python_sa - - - + + - + vmklib_tasks_python_test - -vmklib. -tasks. -python. -test + +vmklib. +tasks. +python. +test - + vcorelib->vmklib_tasks_python_test - - - + + + - + vmklib_tasks_python_yaml - -vmklib. -tasks. -python. -yaml + +vmklib. +tasks. +python. +yaml - + vcorelib->vmklib_tasks_python_yaml - - + + - + vmklib_tasks_release - -vmklib. -tasks. -release + +vmklib. +tasks. +release - + vcorelib->vmklib_tasks_release - - + + - + vmklib_tasks_venv - -vmklib. -tasks. -venv + +vmklib. +tasks. +venv - + vcorelib->vmklib_tasks_venv - - + + + + - + vcorelib_asyncio - -vcorelib. -asyncio + +vcorelib. +asyncio - + vcorelib_task_manager - -vcorelib. -task. -manager + +vcorelib. +task. +manager - + vcorelib_asyncio->vcorelib_task_manager - - - + - + vcorelib_task_subprocess_run - -vcorelib. -task. -subprocess. -run + +vcorelib. +task. +subprocess. +run - + vcorelib_asyncio->vcorelib_task_subprocess_run - - - + + + - + vcorelib_asyncio->vmklib_tasks_mixins_curl - - - + - + vcorelib_asyncio_cli - -vcorelib. -asyncio. -cli + +vcorelib. +asyncio. +cli - + vcorelib_asyncio_cli->vcorelib_task_subprocess_run - - - + + - + vcorelib_asyncio_cli->vmklib_tasks_mixins_curl - + + + - + vcorelib_dict - -vcorelib.dict + +vcorelib.dict - + vcorelib_task - -vcorelib.task + +vcorelib.task - + vcorelib_dict->vcorelib_task - - + + - + vcorelib_dict->vcorelib_task_manager - - + - + vcorelib_dict->vmklib_app - - - + + + - + vcorelib_dict->vmklib_tasks_venv - - + - + vcorelib_io - -vcorelib.io + +vcorelib.io - + vcorelib_io->vmklib_app - + - + vcorelib_logging - -vcorelib. -logging + +vcorelib. +logging - + vcorelib_logging->vcorelib_asyncio - - + + - + vcorelib_logging->vcorelib_asyncio_cli - - + + - + vcorelib_logging->vcorelib_dict - - + + - + vcorelib_logging->vcorelib_task - - + + + - + vcorelib_logging->vmklib_entry - - - - + + + - + vcorelib_paths - -vcorelib.paths + +vcorelib.paths - + vcorelib_python - -vcorelib. -python + +vcorelib. +python - + vcorelib_paths->vcorelib_python - - + + - - -vcorelib_paths->vmklib_resources - - + + +vcorelib_paths->vcorelib_task_subprocess_run + + + + + +vcorelib_paths->vmklib_app + + + + - + vcorelib_paths->vmklib_tasks_mixins_concrete - - + + - + vcorelib_paths->vmklib_tasks_python_docs - - - - + + + - + vcorelib_paths_context - -vcorelib. -paths. -context + +vcorelib. +paths. +context - + vcorelib_paths_context->vmklib_tasks_python_docs - - + - + vcorelib_platform - -vcorelib. -platform + +vcorelib. +platform - + vcorelib_platform->vcorelib_task_subprocess_run - - + + - + vcorelib_platform->vmklib_tasks_python_lint - - + + - + vcorelib_python->vmklib_tasks_python - - + - + vcorelib_target - -vcorelib. -target + +vcorelib. +target - + vcorelib_target->vcorelib_task - - - + + - + vcorelib_target->vcorelib_task_manager - + + + - + vcorelib_target->vmklib_app - - - + + - + vcorelib_target->vmklib_tasks_mixins_concrete - - + + + - + vcorelib_task->vcorelib_python - - + + - + vcorelib_task->vmklib_app - + + - + vcorelib_task->vmklib_tasks - - + + - + vcorelib_task->vmklib_tasks_clean - - + + - + vcorelib_task->vmklib_tasks_mixins_concrete - - - + + - + vcorelib_task->vmklib_tasks_mixins_curl - - + + - + vcorelib_task->vmklib_tasks_node - - + + - + vcorelib_task->vmklib_tasks_python_build - - - + + - + vcorelib_task->vmklib_tasks_python_datazen - - + + - + vcorelib_task->vmklib_tasks_python_docs - - - - - + + - + vcorelib_task->vmklib_tasks_python_lint - + + - + vcorelib_task->vmklib_tasks_python_package - - - - - + + + + + - + vcorelib_task->vmklib_tasks_python_release - - - + + + + + - + vcorelib_task->vmklib_tasks_python_sa - - + + - + vcorelib_task->vmklib_tasks_python_test - - + + - + vcorelib_task->vmklib_tasks_python_yaml - - - + + - + vcorelib_task->vmklib_tasks_release - - - + + - + vcorelib_task->vmklib_tasks_venv - - + + + + + + +vcorelib_task_manager->vcorelib_task_subprocess_run + + - + vcorelib_task_manager->vmklib_app - - + + + - + vcorelib_task_manager->vmklib_tasks_node - - + + + - + vcorelib_task_manager->vmklib_tasks_python_build - - - + - + vcorelib_task_manager->vmklib_tasks_python_datazen - - - + + - + vcorelib_task_manager->vmklib_tasks_python_docs - - + - + vcorelib_task_manager->vmklib_tasks_python_lint - - - + - + vcorelib_task_manager->vmklib_tasks_python_package - - + - + vcorelib_task_manager->vmklib_tasks_python_release - - - - - + - + vcorelib_task_manager->vmklib_tasks_python_sa - - - + + + - + vcorelib_task_manager->vmklib_tasks_python_test - - - + - + vcorelib_task_manager->vmklib_tasks_python_yaml - - + + + + - + vcorelib_task_manager->vmklib_tasks_venv - - + + + - + vcorelib_task_subprocess - -vcorelib. -task. -subprocess + +vcorelib. +task. +subprocess - + vcorelib_task_subprocess->vcorelib_python - - + + - + vcorelib_task_subprocess->vmklib_tasks_mixins_curl - - + + - + vcorelib_task_subprocess->vmklib_tasks_node - - + + - + vcorelib_task_subprocess->vmklib_tasks_python_build - + + - + vcorelib_task_subprocess->vmklib_tasks_python_datazen - - - + + - + vcorelib_task_subprocess->vmklib_tasks_python_docs - + - + vcorelib_task_subprocess->vmklib_tasks_python_lint - - + + + - + vcorelib_task_subprocess->vmklib_tasks_python_package - - + + + - + vcorelib_task_subprocess->vmklib_tasks_python_test - - - + + - + vcorelib_task_subprocess->vmklib_tasks_python_yaml - - - + + - + vcorelib_task_subprocess->vmklib_tasks_venv - - + + + - + vcorelib_task_subprocess_run->vcorelib_python - - + + - + vcorelib_task_subprocess_run->vmklib_tasks_mixins_curl - - - + + - + vcorelib_task_subprocess_run->vmklib_tasks_node - - - - + - + vcorelib_task_subprocess_run->vmklib_tasks_python_build - + - + vcorelib_task_subprocess_run->vmklib_tasks_python_datazen - - + + - + vcorelib_task_subprocess_run->vmklib_tasks_python_docs - - + + + + - + vcorelib_task_subprocess_run->vmklib_tasks_python_lint - - + - + vcorelib_task_subprocess_run->vmklib_tasks_python_package - - - + + - + vcorelib_task_subprocess_run->vmklib_tasks_python_test - - + + + - + vcorelib_task_subprocess_run->vmklib_tasks_python_yaml - - + + + - + vcorelib_task_subprocess_run->vmklib_tasks_venv - - - - + + - + vmklib___main__ - -vmklib. -__main__ + +vmklib. +__main__ - + vmklib_app->vmklib_entry - - + + - + vmklib_entry->vmklib___main__ - - - - - -vmklib_resources->vmklib_app - - + + - + vmklib_tasks_args - -vmklib. -tasks. -args + +vmklib. +tasks. +args - + vmklib_tasks_args->vmklib_tasks_python_build - - - + + + + - + vmklib_tasks_args->vmklib_tasks_python_datazen - - - + + + - + vmklib_tasks_args->vmklib_tasks_python_docs - - + + - + vmklib_tasks_args->vmklib_tasks_python_lint - - + + - + vmklib_tasks_args->vmklib_tasks_python_test - - + + - + vmklib_tasks_github - -vmklib. -tasks. -github + +vmklib. +tasks. +github - + vmklib_tasks_github->vmklib_tasks_release - - + + - + vmklib_tasks_mixins - -vmklib. -tasks. -mixins + +vmklib. +tasks. +mixins - + vmklib_tasks_mixins->vmklib_tasks_github - - + + - + vmklib_tasks_mixins->vmklib_tasks_python_build - - + + - + vmklib_tasks_mixins->vmklib_tasks_python_package - - + - + vmklib_tasks_mixins->vmklib_tasks_release - - - + + - + vmklib_tasks_mixins->vmklib_tasks_venv - - + + - + vmklib_tasks_mixins_concrete->vmklib_tasks_mixins - - + + - + vmklib_tasks_mixins_concrete->vmklib_tasks_python_build - + + - + vmklib_tasks_mixins_concrete->vmklib_tasks_python_package - - + + - + vmklib_tasks_mixins_concrete->vmklib_tasks_venv - - + + + - + vmklib_tasks_mixins_curl->vmklib_tasks_mixins - - + + - + vmklib_tasks_python->vmklib_tasks_venv - - + + - + vmklib_tasks_python_lint->vmklib_tasks_python_sa - - + + - + vmklib_tasks_release->vmklib_tasks_python_release - + diff --git a/setup.py b/setup.py index 0a2b968..37ee754 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.3 +# version=3.1.4 # hash=43286ed57052c2548361d2dcdd062187 # ===================================== diff --git a/tasks/conf.py b/tasks/conf.py index d5f7942..0aebbed 100644 --- a/tasks/conf.py +++ b/tasks/conf.py @@ -1,7 +1,7 @@ # ===================================== # generator=datazen -# version=3.1.3 -# hash=9f62028523c3b5a953733ca89dcc3018 +# version=3.1.4 +# hash=7d378a1752611508007a77d4ca39a5af # ===================================== """ A module for project-specific task registration. @@ -20,14 +20,9 @@ def audit_local_tasks() -> None: """Ensure that shared task infrastructure is present.""" local = Path(__file__).parent.joinpath("mklocal") - - # Also link a top-level file. top_level = local.parent.parent.joinpath("mklocal") - if not top_level.is_symlink(): - assert not top_level.exists() - top_level.symlink_to(local) - if local.is_symlink(): + if local.is_symlink() and top_level.is_symlink(): return # If it's not a symlink, it shouldn't be any other kind of file. @@ -48,6 +43,11 @@ def audit_local_tasks() -> None: # Create the link. local.symlink_to(vmklib) + # Also link a top-level file. + if not top_level.is_symlink(): + assert not top_level.exists() + top_level.symlink_to(local) + def register( manager: TaskManager, diff --git a/vmklib/__init__.py b/vmklib/__init__.py index 8443b61..467fc55 100644 --- a/vmklib/__init__.py +++ b/vmklib/__init__.py @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.3 +# version=3.1.4 # hash=323a37ac953da26ff2b3ae5654e60ac6 # ===================================== diff --git a/vmklib/__main__.py b/vmklib/__main__.py index 2d57e42..e0992dc 100644 --- a/vmklib/__main__.py +++ b/vmklib/__main__.py @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.3 +# version=3.1.4 # hash=e3b25ef71e1382c4879938c082dd3893 # ===================================== """ diff --git a/vmklib/data/data/header.mk b/vmklib/data/data/header.mk index 1e61d9d..fa9db81 100644 --- a/vmklib/data/data/header.mk +++ b/vmklib/data/data/header.mk @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.3 +# version=3.1.4 # hash=22a8a762623587d443724e0f1a2a9ee4 # ===================================== ############################################################################### diff --git a/vmklib/entry.py b/vmklib/entry.py index da5ade5..a9f1612 100644 --- a/vmklib/entry.py +++ b/vmklib/entry.py @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.3 +# version=3.1.4 # hash=745689313e0947f30ccf35892bb72cd4 # =====================================