partis-pyproj 0.1.4__py3-none-any.whl → 0.1.5__py3-none-any.whl

{partis_pyproj-0.1.4.data → partis_pyproj-0.1.5.data}/purelib/partis/pyproj/pptoml.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import re
 from packaging.requirements import Requirement
 from packaging.specifiers import SpecifierSet
@@ -50,9 +51,9 @@ from .pep import (
   norm_dist_classifier,
   norm_dist_url )
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class dynamic(valid_list):
-  _value_valid = restrict(
+  value_valid = restrict(
     'version',
     'description',
     'readme',
@@ -70,116 +71,116 @@ class dynamic(valid_list):
     'gui-scripts',
     'entry-points' )
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class readme(valid_dict):
   # a string at top-level interpreted as a path to the readme file
-  _proxy_key = 'file'
-  _allow_keys = list()
-  _min_keys = [
+  proxy_key = 'file'
+  allow_keys = list()
+  min_keys = [
     ('file', 'text')]
-  _mutex_keys = [
+  mutex_keys = [
     ('file', 'text')]
-  _default = {
+  default = {
     # NOTE: file paths should initially be given as a POSIX path,
     # but converted to current OS path so it may be read.
     'file': valid(OPTIONAL, PurePosixPath, Path),
     'text': valid(OPTIONAL, nonempty_str, norm_printable) }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class license(valid_dict):
-  _allow_keys = list()
-  _min_keys = [
+  allow_keys = list()
+  min_keys = [
     ('file', 'text')]
-  _default = {
+  default = {
     'file': valid(OPTIONAL, PurePosixPath, Path),
     'text': valid(OPTIONAL, nonempty_str, norm_printable) }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class author(valid_dict):
-  _validator = valid(norm_dist_author_dict)
-  _allow_keys = list()
-  _min_keys = [
+  validator = valid(norm_dist_author_dict)
+  allow_keys = list()
+  min_keys = [
     ('name', 'email')]
-  _default = {
+  default = {
     'name': valid(str),
     'email': valid(str) }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class authors(valid_list):
-  _value_valid = valid(author)
+  value_valid = valid(author)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class maintainer(author):
   pass
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class maintainers(valid_list):
-  _value_valid = valid(maintainer)
+  value_valid = valid(maintainer)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class dependencies(valid_list):
-  _value_valid = valid(norm_printable, Requirement, str)
+  value_valid = valid(norm_printable, Requirement, str)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class optional_dependency_group(dependencies):
   pass
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class optional_dependencies(valid_dict):
-  _key_valid = valid(norm_dist_extra)
-  _value_valid = valid(optional_dependency_group)
+  key_valid = valid(norm_dist_extra)
+  value_valid = valid(optional_dependency_group)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class entry_point_group(valid_dict):
-  _key_valid = valid(norm_entry_point_name)
-  _value_valid = valid(norm_entry_point_ref)
+  key_valid = valid(norm_entry_point_name)
+  value_valid = valid(norm_entry_point_ref)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class scripts(entry_point_group):
   pass
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class gui_scripts(entry_point_group):
   pass
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class entry_points(valid_dict):
-  _key_valid = valid(norm_entry_point_group)
-  _value_valid = valid(entry_point_group)
+  key_valid = valid(norm_entry_point_group)
+  value_valid = valid(entry_point_group)
 
   # PEP 621
   # > Build back-ends MUST raise an error if the metadata defines a
   # > [project.entry-points.console_scripts] or [project.entry-points.gui_scripts]
   # > table, as they would be ambiguous in the face of [project.scripts]
   # > and [project.gui-scripts], respectively.
-  _forbid_keys = [
+  forbid_keys = [
     'scripts',
     'console_scripts',
     'gui-scripts',
     'gui_scripts' ]
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class keywords(valid_list):
-  _value_valid = valid(norm_dist_keyword)
+  value_valid = valid(norm_dist_keyword)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class classifiers(valid_list):
-  _value_valid = valid(norm_dist_classifier)
+  value_valid = valid(norm_dist_classifier)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def norm_dist_url_item(kv):
   return norm_dist_url(*kv)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class urls(valid_dict):
-  _item_valid = valid(norm_dist_url_item)
+  item_valid = valid(norm_dist_url_item)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class project(valid_dict):
-  _allow_keys = list()
-  _require_keys = [
+  allow_keys = list()
+  require_keys = [
     'name']
-  _default = {
+  default = {
     'dynamic': dynamic,
     'name': valid(valid_dist_name),
     'version': valid('0.0.0', norm_dist_version),
@@ -200,65 +201,69 @@ class project(valid_dict):
     'gui-scripts': valid(gui_scripts),
     'entry-points': valid(entry_points) }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class build_requires(dependencies):
   pass
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class path_parts(valid_list):
-  _value_valid = valid(nonempty_str)
+  value_valid = valid(nonempty_str)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class build_system(valid_dict):
-  _allow_keys = list()
-  _require_keys = [
+  allow_keys = list()
+  require_keys = [
     'build-backend']
-  _default = {
+  default = {
     'requires': build_requires,
     'build-backend': norm_entry_point_ref,
     'backend-path': valid(OPTIONAL_NONE, path_parts) }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def compat_tag(v):
   return CompatibilityTags(*v)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class compat_tags(valid_list):
   _as_list = valid(as_list)
   _min_len = 1
-  _value_valid = valid(compat_tag)
+  value_valid = valid(compat_tag)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_prep(valid_dict):
-  _allow_keys = list()
-  _require_keys = [
+  allow_keys = list()
+  require_keys = [
     'entry' ]
-  _default = {
+  default = {
     'entry': norm_entry_point_ref,
     'kwargs': dict }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_dist_prep(pyproj_prep):
   pass
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_dist_source_prep(pyproj_prep):
   pass
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_dist_binary_prep(pyproj_prep):
   pass
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_build_target(valid_dict):
-  _allow_keys = list()
-  _require_keys = [
+  allow_keys = list()
+  require_keys = [
     'entry' ]
-  _deprecate_keys = [('compile', 'enabled')]
-  _default = {
+  deprecate_keys = [
+    # name changed to be more general
+    ('compile', 'enabled')]
+  default = {
     'enabled': valid(True, marker_evaluated),
+    # NOTE: default builder from backward compatibility
     'entry': valid('partis.pyproj.builder:meson', norm_entry_point_ref),
     'options': dict,
+    'env': dict,
     # NOTE: paths should start as POSIX, but transformed to current OS
     'work_dir': valid('.', PurePosixPath, Path),
     'src_dir': valid('.', PurePosixPath, Path),
@@ -269,7 +274,7 @@ class pyproj_build_target(valid_dict):
     'install_args': nonempty_str_list,
     'build_clean': valid(True, norm_bool) }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_meson(valid_dict):
   """
 
@@ -277,8 +282,8 @@ class pyproj_meson(valid_dict):
     Replaced by more general :class:`pyproj_build_target`
 
   """
-  _allow_keys = list()
-  _default = {
+  allow_keys = list()
+  default = {
     'compile': valid(False, norm_bool),
     'src_dir': valid('.', nonempty_str, norm_path, norm_path_to_os),
     'build_dir': valid('build/meson', nonempty_str, norm_path, norm_path_to_os),
@@ -289,48 +294,48 @@ class pyproj_meson(valid_dict):
     'options': dict,
     'build_clean': valid(True, norm_bool) }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_targets(valid_list):
   _as_list = valid(as_list)
-  _value_valid = valid(pyproj_build_target)
+  value_valid = valid(pyproj_build_target)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class ignore_list(valid_list):
   _as_list = valid(as_list)
-  _value_valid = valid(nonempty_str)
+  value_valid = valid(nonempty_str)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class glob_list(valid_list):
   _as_list = valid(as_list)
-  _value_valid = valid(nonempty_str)
+  value_valid = valid(nonempty_str)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class include(valid_dict):
-  _allow_keys = list()
+  allow_keys = list()
   # a string at top-level interpreted as 'match'
-  _proxy_key = 'glob'
+  proxy_key = 'glob'
   # TODO: how to normalize patterns?
-  _default = {
+  default = {
     'glob': valid(nonempty_str),
     'rematch': valid(r'.*', nonempty_str, re.compile),
     'replace': valid('{0}', nonempty_str)}
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class include_list(valid_list):
   _as_list = valid(as_list)
-  _value_valid = valid(include)
+  value_valid = valid(include)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_dist_copy(valid_dict):
   # a string at top-level interpreted as 'src'
-  _proxy_key = 'src'
+  proxy_key = 'src'
   # take 'dst' from 'src' if not set
-  _proxy_keys = [('dst', 'src')]
-  _deprecate_keys = [('glob', 'include')]
-  _allow_keys = list()
-  _min_keys = [
+  proxy_keys = [('dst', 'src')]
+  deprecate_keys = [('glob', 'include')]
+  allow_keys = list()
+  min_keys = [
     ('src', 'glob') ]
-  _default = {
+  default = {
     # NOTE: file paths should initially be given as a POSIX path,
     # but converted to current OS path so it may be read.
     'src': valid(REQUIRED, PurePosixPath, Path),
@@ -339,21 +344,21 @@ class pyproj_dist_copy(valid_dict):
     'include': include_list,
     'ignore': ignore_list }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_dist_copy_list(valid_list):
-  _value_valid = valid(pyproj_dist_copy)
+  value_valid = valid(pyproj_dist_copy)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_dist_scheme(valid_dict):
-  _allow_keys = list()
-  _default = {
+  allow_keys = list()
+  default = {
     'ignore': ignore_list,
     'copy': pyproj_dist_copy_list }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_dist_binary(valid_dict):
-  _allow_keys = list()
-  _default = {
+  allow_keys = list()
+  default = {
     'build_number': valid(OPTIONAL_NONE, int),
     'build_suffix': valid(OPTIONAL_NONE, str),
     'compat_tags': valid(purelib_compat_tags(), compat_tags),
@@ -366,52 +371,52 @@ class pyproj_dist_binary(valid_dict):
     'purelib': pyproj_dist_scheme,
     'platlib': pyproj_dist_scheme }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_dist_source(valid_dict):
-  _allow_keys = list()
-  _default = {
+  allow_keys = list()
+  default = {
     'prep': valid(OPTIONAL, pyproj_dist_source_prep),
     'ignore': ignore_list,
     'copy': pyproj_dist_copy_list,
     'add_legacy_setup': valid(False, norm_bool) }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_dist(valid_dict):
-  _allow_keys = list()
-  _default = {
+  allow_keys = list()
+  default = {
     'prep': valid(OPTIONAL, pyproj_dist_prep),
     'ignore': ignore_list,
     'source': pyproj_dist_source,
     'binary': pyproj_dist_binary }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj_config(valid_dict):
-  _key_valid = valid(norm_dist_extra)
-  _value_valid = union(scalar, scalar_list)
+  key_valid = valid(norm_dist_extra)
+  value_valid = union(scalar, scalar_list)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pyproj(valid_dict):
-  _allow_keys = list()
-  _default = {
+  allow_keys = list()
+  default = {
     'config': pyproj_config,
     'prep': valid(OPTIONAL, pyproj_prep),
     'dist': pyproj_dist,
     'targets': pyproj_targets }
-  _deprecate_keys = [('meson', 'targets')]
+  deprecate_keys = [('meson', 'targets')]
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class tool(valid_dict):
-  _require_keys = ['pyproj']
-  _default = {
+  require_keys = ['pyproj']
+  default = {
     'pyproj': pyproj }
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class pptoml(valid_dict):
-  _allow_keys = list()
-  _require_keys = [
+  allow_keys = list()
+  require_keys = [
     'project',
     'build-system']
-  _default = {
+  default = {
     'project': valid(REQUIRED, project),
     'build-system': valid(REQUIRED, build_system),
     'tool': valid(OPTIONAL, tool) }

{partis_pyproj-0.1.4.data → partis_pyproj-0.1.5.data}/purelib/partis/pyproj/pyproj.py

@@ -1,8 +1,11 @@
+from __future__ import annotations
 import os
 import os.path as osp
 import sys
 import shutil
-import logging
+from logging import (
+  getLogger,
+  Logger)
 import tempfile
 from copy import copy, deepcopy
 from collections.abc import (
@@ -27,7 +30,6 @@ except ImportError:
 from .pkginfo import (
   PkgInfoReq,
   PkgInfo )
-
 from .validate import (
   ValidationWarning,
   ValidationError,
@@ -38,17 +40,16 @@ from .validate import (
   valid,
   restrict,
   mapget )
-
 from .norms import (
   scalar_list,
   norm_bool,
   norm_path_to_os,
   norm_path )
-
 from .pep import (
   purelib_compat_tags,
   platlib_compat_tags )
-
+from .path import (
+  resolve)
 from .load_module import (
   EntryPointError,
   EntryPoint,
@@ -68,7 +69,7 @@ from .builder import (
 from .dist_file import (
   dist_copy )
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class PyProjBase:
   """Minimal build system for a Python project
 
@@ -77,21 +78,21 @@ class PyProjBase:
 
   Parameters
   ----------
-  root : str | pathlib.Path
+  root :
     Path to the root project directory containing 'pyproject.toml'.
-  logger : logging.Logger
+  logger :
     Parent logger to use when processing project.
 
   """
   #-----------------------------------------------------------------------------
   def __init__( self, *,
-    root,
-    config_settings = None,
-    logger = None ):
+    root: Path,
+    config_settings: dict|None = None,
+    logger: Logger|None = None ):
 
-    self.logger = logger or logging.getLogger( __name__ )
+    self.logger = logger or getLogger( __name__ )
 
-    self.root = Path(root).resolve()
+    self.root = resolve(Path(root))
 
     self.pptoml_file = self.root / 'pyproject.toml'
 
@@ -117,6 +118,7 @@ class PyProjBase:
 
     #...........................................................................
     # construct a validator from the tool.pyproj.config table
+    # NOTE: only really used in the event that "config_settings" are passed to the backend
     config_default = dict()
 
     for k,v in self.pyproj.config.items():
@@ -129,14 +131,12 @@ class PyProjBase:
       else:
         config_default[k] = valid(v, type(v))
 
-    class valid_config(valid_dict):
-      _allow_keys = list()
-      _default = config_default
+    class valid_config_settings(valid_dict):
+      allow_keys = list()
+      default = config_default
 
     with validating( key = 'config_settings' ):
-      _config_settings = valid_config(config_settings or dict())
-
-      self.pyproj.config = _config_settings
+      self._config_settings = valid_config_settings(config_settings or dict())
 
     #...........................................................................
     self.build_backend = mapget( self.pptoml,
@@ -196,10 +196,10 @@ class PyProjBase:
 
   #-----------------------------------------------------------------------------
   @property
-  def config(self):
-    """:class:`partis.pyproj.pptoml.pyproj_config`
+  def config_settings(self):
+    """Config settings passed to backend, or defaults from ``pyproj.config``
     """
-    return self._pptoml.tool.pyproj.config
+    return self._config_settings
 
   #-----------------------------------------------------------------------------
   @property
@@ -297,9 +297,9 @@ class PyProjBase:
     dynamic = project.dynamic
 
     self.prep_entrypoint(
-      name = f"tool.pyproj.prep",
+      name = "tool.pyproj.prep",
       obj = self.pyproj,
-      logger = self.logger.getChild( f"prep" ) )
+      logger = self.logger.getChild("prep") )
 
     # NOTE: check that any dynamic meta-data is defined after prep
     for k in dynamic:
@@ -327,9 +327,9 @@ class PyProjBase:
     """
 
     self.prep_entrypoint(
-      name = f"tool.pyproj.dist.prep",
+      name = "tool.pyproj.dist.prep",
       obj = self.dist,
-      logger = self.logger.getChild( f"dist.prep" ) )
+      logger = self.logger.getChild("dist.prep") )
 
 
   #-----------------------------------------------------------------------------
@@ -338,9 +338,9 @@ class PyProjBase:
     """
 
     self.prep_entrypoint(
-      name = f"tool.pyproj.dist.source.prep",
+      name = "tool.pyproj.dist.source.prep",
       obj = self.dist.source,
-      logger = self.logger.getChild( f"dist.source.prep" ) )
+      logger = self.logger.getChild("dist.source.prep") )
 
   #-----------------------------------------------------------------------------
   def dist_source_copy( self, *, dist ):
@@ -352,7 +352,7 @@ class PyProjBase:
       Builder used to write out source distribution files
     """
 
-    with validating( key = f'tool.pyproj.dist.source' ):
+    with validating( key = 'tool.pyproj.dist.source'):
       dist_copy(
         base_path = dist.named_dirs['root'],
         include = self.source.copy,
@@ -362,9 +362,9 @@ class PyProjBase:
         logger = self.logger )
 
       if self.add_legacy_setup:
-        with validating( key = f'add_legacy_setup' ):
+        with validating(key = 'add_legacy_setup'):
 
-          self.logger.info(f"generating legacy 'setup.py'")
+          self.logger.info("generating legacy 'setup.py'")
           legacy_setup_content( self, dist )
 
   #-----------------------------------------------------------------------------
@@ -372,16 +372,19 @@ class PyProjBase:
     """Prepares project files for a binary distribution
     """
 
-    with Builder(
+    builder = Builder(
       pyproj = self,
       root = self.root,
       targets = self.targets,
-      logger = self.logger.getChild( f"targets" ) ):
+      logger = self.logger.getChild("targets"))
+
+    with builder:
+      builder.build_targets()
 
       self.prep_entrypoint(
-        name = f"tool.pyproj.dist.binary.prep",
+        name = "tool.pyproj.dist.binary.prep",
         obj = self.binary,
-        logger = self.logger.getChild( f"dist.binary.prep" ) )
+        logger = self.logger.getChild("dist.binary.prep") )
 
     self.logger.debug(f"Compatibility tags after dist.binary.prep: {self.binary.compat_tags}")
 
@@ -396,7 +399,7 @@ class PyProjBase:
     """
 
 
-    with validating( key = f'tool.pyproj.dist.binary' ):
+    with validating(key = 'tool.pyproj.dist.binary'):
       ignore = self.dist.ignore + self.dist.binary.ignore
 
       dist_copy(