emcd-projects 1.16__tar.gz → 1.17__tar.gz

{emcd_projects-1.16 → emcd_projects-1.17}/.gitignore

@@ -4,3 +4,5 @@
 __pycache__/
 bugs/
 dist/
+CLAUDE.md
+codex.md

{emcd_projects-1.16 → emcd_projects-1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emcd-projects
-Version: 1.16
+Version: 1.17
 Summary: Project management utilities.
 Project-URL: Homepage, https://github.com/emcd/python-project-common
 Project-URL: Documentation, https://emcd.github.io/python-project-common

emcd_projects-1.17/data/copier/answers-default.yaml

@@ -0,0 +1,4 @@
+project_name: python-test-defaults
+distribution_name: emcdproj-defaults
+package_name: defaults
+description: 'All configuration options are defaults.'

emcd_projects-1.17/data/copier/answers-maximum.yaml

@@ -0,0 +1,14 @@
+project_name: python-test-maximum
+distribution_name: emcdproj-maximum
+package_name: maximum
+description: 'All configuration options set.'
+enable_rust_extension: true
+include_data_resources: true
+enable_property_tests: true
+enable_publication: true
+enable_cli: true
+enable_executables: true
+inject_foundations: true
+inject_exceptions: true
+inject_immutables: true
+inject_docstring_utils: true

{emcd_projects-1.16 → emcd_projects-1.17}/pyproject.toml

@@ -120,7 +120,6 @@ dependencies = [
   'pytest',
   'pytest-asyncio',
   'ruff',
-  'semgrep;platform_system!="Windows"', # https://github.com/returntocorp/semgrep/issues/1330
   'sphinx',
   'sphinx-copybutton',
   'sphinx-inline-tabs',
@@ -150,10 +149,6 @@ linters = [
   # --- BEGIN: Injected by Copier ---
   # --- END: Injected by Copier ---
   '''pyright sources''',
-  '''semgrep --config p/python --error --quiet --skip-unknown-extensions \
-     sources/emcdproj''',
-  # --- BEGIN: Injected by Copier ---
-  # --- END: Injected by Copier ---
 ]
 packagers = [
   '''hatch build''',

{emcd_projects-1.16 → emcd_projects-1.17}/sources/emcdproj/__/imports.py

@@ -25,14 +25,17 @@
 
 from __future__ import annotations
 
-import abc
-import collections.abc as cabc
-import contextlib as ctxl
-import json
-import math
-import os
-import shutil
-import types
+import                      abc
+import collections.abc as   cabc
+import contextlib as        ctxl
+import                      enum
+import                      io
+import                      json
+import                      math
+import                      os
+import                      shutil
+import                      sys
+import                      types
 
 from pathlib import Path
 

{emcd_projects-1.16 → emcd_projects-1.17}/sources/emcdproj/__init__.py

@@ -27,7 +27,7 @@ from . import exceptions
 # --- END: Injected by Copier ---
 
 
-__version__ = '1.16'
+__version__ = '1.17'
 
 
 def main( ):

{emcd_projects-1.16 → emcd_projects-1.17}/sources/emcdproj/cli.py

@@ -25,6 +25,7 @@ from __future__ import annotations
 
 from . import __
 from . import interfaces as _interfaces
+from . import template as _template
 from . import website as _website
 
 
@@ -34,7 +35,9 @@ class VersionCommand(
 ):
     ''' Prints version information. '''
 
-    async def __call__( self, auxdata: __.Globals ) -> None:
+    async def __call__(
+        self, auxdata: __.Globals, display: _interfaces.ConsoleDisplay
+    ) -> None:
         from . import __version__
         print( f"{__package__} {__version__}" )
         raise SystemExit( 0 )
@@ -48,8 +51,12 @@ class Cli(
 
     application: __.ApplicationInformation
     # configfile: __.typx.Optional[ str ] = None
-    # display: ConsoleDisplay
+    display: _interfaces.ConsoleDisplay
     command: __.typx.Union[
+        __.typx.Annotated[
+            _template.CommandDispatcher,
+            __.tyro.conf.subcommand( 'template', prefix_name = False ),
+        ],
         __.typx.Annotated[
             _website.CommandDispatcher,
             __.tyro.conf.subcommand( 'website', prefix_name = False ),
@@ -66,8 +73,8 @@ class Cli(
         async with __.ctxl.AsyncExitStack( ) as exits:
             auxdata = await _prepare( exits = exits, **nomargs )
             ictr( 0 )( self.command )
-            await self.command( auxdata = auxdata )
-            # await self.command( auxdata = auxdata, display = self.display )
+            # await self.command( auxdata = auxdata )
+            await self.command( auxdata = auxdata, display = self.display )
 
     def prepare_invocation_args(
         self,

{emcd_projects-1.16 → emcd_projects-1.17}/sources/emcdproj/interfaces.py

@@ -26,6 +26,46 @@ from __future__ import annotations
 from . import __
 
 
+class DisplayStreams( __.enum.Enum ): # TODO: Python 3.11: StrEnum
+    # TODO: Protected class attributes.
+    ''' Stream upon which to place output. '''
+
+    Stderr =    'stderr'
+    Stdout =    'stdout'
+
+
+class ConsoleDisplay(
+    metaclass = __.ImmutableDataclass,
+):
+    silence: __.typx.Annotated[
+        bool,
+        __.tyro.conf.arg(
+            aliases = ( '--quiet', '--silent', ), prefix_name = False ),
+    ] = False
+    file: __.typx.Annotated[
+        __.typx.Optional[ __.Path ],
+        __.tyro.conf.arg(
+            name = 'console-capture-file', prefix_name = False ),
+    ] = None
+    stream: __.typx.Annotated[
+        DisplayStreams,
+        __.tyro.conf.arg( name = 'console-stream', prefix_name = False ),
+    ] = DisplayStreams.Stderr
+
+    async def provide_stream( self ) -> __.io.TextIOWrapper:
+        ''' Provides output stream for display. '''
+        # TODO: register file stream as a process-lifetime exit
+        if self.file: return open( self.file, 'w' )
+        # TODO: async context manager for async file streams
+        # TODO: return async stream - need async printers
+        # TODO: handle non-TextIOWrapper streams
+        match self.stream:
+            case DisplayStreams.Stdout:
+                return __.sys.stdout # pyright: ignore[reportReturnType]
+            case DisplayStreams.Stderr:
+                return __.sys.stderr # pyright: ignore[reportReturnType]
+
+
 class CliCommand(
     __.typx.Protocol,
     metaclass = __.ImmutableProtocolDataclass,
@@ -34,7 +74,9 @@ class CliCommand(
     ''' CLI command. '''
 
     @__.abc.abstractmethod
-    async def __call__( self, auxdata: __.Globals ) -> None:
+    async def __call__(
+        self, auxdata: __.Globals, display: ConsoleDisplay
+    ) -> None:
         ''' Executes command with global state. '''
         raise NotImplementedError
 

emcd_projects-1.17/sources/emcdproj/template.py

@@ -0,0 +1,127 @@
+# vim: set filetype=python fileencoding=utf-8:
+# -*- coding: utf-8 -*-
+
+#============================================================================#
+#                                                                            #
+#  Licensed under the Apache License, Version 2.0 (the "License");           #
+#  you may not use this file except in compliance with the License.          #
+#  You may obtain a copy of the License at                                   #
+#                                                                            #
+#      http://www.apache.org/licenses/LICENSE-2.0                            #
+#                                                                            #
+#  Unless required by applicable law or agreed to in writing, software       #
+#  distributed under the License is distributed on an "AS IS" BASIS,         #
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  #
+#  See the License for the specific language governing permissions and       #
+#  limitations under the License.                                            #
+#                                                                            #
+#============================================================================#
+
+
+''' Copier template maintenance and validation. '''
+
+
+from __future__ import annotations
+
+import subprocess as _subprocess
+import tempfile as _tempfile
+
+from . import __
+from . import interfaces as _interfaces
+
+
+class CommandDispatcher(
+    _interfaces.CliCommand, decorators = ( __.standard_tyro_class, ),
+):
+    ''' Dispatches commands for static website maintenance. '''
+
+    command: __.typx.Union[
+        __.typx.Annotated[
+            SurveyCommand,
+            __.tyro.conf.subcommand( 'survey', prefix_name = False ),
+        ],
+        __.typx.Annotated[
+            ValidateCommand,
+            __.tyro.conf.subcommand( 'validate', prefix_name = False ),
+        ],
+    ]
+
+    async def __call__(
+        self, auxdata: __.Globals, display: _interfaces.ConsoleDisplay
+    ) -> None:
+        ictr( 1 )( self.command )
+        await self.command( auxdata = auxdata, display = display )
+
+
+class SurveyCommand(
+    _interfaces.CliCommand, decorators = ( __.standard_tyro_class, ),
+):
+    ''' Surveys available configuration variants. '''
+
+    async def __call__(
+        self, auxdata: __.Globals, display: _interfaces.ConsoleDisplay
+    ) -> None:
+        stream = await display.provide_stream( )
+        for variant in survey_variants( auxdata ):
+            print( variant, file = stream )
+
+
+class ValidateCommand(
+    _interfaces.CliCommand, decorators = ( __.standard_tyro_class, ),
+):
+    ''' Validates template against configuration variant. '''
+
+    variant: __.typx.Annotated[
+        str,
+        __.typx.Doc( ''' Configuration variant to validate. ''' ),
+        __.tyro.conf.Positional,
+    ]
+
+    async def __call__(
+        self, auxdata: __.Globals, display: _interfaces.ConsoleDisplay
+    ) -> None:
+        ''' Copies new project from template for configuration variant. '''
+        # TODO: Validate variant argument.
+        validate_variant( auxdata, self.variant )
+
+
+def copy_template( answers_file: __.Path, projectdir: __.Path ) -> None:
+    ''' Copies template to target directory using answers. '''
+    _subprocess.run( # noqa: S603
+        (   'copier', 'copy', '--data-file', str( answers_file ),
+            '--defaults', '--overwrite', '--vcs-ref', 'HEAD',
+            '.', str( projectdir ) ),
+        cwd = __.Path( ), check = True )
+
+
+def survey_variants( auxdata: __.Globals ) -> __.cabc.Sequence[ str ]:
+    ''' Surveys available configuration variants. '''
+    location = auxdata.distribution.provide_data_location( 'copier' )
+    return tuple(
+        fsent.stem.lstrip( 'answers-' )
+        for fsent in location.glob( 'answers-*.yaml' )
+        if fsent.is_file( ) )
+
+
+def validate_variant( auxdata: __.Globals, variant: str ) -> None:
+    ''' Validates configuration variant. '''
+    answers_file = (
+        auxdata.distribution.provide_data_location(
+            'copier', f"answers-{variant}.yaml" ) )
+    if not answers_file.is_file( ):
+        # TODO: Raise error.
+        return
+    with _tempfile.TemporaryDirectory( ) as tmpdir:
+        projectdir = __.Path( tmpdir ) / variant
+        copy_template( answers_file, projectdir )
+        validate_variant_project( projectdir )
+
+
+def validate_variant_project( projectdir: __.Path ) -> None:
+    ''' Validates standard project as generated from template. '''
+    for command in (
+        (   'hatch', '--env', 'develop', 'run',
+            'python', '-m', 'pip', 'install',
+            '--upgrade', 'pip', 'build' ),
+        (   'hatch', '--env', 'develop', 'run', 'make-all' ),
+    ): _subprocess.run( command, cwd = str( projectdir ), check = True ) # noqa: S603

{emcd_projects-1.16 → emcd_projects-1.17}/sources/emcdproj/website.py

@@ -33,8 +33,7 @@ from . import interfaces as _interfaces
 
 
 class CommandDispatcher(
-    _interfaces.CliCommand,
-    decorators = ( __.standard_tyro_class, ),
+    _interfaces.CliCommand, decorators = ( __.standard_tyro_class, ),
 ):
     ''' Dispatches commands for static website maintenance. '''
 
@@ -49,25 +48,27 @@ class CommandDispatcher(
         ],
     ]
 
-    async def __call__( self, auxdata: __.Globals ) -> None:
+    async def __call__(
+        self, auxdata: __.Globals, display: _interfaces.ConsoleDisplay
+    ) -> None:
         ictr( 1 )( self.command )
-        await self.command( auxdata = auxdata )
+        await self.command( auxdata = auxdata, display = display )
 
 
 class SurveyCommand(
-    _interfaces.CliCommand,
-    decorators = ( __.standard_tyro_class, ),
+    _interfaces.CliCommand, decorators = ( __.standard_tyro_class, ),
 ):
     ''' Surveys release versions published in static website. '''
 
-    async def __call__( self, auxdata: __.Globals ) -> None:
+    async def __call__(
+        self, auxdata: __.Globals, display: _interfaces.ConsoleDisplay
+    ) -> None:
         # TODO: Implement.
         pass
 
 
 class UpdateCommand(
-    _interfaces.CliCommand,
-    decorators = ( __.standard_tyro_class, ),
+    _interfaces.CliCommand, decorators = ( __.standard_tyro_class, ),
 ):
     ''' Updates static website for particular release version. '''
 
@@ -77,7 +78,9 @@ class UpdateCommand(
         __.tyro.conf.Positional,
     ]
 
-    async def __call__( self, auxdata: __.Globals ) -> None:
+    async def __call__(
+        self, auxdata: __.Globals, display: _interfaces.ConsoleDisplay
+    ) -> None:
         update( auxdata, self.version )