partis-pyproj 0.1.3rc4__py3-none-any.whl → 0.1.5__py3-none-any.whl

{partis_pyproj-0.1.3rc4.data → partis_pyproj-0.1.5.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,
@@ -31,7 +25,8 @@ def cmake(
   setup_args,
   compile_args,
   install_args,
-  build_clean ):
+  build_clean,
+  runner):
   """Run cmake configure and install commands
 
   Parameters
@@ -49,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:
@@ -87,13 +82,7 @@ def cmake(
 
 
   if setup_args:
-    logger.debug(' '.join(setup_args))
-    subprocess.check_call(setup_args)
-
-  logger.debug(' '.join(compile_args))
-
-  subprocess.check_call(compile_args)
-
-  logger.debug(' '.join(install_args))
+    runner.run(setup_args)
 
-  subprocess.check_call(install_args)
+  runner.run(compile_args)
+  runner.run(install_args)

{partis_pyproj-0.1.3rc4.data → partis_pyproj-0.1.5.data}/purelib/partis/pyproj/builder/meson.py

@@ -1,16 +1,8 @@
+from __future__ import annotations
 import os
-import os.path as osp
-import tempfile
 import shutil
-import subprocess
 
-from ..validate import (
-  validating,
-  ValidationError,
-  ValidPathError,
-  FileOutsideRootError )
-
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def meson_option_arg(k, v):
   """Convert python key-value pair to meson ``-Dkey=value`` option
   """
@@ -19,7 +11,7 @@ def meson_option_arg(k, v):
 
   return f'-D{k}={v}'
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def meson(
   pyproj,
   logger,
@@ -31,7 +23,8 @@ def meson(
   setup_args,
   compile_args,
   install_args,
-  build_clean ):
+  build_clean,
+  runner):
   """Run meson setup, compile, install commands
 
   Parameters
@@ -49,10 +42,10 @@ def meson(
   """
 
   if not shutil.which('meson'):
-    raise ValueError(f"The 'meson' program not found.")
+    raise ValueError("The 'meson' program not found.")
 
   if not shutil.which('ninja'):
-    raise ValueError(f"The 'ninja' program not found.")
+    raise ValueError("The 'ninja' program not found.")
 
   os.environ['MESON_FORCE_BACKTRACE'] = '1'
 
@@ -89,13 +82,7 @@ def meson(
 
 
   if setup_args:
-    logger.debug(' '.join(setup_args))
-    subprocess.check_call(setup_args)
-
-  logger.debug(' '.join(compile_args))
-
-  subprocess.check_call(compile_args)
-
-  logger.debug(' '.join(install_args))
+    runner.run(setup_args)
 
-  subprocess.check_call(install_args)
+  runner.run(compile_args)
+  runner.run(install_args)

partis_pyproj-0.1.5.data/purelib/partis/pyproj/builder/process.py

@@ -0,0 +1,42 @@
+from __future__ import annotations
+from pathlib import Path
+import logging
+from .builder import (
+  ProcessRunner)
+from ..validate import (
+  ValidPathError)
+
+#===============================================================================
+def process(
+  pyproj,
+  logger: logging.Logger,
+  options: dict,
+  work_dir: Path,
+  src_dir: Path,
+  build_dir: Path,
+  prefix: Path,
+  setup_args: list[str],
+  compile_args: list[str],
+  install_args: list[str],
+  build_clean: bool,
+  runner: ProcessRunner):
+  """Run general three-part set of commands
+  """
+
+  if not ( build_dir.exists() and any(build_dir.iterdir()) ):
+    # build directory is clean
+    ...
+
+  elif not build_clean:
+    # skip setup if the build directory should be 'clean'
+    setup_args = list()
+
+  else:
+    raise ValidPathError(
+      f"'build_dir' is not empty, remove manually if this is intended or set 'build_clean = false': {build_dir}")
+
+
+  for cmd in [setup_args, compile_args, install_args]:
+    if cmd:
+      runner.run(cmd)
+

{partis_pyproj-0.1.3rc4.data → partis_pyproj-0.1.5.data}/purelib/partis/pyproj/dist_file/__init__.py

@@ -1,5 +1,5 @@
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 from .dist_base import dist_base
 from .dist_zip import dist_zip
 from .dist_targz import dist_targz

{partis_pyproj-0.1.3rc4.data → partis_pyproj-0.1.5.data}/purelib/partis/pyproj/dist_file/dist_base.py

@@ -1,51 +1,47 @@
+from __future__ import annotations
 import os
-import os.path as osp
+from collections.abc import Callable
 from pathlib import (
   Path,
-  PurePath,
   PurePosixPath)
-import io
-import stat
-import logging
+from logging import (
+  getLogger,
+  Logger)
 import re
 from abc import(
   ABC,
   abstractmethod )
-
 from ..norms import (
   hash_sha256 )
-
 from ..validate import (
-  ValidationError,
-  FileOutsideRootError,
   validating )
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class dist_base( ABC ):
   """Builder for file distribution
 
   Parameters
   ----------
-  outname : str
+  outname:
     Name of output file.
-  outdir : str | pathlib.Path
+  outdir:
     Path to directory where the file should be copied after completing build.
-  tmpdir : None | str | pathlib.Path
+  tmpdir:
     If not None, uses the given directory to place the temporary file(s) before
     copying to final location.
     May be the same as outdir.
-  named_dirs : None | Dict[ str, str | pathlib.PurePosixPath ]
+  named_dirs:
     Mapping of specially named directories within the distribution.
     By default a named directory { 'root' : '.' } will be added,
-    unless overridden with another directory name.
-  logger : None | logging.Logger
+    unless overridden with another directory name. Must be in form of Posix path.
+  logger:
     Logger to which any status information is to be logged.
 
   Attributes
   ----------
-  outpath : pathlib.Path
+  outpath : Path
     Path to final output file location
-  named_dirs : Dict[ str, pathlib.PurePosixPath ]
+  named_dirs : dict[str, PurePosixPath]
     Mapping of specially named directories within the distribution
   opened : bool
     Build temporary file has been opened for writing
@@ -55,8 +51,8 @@ class dist_base( ABC ):
     Build temporary file has been closed
   copied : bool
     Build temporary has been copied to ``outpath`` location
-  records : List[ Tuple[ pathlib.PurePosixPath, str, int ] ]
-    Recorded list of path, hash, and size (bytes) of files added to distribution
+  records : dict[PurePosixPath, tuple[str, int]]
+    Recorded mapping of path to hash, and size (bytes) of files added to distribution
   record_hash : None | str
     Final hash value of the record after being finalized
 
@@ -67,14 +63,14 @@ class dist_base( ABC ):
   """
   #-----------------------------------------------------------------------------
   def __init__( self,
-    outname,
-    outdir = None,
-    tmpdir = None,
-    logger = None,
-    named_dirs = None ):
+    outname: str,
+    outdir: Path|None = None,
+    tmpdir: Path|None = None,
+    logger: Logger|None = None,
+    named_dirs: dict[str, PurePosixPath]|None = None ):
 
     if logger is None:
-      logger = logging.getLogger( type(self).__name__ )
+      logger = getLogger(type(self).__name__)
 
     if named_dirs is None:
       named_dirs = dict()
@@ -90,8 +86,7 @@ class dist_base( ABC ):
       'root' : PurePosixPath(),
       **named_dirs }
 
-
-    self.records = list()
+    self.records = dict()
     self.record_bytes = None
     self.record_hash = None
 
@@ -117,18 +112,18 @@ class dist_base( ABC ):
 
   #-----------------------------------------------------------------------------
   def write( self,
-    dst,
-    data,
-    mode = None,
-    record = True ):
+    dst: PurePosixPath,
+    data: bytes,
+    mode: int|None = None,
+    record: bool = True ):
     """Write data into the distribution file
 
     Parameters
     ----------
-    dst : str | PurePosixPath
-    data : bytes
-    mode : int
-    record : bool
+    dst :
+    data :
+    mode :
+    record :
       Add file to the record
 
     """
@@ -140,18 +135,18 @@ class dist_base( ABC ):
 
   #-----------------------------------------------------------------------------
   def makedirs( self,
-    dst,
-    mode = None,
-    exist_ok = False,
-    record = True ):
+    dst: PurePosixPath,
+    mode: int|None = None,
+    exist_ok: bool = False,
+    record: bool = True ):
     """Behaviour similar to os.makedirs into the distribution file
 
     Parameters
     ----------
-    dst : str | PurePosixPath
-    mode : int
-    exist_ok : bool
-    record : bool
+    dst :
+    mode :
+    exist_ok :
+    record :
       Add file to the record
 
     Note
@@ -167,20 +162,20 @@ class dist_base( ABC ):
 
   #-----------------------------------------------------------------------------
   def copyfile( self,
-    src,
-    dst,
-    mode = None,
-    exist_ok = False,
-    record = True ):
-    """Behaviour similar to shutil.copyfile into the distribution file
+    src: Path,
+    dst: PurePosixPath,
+    mode: int|None = None,
+    exist_ok: bool = False,
+    record: bool = True ):
+    """Behavior similar to shutil.copyfile into the distribution file
 
     Parameters
     ----------
-    src : str | pathlib.Path
-    dst : str | pathlib.PurePosixPath
-    mode : int
-    exist_ok : bool
-    record : bool
+    src :
+    dst :
+    mode :
+    exist_ok :
+    record :
       Add file to the RECORD
     """
     src = Path(src)
@@ -208,19 +203,18 @@ class dist_base( ABC ):
 
   #-----------------------------------------------------------------------------
   def copytree( self,
-    src,
-    dst,
-    ignore = None,
-    exist_ok = False,
-    record = True ):
-    """Behaviour similar to shutil.copytree into the distribution file
+    src: Path,
+    dst: PurePosixPath,
+    ignore: Callable[[Path, list[str]], list[str]]|None = None,
+    exist_ok: bool = False,
+    record: bool = True ):
+    """Behavior similar to shutil.copytree into the distribution file
 
     Parameters
     ----------
-    src : str | pathlib.Path
-    dst : str | pathlib.PurePosixPath
-    ignore : None | callable
-
+    src :
+    dst :
+    ignore :
       If not None, ``callable(src, names) -> ignored_names``
 
       See :func:`shutil.copytree`
@@ -231,7 +225,6 @@ class dist_base( ABC ):
     src = Path(src)
     dst = PurePosixPath(dst)
 
-
     if not src.exists():
       raise ValueError(f"Source directory not found: {src}")
 
@@ -317,50 +310,46 @@ class dist_base( ABC ):
 
   #-----------------------------------------------------------------------------
   def record( self,
-    dst,
-    data ):
+    dst: PurePosixPath,
+    data: bytes) -> tuple[str, int]:
     """Creates a record for an added file
 
     This produces an sha256 hash of the data and associates a record with the item
 
     Parameters
     ----------
-    dst : str | PurePosixPath
+    dst:
       Path of item within the distribution
-    data : bytes
+    data:
       Binary data that was added
 
-    Returns
-    -------
-    None
     """
 
     self.assert_recordable()
 
-    hash, size = hash_sha256( data )
+    hash, size = hash_sha256(data)
 
-    record = ( PurePosixPath(dst), hash, size )
+    dst = PurePosixPath(dst)
+    record = (hash, size)
 
-    self.logger.debug( 'record ' + str(record) )
+    self.logger.debug(f'record {dst}: {record}')
+    self.records[dst] = record
 
-    self.records.append( record )
+    return record
 
   #-----------------------------------------------------------------------------
   def close( self,
-    finalize = True,
-    copy = True ):
+    finalize: bool = True,
+    copy: bool = True ):
     """Closes the temporary distribution file
 
     Parameters
     ----------
-    finalize : bool
+    finalize :
       If true, finalizes the temporary distribution file before closing
-    copy : bool
+    copy :
       If true, copies the temporary file to final location after closing
 
-    Returns
-    -------
-    None
     """
 
     if self.closed:
@@ -441,12 +430,12 @@ class dist_base( ABC ):
 
   #-----------------------------------------------------------------------------
   @abstractmethod
-  def finalize( self ):
+  def finalize( self ) -> str|None:
     """Finalizes the distribution file before being closed
 
     Returns
     -------
-    record_hash : None | str
+    record_hash :
       sha256 hash of the record
 
     Note

{partis_pyproj-0.1.3rc4.data → partis_pyproj-0.1.5.data}/purelib/partis/pyproj/dist_file/dist_binary.py

@@ -1,47 +1,31 @@
+from __future__ import annotations
 import os
-import os.path as osp
 import io
-import warnings
-import stat
 import csv
-
-import tempfile
-import shutil
-
 from pathlib import (
-  Path,
-  PurePath,
   PurePosixPath)
-
 from ..norms import (
-  norm_path,
-  norm_data,
   hash_sha256,
   email_encode_items )
-
 from ..pep import (
-  norm_dist_name,
   norm_dist_build,
   norm_dist_compat,
   compress_dist_compat,
   norm_dist_filename )
-
 from ..pkginfo import PkgInfo
-
 from .dist_zip import dist_zip
-
 from ..path import (
   subdir,
   PathError )
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def pkg_name(dir):
   if dir.endswith('.py'):
     return dir[:-3]
 
   return dir
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class dist_binary_wheel( dist_zip ):
   """Build a binary distribution :pep:`427`, :pep:`491` wheel file ``*.whl``
 
@@ -227,10 +211,8 @@ class dist_binary_wheel( dist_zip ):
 
     platlib = self.named_dirs['platlib']
 
-    for file, hash, size in self.records:
+    for file, (hash, size) in self.records.items():
       # check files added to purelib and platlib.
-      file = PurePosixPath(file)
-
       try:
         top_level.add(pkg_name(subdir(purelib, file).parts[0]))
         continue
@@ -287,9 +269,9 @@ class dist_binary_wheel( dist_zip ):
 
     # the record file itself is listed in records, but the hash of the record
     # file cannot be included in the file.
-    _records = self.records + [ (self.record_path, '', ''), ]
+    _records = {**self.records, self.record_path: ('', '')}
 
-    for file, hash, size in _records:
+    for file, (hash, size) in _records.items():
       hash = f'sha256={hash}' if hash else ''
       record_csv.writerow([os.fspath(file), hash, size])
 

{partis_pyproj-0.1.3rc4.data → partis_pyproj-0.1.5.data}/purelib/partis/pyproj/dist_file/dist_copy.py

@@ -1,30 +1,19 @@
+from __future__ import annotations
 import os
-import os.path as osp
 import glob
-import pathlib
 from pathlib import (
-  Path,
-  PurePath,
-  PurePosixPath)
-
+  Path)
 import logging
-
 from ..validate import (
-  ValidationError,
   FileOutsideRootError,
   validating )
-
-from ..norms import (
-  norm_path )
-
 from ..path import (
-  PathMatcher,
   PathFilter,
   subdir,
   combine_ignore_patterns,
-  contains )
+  resolve)
 
-# #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# #===============================================================================
 # def rematch_replace(rematch, replace, name):
 
 #   m = rematch.fullmatch(path)
@@ -42,7 +31,7 @@ from ..path import (
 
 
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def dist_iter(*,
   include,
   ignore,
@@ -100,7 +89,7 @@ def dist_iter(*,
           yield (i, _src, _dst, _ignore_patterns, False)
 
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 def dist_copy(*,
   base_path,
   include,
@@ -129,7 +118,7 @@ def dist_copy(*,
           logger.debug( f'ignoring: {src}' )
           continue
 
-        src_abs = src.resolve()
+        src_abs = resolve(src)
 
         if root and not subdir(root, src_abs, check = False):
           raise FileOutsideRootError(

{partis_pyproj-0.1.3rc4.data → partis_pyproj-0.1.5.data}/purelib/partis/pyproj/dist_file/dist_source.py

@@ -1,30 +1,13 @@
-import os
-import os.path as osp
-import io
-import warnings
-import stat
-
-import shutil
-
+from __future__ import annotations
 from pathlib import (
-  Path,
-  PurePath,
   PurePosixPath)
-
-from ..norms import (
-  norm_path,
-  norm_data,
-  norm_mode )
-
 from ..pep import (
   norm_dist_filename )
-
 from ..pkginfo import PkgInfo
-
 from .dist_base import dist_base
 from .dist_targz import dist_targz
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class dist_source_targz( dist_targz ):
   """Build a source distribution ``*.tar.gz`` file
 
@@ -118,7 +101,7 @@ class dist_source_targz( dist_targz ):
       data = self.pkg_info.encode_pkg_info() )
 
 
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#===============================================================================
 class dist_source_dummy( dist_base ):
   """Build a dummy source distribution without a physical file
   """
@@ -142,7 +125,7 @@ class dist_source_dummy( dist_base ):
     self.base_path = PurePosixPath('-'.join( sdist_name_parts ))
 
     self.metadata_path = self.base_path.joinpath('PKG-INFO')
-    
+
     super().__init__(
       outname = '-'.join( sdist_name_parts ) + '.tar.gz',
       outdir = outdir,