proj-flow 0.11.0__tar.gz → 0.11.2__tar.gz

{proj_flow-0.11.0 → proj_flow-0.11.2}/CHANGELOG.rst

@@ -4,6 +4,22 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+`0.11.2 <https://github.com/mzdun/proj-flow/compare/v0.11.1...v0.11.2>`_ (2025-02-19)
+=====================================================================================
+
+Bug Fixes
+---------
+
+- remove 'cov' from project template (`cb75e53 <https://github.com/mzdun/proj-flow/commit/cb75e5350b57aa9c9ceb8546580d0884ea54e437>`_)
+
+`0.11.1 <https://github.com/mzdun/proj-flow/compare/v0.11.0...v0.11.1>`_ (2025-02-19)
+=====================================================================================
+
+Bug Fixes
+---------
+
+- bring back base ext (git initial commit) (`3f97d0a <https://github.com/mzdun/proj-flow/commit/3f97d0a6407b26728f4e99bf8985600e8d41acae>`_)
+
 `0.11.0 <https://github.com/mzdun/proj-flow/compare/v0.10.0...v0.11.0>`_ (2025-02-09)
 =====================================================================================
 

{proj_flow-0.11.0 → proj_flow-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proj-flow
-Version: 0.11.0
+Version: 0.11.2
 Summary: C++ project maintenance, automated
 Project-URL: Changelog, https://github.com/mzdun/proj-flow/blob/main/CHANGELOG.rst
 Project-URL: Documentation, https://proj-flow.readthedocs.io/en/latest/

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/__init__.py

@@ -6,4 +6,4 @@ The **proj_flow** contains only ``__version__`` to be updated, nothing more.
 This is in an attempt to make this module easy to load initially.
 """
 
-__version__ = "0.11.0"
+__version__ = "0.11.2"

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/api/init.py

@@ -11,6 +11,9 @@ from proj_flow.api.env import Runtime
 
 
 class InitStep:
+    def priority(self):
+        return 100
+
     def platform_dependencies(self) -> List[str]:
         return []
 

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/base/registry.py

@@ -98,6 +98,7 @@ class Registry(typing.Generic[T]):
 
 _debug_copies: typing.List[Registry] = []
 
+
 def quoted(s: str) -> str:
     if '"' in s:
         return "'{}'".format(s.replace("\\", r"\\").replace("'", r"\'"))
@@ -105,6 +106,7 @@ def quoted(s: str) -> str:
         return '"{}"'.format(s)
     return s
 
+
 def verbose_info():
     for registry in _debug_copies:
         for item in registry.container:

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/ext/cplusplus/cmake/steps.py

@@ -11,7 +11,6 @@ from typing import Dict, List, cast
 
 from proj_flow import api
 from proj_flow.api import env, step
-
 from proj_flow.base.__cmake_version__ import CMAKE_VERSION
 
 

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/minimal/__init__.py

@@ -6,6 +6,6 @@ The **proj_flow.minimal** defines minimal extension package: ``bootstrap``
 and ``run`` commands, with basic set of steps.
 """
 
-from . import bootstrap, init, list, run, system
+from . import base, bootstrap, init, list, run, system
 
-__all__ = ["bootstrap", "init", "list", "run", "system"]
+__all__ = ["base", "bootstrap", "init", "list", "run", "system"]

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/minimal/base.py

@@ -6,10 +6,15 @@ The **proj_flow.minimal.base** provides basic initialization setup for all
 new projects.
 """
 
+import sys
+
 from proj_flow import __version__, api
 
 
 class GitInit(api.init.InitStep):
+    def priority(self):
+        return sys.maxsize
+
     def platform_dependencies(self):
         return ["git"]
 

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/minimal/init.py

@@ -104,5 +104,8 @@ def main(
         with open(".gitignore", "ab") as ignoref:
             ignoref.write("\n/.context.yaml\n".encode("UTF-8"))
 
-    for step in init.__steps:
+    current_project.append_extensions(context)
+
+    steps = sorted((step.priority(), i, step) for i, step in enumerate(init.__steps))
+    for _, _, step in steps:
         step.postprocess(rt, context)

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/project/api.py

@@ -33,6 +33,23 @@ class ProjectType(ABC):
     def get_context(self, interactive: bool, rt: env.Runtime):
         return interact.get_context(interactive, self.id, rt)
 
+    def append_extensions(self, context: dict):
+        extensions = self.get_extension_list(context)
+        if len(extensions) == 0:
+            return
+        text = "".join(f"\n  - {ext}" for ext in extensions)
+        text = f"extensions:{text}\n\n"
+
+        with open(".flow/config.yml", encoding="UTF-8") as config_file:
+            content = config_file.read()
+
+        with open(".flow/config.yml", "w", encoding="UTF-8") as config_file:
+            config_file.write(text)
+            config_file.write(content)
+
+    @abstractmethod
+    def get_extension_list(self, context: dict) -> List[str]: ...
+
 
 project_type = base.registry.Registry[ProjectType]("ProjectType")
 

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/project/cplusplus/__init__.py

@@ -7,4 +7,4 @@ The **proj_flow.project.cplusplus** registers a ``"C++"`` projects support.
 
 from proj_flow.project.cplusplus import cmake_context, conan_context
 
-__all__ = ["cmake_context", "conan_context"]
+__all__ = ["cmake_context", "conan_context"]

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/project/cplusplus/cmake_context.py

@@ -12,11 +12,10 @@ import uuid
 import chevron
 
 from proj_flow import api, project
+from proj_flow.base.__cmake_version__ import CMAKE_VERSION
 from proj_flow.project import data
 from proj_flow.project.cplusplus import project
 
-from proj_flow.base.__cmake_version__ import CMAKE_VERSION
-
 config_json_mustache = """
 {{#with_cmake}}
 cmake:
@@ -24,7 +23,6 @@ cmake:
     {{NAME_PREFIX}}_COVERAGE: "?config:coverage"
     {{NAME_PREFIX}}_SANITIZE: "?config:sanitizer"
     {{NAME_PREFIX}}_CUTDOWN_OS: "?runtime:cutdown_os"
-
 {{/with_cmake}}
 """
 
@@ -36,7 +34,7 @@ class CMakeInit(api.init.InitStep):
             return
 
         with open(".flow/config.yml", encoding="UTF-8") as config_file:
-            patched = re.split(r"(\nshortcuts:\n)", config_file.read())
+            patched = re.split(r"(\n\nshortcuts:\n)", config_file.read())
 
         if len(patched) != 3:
             return

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/project/cplusplus/conan_context.py

@@ -7,6 +7,4 @@ The **proj_flow.ext.cplusplus.conan** provides the ``"Conan"`` step.
 
 from proj_flow.project.cplusplus import project
 
-project.cxx.register_switch(
-    "with_conan", "Use Conan for dependency manager", True
-)
+project.cxx.register_switch("with_conan", "Use Conan for dependency manager", True)

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/project/cplusplus/project.py

@@ -7,10 +7,23 @@ The **proj_flow.project.cplusplus** registers a ``"C++"`` projects support.
 
 from proj_flow.project import api
 
+CPP_EXTENSIONS = [
+    "proj_flow.ext.cplusplus",
+    "proj_flow.ext.sign",
+    "proj_flow.ext.store",
+]
+
+
 @api.project_type.add
 class CPlusPlus(api.ProjectType):
     def __init__(self):
         super().__init__("C++ plus CMake plus Conan", "cxx")
 
+    def get_extension_list(self, context: dict):
+        with_github_actions = not not context.get("with_github_actions")
+        if with_github_actions:
+            return [*CPP_EXTENSIONS, "proj_flow.ext.github"]
+        return CPP_EXTENSIONS
+
 
 cxx = api.get_project_type("cxx")

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/template/layers/cmake/CMakeLists.txt.mustache

@@ -93,7 +93,7 @@ if (MSVC)
     /w14906
     /w14928
     /w14946)
-  if (COV_SANITIZE)
+  if ({{NAME_PREFIX}}_SANITIZE)
     list(APPEND {{NAME_PREFIX}}_ADDITIONAL_COMPILE_FLAGS
       /fsanitize=address
       /D_DISABLE_VECTOR_ANNOTATION
@@ -131,7 +131,7 @@ else()
       -Wuseless-cast
       )
   endif()
-  if (COV_SANITIZE)
+  if ({{NAME_PREFIX}}_SANITIZE)
     list(APPEND {{NAME_PREFIX}}_ADDITIONAL_COMPILE_FLAGS
       -fsanitize=address
       -fsanitize=undefined

{proj_flow-0.11.0 → proj_flow-0.11.2}/src/proj_flow/template/layers/cmake/src/version.hpp.in.mustache

@@ -19,7 +19,7 @@
 #define {{NAME_PREFIX}}_VERSION_PATCH @PROJECT_VERSION_PATCH@
 
 #ifndef RC_INVOKED
-namespace cov {
+namespace {{NAMESPACE}} {
 	struct version {
 		static constexpr char string[] = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@";  // NOLINT build/include_what_you_use and whitespace/line_length
 		static constexpr char string_short[] = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@";
@@ -31,6 +31,6 @@ namespace cov {
 		static constexpr unsigned minor = @PROJECT_VERSION_MINOR@;
 		static constexpr unsigned patch = @PROJECT_VERSION_PATCH@;
 	};
-}  // namespace cov
+}  // namespace {{NAMESPACE}}
 #endif
 // clang-format on