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

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

@@ -1,5 +1,5 @@
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 from .validate import (
   ValidationError,
   ValidationWarning,
@@ -10,6 +10,7 @@ from .validate import (
   as_list )
 
 from .norms import (
+  marker_evaluated,
   scalar,
   scalar_list,
   empty_str,
@@ -59,6 +60,13 @@ from .path import (
   combine_ignore_patterns,
   contains )
 
+from .template import (
+  Template,
+  Namespace,
+  template_substitute,
+  TemplateError,
+  NamespaceError)
+
 from .dist_file import (
   dist_base,
   dist_zip,

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

@@ -15,7 +15,7 @@ import tempfile
 from argparse import RawTextHelpFormatter
 logger = logging.getLogger(__name__)
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def egg_info( args ):
 
   logger.warning(
@@ -26,13 +26,13 @@ def egg_info( args ):
   if not dir.exists():
     dir.mkdir(parents=True, exist_ok = True)
 
-  with open(dir.joinpath('PKG-INFO'), 'wb' ) as fp:  
+  with open(dir.joinpath('PKG-INFO'), 'wb' ) as fp:
     fp.write( PKG_INFO )
 
-  with open( dir.joinpath('setup_requires.txt'), 'wb' ) as fp: 
+  with open( dir.joinpath('setup_requires.txt'), 'wb' ) as fp:
     fp.write( b'' )
 
-  with open( dir.joinpath('requires.txt'), 'wb' ) as fp: 
+  with open( dir.joinpath('requires.txt'), 'wb' ) as fp:
     fp.write( REQUIRES )
 
   with open( dir.joinpath('SOURCES.txt'), 'wb' ) as fp:
@@ -50,7 +50,7 @@ def egg_info( args ):
   with open( dir.joinpath('not-zip-safe'), 'wb' ) as fp:
     fp.write( b'' )
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def bdist_wheel( args ):
 
   logger.warning(
@@ -63,7 +63,7 @@ def bdist_wheel( args ):
   backend.build_wheel(
     wheel_directory = args.dist_dir or args.bdist_dir or '.' )
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def install( args ):
 
   logger.warning(
@@ -91,13 +91,13 @@ def install( args ):
       '-m',
       'pip',
       'install',
-      tmpdir.joinpath(wheel_name) ]) 
+      tmpdir.joinpath(wheel_name) ])
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def dummy( args ):
   pass
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def main():
 
   logging.basicConfig(
@@ -185,7 +185,7 @@ def main():
   args.func( args )
 
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 # NOTE: these are templated literal values substituded by the backend when
 # building the source distribution
 
@@ -205,7 +205,7 @@ TOP_LEVEL = {top_level}
 
 ENTRY_POINTS = {entry_points}
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 
 if __name__ == "__main__":
   exit( main() )

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

@@ -1,7 +1,8 @@
+from __future__ import annotations
 import sys
 import re
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def _gen_nonprintable():
   test = ''
 
@@ -28,7 +29,7 @@ def _gen_nonprintable():
 
   return ns, test
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def gen_nonprintable():
   """Method used to generate a regex for matchiing all non-printable unicode
   characters, except for newlines '\\n' and tabs '\\t'.
@@ -79,6 +80,6 @@ def gen_nonprintable():
 
   return nonprintable
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 if __name__ == '__main__':
   print( gen_nonprintable() )

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

@@ -1,8 +1,13 @@
+from __future__ import annotations
 import os
 import os.path as osp
 import sys
 import shutil
 import logging
+from logging import (
+  basicConfig,
+  getLogger,
+  Logger)
 import tempfile
 import re
 
@@ -24,34 +29,18 @@ from . import (
   dist_binary_wheel,
   dist_source_targz )
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-class UnsupportedOperation( Exception ):
-  """
-  Note
-  ----
-  If the backend cannot produce an dist because a dependency is missing,
-  or for another well understood reason, it should raise an exception of a
-  specific type which it makes available as UnsupportedOperation on the
-  backend object.
-
-  See Also
-  --------
-  * https://www.python.org/dev/peps/pep-0517/
-  """
-  pass
-
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def backend_init(
-  root = '.',
-  config_settings = None,
-  logger = None ):
+  root: str|Path = '',
+  config_settings: dict|None = None,
+  logger: Logger|None = None ):
   """Called to inialialize the backend upon a call to one of the hooks
 
   Parameters
   ----------
-  root : str | pathlib.Path
+  root :
     Directory containing 'pyproject.toml'
-  logger : :class:`logging.Logger`
+  logger :
     Logger to use
 
   Returns
@@ -59,28 +48,30 @@ def backend_init(
   PyProjBase
   """
 
-  logger = logger or logging.getLogger( __name__ )
-
-  pyproj = PyProjBase(
-    root = root,
-    config_settings = config_settings,
-    logger = logger )
-
   # NOTE: this is mainly used for debugging, since front-ends don't seem to have
   # an option to set logging level for the backend.
-  root = logging.getLogger()
-  if not root.handlers:
-    logging.basicConfig(
+  root_logger = getLogger()
+
+  if not root_logger.handlers:
+    basicConfig(
       level = logging.INFO,
       format = "{message}",
       style = "{" )
 
+  root = Path(root)
+  logger = logger or getLogger( __name__ )
+
+  pyproj = PyProjBase(
+    root = root,
+    config_settings = config_settings,
+    logger = logger )
+
   return pyproj
 
 
 #-----------------------------------------------------------------------------
 def get_requires_for_build_sdist(
-  config_settings = None ):
+  config_settings: dict|None = None ):
   """
   Note
   ----
@@ -99,7 +90,7 @@ def get_requires_for_build_sdist(
 #-----------------------------------------------------------------------------
 def build_sdist(
   dist_directory,
-  config_settings = None ):
+  config_settings: dict|None = None ):
   """
   Note
   ----
@@ -130,7 +121,7 @@ def build_sdist(
 
 #-----------------------------------------------------------------------------
 def get_requires_for_build_wheel(
-  config_settings = None ):
+  config_settings: dict|None = None ):
   """
   Note
   ----
@@ -169,7 +160,7 @@ def get_requires_for_build_wheel(
 #-----------------------------------------------------------------------------
 def prepare_metadata_for_build_wheel(
   metadata_directory,
-  config_settings = None ):
+  config_settings: dict|None = None ):
   """
   Note
   ----
@@ -204,7 +195,7 @@ def prepare_metadata_for_build_wheel(
 #-----------------------------------------------------------------------------
 def build_wheel(
   wheel_directory,
-  config_settings = None,
+  config_settings: dict|None = None,
   metadata_directory = None ):
   """
   Note
@@ -255,3 +246,19 @@ def build_wheel(
 #   config_settings = None,
 #   metadata_directory = None ):
 #   pass
+
+#===============================================================================
+class UnsupportedOperation( Exception ):
+  """
+  Note
+  ----
+  If the backend cannot produce an dist because a dependency is missing,
+  or for another well understood reason, it should raise an exception of a
+  specific type which it makes available as UnsupportedOperation on the
+  backend object.
+
+  See Also
+  --------
+  * https://www.python.org/dev/peps/pep-0517/
+  """
+  pass

partis_pyproj-0.1.6.data/purelib/partis/pyproj/builder/builder.py

@@ -0,0 +1,351 @@
+from __future__ import annotations
+import os
+import os.path as osp
+import sys
+import sysconfig
+import re
+from copy import copy
+import shutil
+import subprocess
+from logging import Logger
+from pathlib import Path
+
+from ..file import tail
+from ..validate import (
+  validating,
+  ValidationError,
+  ValidPathError,
+  FileOutsideRootError )
+
+from ..load_module import EntryPoint
+
+from ..path import (
+  subdir,
+  resolve)
+
+from ..template import (
+  template_substitute,
+  Namespace)
+from ..pptoml import pyproj_targets
+
+ERROR_REC = re.compile(r"error:", re.I)
+
+#===============================================================================
+class BuildCommandError(ValidationError):
+  pass
+
+#===============================================================================
+class Builder:
+  """Run build setup, compile, install commands
+
+  Parameters
+  ----------
+  root:
+    Path to root project directory
+  targets:
+  logger:
+
+  """
+  #-----------------------------------------------------------------------------
+  def __init__(self,
+    pyproj,
+    root: str | Path,
+    targets: pyproj_targets,
+    logger: Logger):
+
+    root = resolve(Path(root))
+
+    self.pyproj = pyproj
+    self.root = root
+    # isolate (shallow) changes to targets
+    self.targets = [copy(v) for v in targets]
+    self.clean_dirs = [False]*len(self.targets)
+    self.logger = logger
+    self.namespace = Namespace({
+      'root': root,
+      'pptoml': pyproj.pptoml,
+      'project': pyproj.project,
+      'pyproj': pyproj.pyproj,
+      'config_settings': pyproj.config_settings,
+      'targets': targets,
+      'env': os.environ,
+      'config_vars': sysconfig.get_config_vars()},
+      root=root)
+
+  #-----------------------------------------------------------------------------
+  def __enter__(self):
+    return self
+
+  #-----------------------------------------------------------------------------
+  def __exit__(self, type, value, traceback):
+    self.build_clean()
+
+    # do not handle any exceptions here
+    return False
+
+  #-----------------------------------------------------------------------------
+  def build_targets(self):
+    for i, target in enumerate(self.targets):
+      if not target.enabled:
+        self.logger.info(f"Skipping targets[{i}], disabled for environment markers")
+        continue
+
+      # each target isolated (shallow) changes to namespace
+      namespace = copy(self.namespace)
+
+      # check paths
+      for k in ('work_dir', 'src_dir', 'build_dir', 'prefix'):
+        with validating(key = f"tool.pyproj.targets[{i}].{k}"):
+          rel_path = target[k]
+          rel_path = template_substitute(rel_path, namespace)
+
+          if rel_path.is_absolute():
+            abs_path = rel_path
+          else:
+            abs_path = self.root/rel_path
+
+          abs_path = resolve(abs_path)
+
+          if not subdir(self.root, abs_path, check=False):
+            raise FileOutsideRootError(
+              f"Must be within project root directory:"
+              f"file = \"{abs_path}\",  root = \"{self.root}\"")
+
+          if k in ('build_dir', 'prefix') and subdir(abs_path, self.root, check=False):
+            raise ValidPathError(
+              f"'{k}' cannot be project root directory:"
+              f"file = \"{abs_path}\",  root = \"{self.root}\"")
+
+          target[k] = abs_path
+          namespace[k] = abs_path
+
+      src_dir = target.src_dir
+      build_dir = target.build_dir
+      prefix = target.prefix
+      work_dir = target.work_dir
+
+      with validating(key = f"tool.pyproj.targets[{i}].src_dir"):
+        if not src_dir.exists():
+          raise ValidPathError(f"Source directory not found: {src_dir}")
+
+        if not src_dir.is_dir():
+          raise ValidPathError(f"Source directory not a directory: {src_dir}")
+
+      with validating(key = f"tool.pyproj.targets[{i}]"):
+        if subdir(build_dir, prefix, check=False):
+          raise ValidPathError(
+            f"'prefix' cannot be inside 'build_dir', which will be cleaned: {build_dir} > {prefix}")
+
+      build_dirty = build_dir.exists() and any(build_dir.iterdir())
+
+      if target.build_clean and build_dirty:
+        raise ValidPathError(
+          f"'build_dir' is not empty, please remove manually."
+          f" If this was intended, set 'build_clean = false': {build_dir}")
+
+      # create output directories
+      for k in ['build_dir', 'prefix']:
+        with validating(key = f"tool.pyproj.targets[{i}].{k}"):
+          target[k].mkdir(parents=True, exist_ok=True)
+
+      with validating(key = f"tool.pyproj.targets[{i}].options"):
+        # original target options remain until evaluated
+        options = target.options
+
+        # top-level options updated in order of appearance
+        _options = {}
+        namespace['options'] = _options
+
+        for k,v in options.items():
+          v = template_substitute(v, namespace)
+          # update target
+          options[k] = v
+          # update
+          _options[k] = v
+
+      with validating(key = f"tool.pyproj.targets[{i}].env"):
+        # original target options remain until evaluated
+        env = target.env
+
+        # top-level options updated in order of appearance
+        # copy of environment dict, each target isolated changes
+        _env = copy(namespace['env'])
+        namespace['env'] = _env
+
+        for k,v in env.items():
+          v = template_substitute(v, namespace)
+          env[k] = v
+          _env[k] = v
+
+      for attr in ['setup_args', 'compile_args', 'install_args']:
+        with validating(key = f"tool.pyproj.targets[{i}].{attr}"):
+          value = target[attr]
+          value = template_substitute(value, namespace)
+
+          target[attr] = value
+          namespace[attr] = value
+
+      entry_point = EntryPoint(
+        pyproj = self,
+        root = self.root,
+        name = f"tool.pyproj.targets[{i}]",
+        logger = self.logger,
+        entry = target.entry)
+
+      log_dir = self.root/'build'/'logs'
+
+      log_dir.mkdir(parents=True, exist_ok=True)
+
+      runner = ProcessRunner(
+        logger=self.logger,
+        log_dir=log_dir,
+        target_name=f"target_{i:02d}",
+        env=_env)
+
+      self.logger.info('\n'.join([
+        f"targets[{i}]:",
+        f"  work_dir: {work_dir}",
+        f"  src_dir: {src_dir}",
+        f"  build_dir: {build_dir}",
+        f"  prefix: {prefix}",
+        f"  log_dir: {log_dir}",
+        "  options: " + ('\n' if target.options else 'none') + '\n'.join([
+          f"    {k}: {v}" for k,v in target.options.items()]),
+        "  env: " + ('\n' if target.env else 'default') + '\n'.join([
+          f"    {k}: {v}" for k,v in target.env.items()])]))
+
+      cwd = os.getcwd()
+
+      # allow cleaning once the target is validated
+      self.clean_dirs[i] = True
+
+      try:
+        os.chdir(work_dir)
+
+        entry_point(
+          options = target.options,
+          work_dir = work_dir,
+          src_dir = src_dir,
+          build_dir = build_dir,
+          prefix = prefix,
+          setup_args = target.setup_args,
+          compile_args = target.compile_args,
+          install_args = target.install_args,
+          build_clean = not build_dirty,
+          runner = runner)
+
+      finally:
+        os.chdir(cwd)
+
+  #-----------------------------------------------------------------------------
+  def build_clean(self):
+    for i, (target, clean) in enumerate(zip(self.targets, self.clean_dirs)):
+      if not clean:
+        continue
+
+      build_dir = target.build_dir
+
+      if build_dir is not None and build_dir.exists() and target.build_clean:
+        self.logger.info(f"Removing build dir: {build_dir}")
+        shutil.rmtree(build_dir)
+
+#===============================================================================
+class ProcessRunner:
+  #-----------------------------------------------------------------------------
+  def __init__(self,
+      logger,
+      log_dir: Path,
+      target_name: str,
+      env: dict):
+
+    self.logger = logger
+    self.log_dir = log_dir
+    self.target_name = target_name
+    self.commands = {}
+    self.env = env
+
+  #-----------------------------------------------------------------------------
+  def run(self, args: list, env: dict = None):
+    if len(args) == 0:
+      raise ValueError(f"Command for {self.target_name} is empty.")
+
+    cmd_exec = args[0]
+    cmd_exec_src = shutil.which(cmd_exec)
+
+    if cmd_exec_src is None:
+      raise ValueError(
+        f"Executable does not exist or has in-sufficient permissions: {cmd_exec}")
+
+    cmd_exec_src = resolve(Path(cmd_exec_src))
+    cmd_name = cmd_exec_src.name
+    args = [str(cmd_exec_src)]+args[1:]
+
+    cmd_hist = self.commands.setdefault(cmd_exec_src, [])
+    cmd_idx = len(cmd_hist)
+    cmd_hist.append(args)
+
+    run_name = re.sub(r'[^\w]+', "_", cmd_name)
+    run_id = f"{self.target_name}.{run_name}.{cmd_idx:02d}"
+
+    stdout_file = self.log_dir/f"{run_id}.log"
+
+    try:
+      self.logger.info(f"Running {run_id!r}: "+' '.join(args))
+
+      with open(stdout_file, 'wb') as fp:
+        subprocess.run(
+          args,
+          shell=False,
+          stdout=fp,
+          stderr=subprocess.STDOUT,
+          check=True,
+          env=self.env)
+
+    except subprocess.CalledProcessError as e:
+
+
+      num_windows = 20
+      window_size = 5
+      with open(stdout_file, 'rb') as fp:
+        lines = [
+          (lineno,line)
+          for lineno,line in enumerate(fp.read().decode('utf-8', errors='replace').splitlines())]
+
+      suspect_linenos = [
+        lineno
+        for lineno,line in lines
+        if ERROR_REC.search(line)]
+
+      # suspect_linenos = suspect_linenos[:num_windows]
+
+      extra = [
+        '\n'.join(
+          [f"{'':-<70}",f"{'':>4}⋮"]
+          +[f"{j:>4d}| {line}" for j,line in lines[i:i+window_size]]
+          +[f"{'':>4}⋮"])
+        for i in suspect_linenos]
+
+      m = len(lines)-num_windows
+
+      if suspect_linenos:
+        m = max(m, suspect_linenos[-1])
+
+      last_lines = lines[m:]
+
+      if last_lines:
+        extra += [
+          f"{'':-<70}",
+          f"Last {len(last_lines)} lines of command output:",
+          f"{'':>4}⋮"]
+
+        extra += [
+          f"{j:>4d}| {line}"
+          for j,line in last_lines]
+
+      extra += [
+        f"{'END':>4}| [See log file: {stdout_file}]",
+        f"{'':-<70}",]
+
+      raise BuildCommandError(
+        str(e),
+        extra='\n'.join(extra)) from None

{partis_pyproj-0.1.4.data → partis_pyproj-0.1.6.data}/purelib/partis/pyproj/builder/cargo.py

@@ -13,7 +13,7 @@ from ..validate import (
   ValidPathError,
   FileOutsideRootError )
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def cargo(
   pyproj: PyProjBase,
   logger: Logger,
@@ -31,7 +31,7 @@ def cargo(
   """
 
   if not shutil.which('cargo'):
-    raise ValueError(f"The 'cargo' program not found.")
+    raise ValueError("The 'cargo' program not found.")
 
   if setup_args or install_args:
     raise ValueError(

{partis_pyproj-0.1.4.data → partis_pyproj-0.1.6.data}/purelib/partis/pyproj/builder/cmake.py

@@ -1,25 +1,19 @@
-import os
-import os.path as osp
-import tempfile
+from __future__ import annotations
 import shutil
-import subprocess
 
-from ..validate import (
-  validating,
-  ValidationError,
-  ValidPathError,
-  FileOutsideRootError )
-
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def cmake_option_arg(k, v):
   """Convert python key-value pair to cmake ``-Dkey=value`` option
   """
+  typename = ''
+
   if isinstance(v, bool):
+    typename = ':BOOL'
     v = ({True: 'ON', False: 'OFF'})[v]
 
-  return f'-D{k}={v}'
+  return f'-D{k}{typename}={v}'
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def cmake(
   pyproj,
   logger,
@@ -50,10 +44,10 @@ def cmake(
   """
 
   if not shutil.which('cmake'):
-    raise ValueError(f"The 'cmake' program not found.")
+    raise ValueError("The 'cmake' program not found.")
 
   if not shutil.which('ninja'):
-    raise ValueError(f"The 'ninja' program not found.")
+    raise ValueError("The 'ninja' program not found.")
 
   # TODO: ensure any paths in setup_args are normalized
   if not build_clean: