partis-pyproj 0.1.9__tar.gz → 0.2.0__tar.gz

{partis_pyproj-0.1.9 → partis_pyproj-0.2.0}/PKG-INFO

@@ -1,27 +1,27 @@
 Metadata-Version: 2.1
 Name: partis-pyproj
-Version: 0.1.9
+Version: 0.2.0
 Requires-Python: >=3.8
 Author-email: "Nanohmics Inc." <software.support@nanohmics.com>
 Maintainer-email: "Nanohmics Inc." <software.support@nanohmics.com>
 Summary: Minimal set of Python project utilities (PEP-517/621)
 License-File: LICENSE.txt
 Project-URL: homepage, https://github.com/kcdodd/partis-pyproj/
+Classifier: Operating System :: POSIX :: Linux
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python
-Classifier: Development Status :: 4 - Beta
 Classifier: Topic :: Software Development :: Build Tools
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: POSIX :: Linux
 Provides-Extra: meson
 Provides-Extra: cmake
-Requires-Dist: packaging>=24.2
-Requires-Dist: tomli>=2.0.1
 Requires-Dist: requests>=2.32.3
-Requires-Dist: meson>=0.61.3; extra == "meson"
+Requires-Dist: tomli>=2.0.1
+Requires-Dist: packaging>=24.2
 Requires-Dist: ninja>=1.10.2.3; extra == "meson"
+Requires-Dist: meson>=0.61.3; extra == "meson"
 Requires-Dist: ninja>=1.10.2.3; extra == "cmake"
 Requires-Dist: cmake>=3.24.3; extra == "cmake"
 Description-Content-Type: text/markdown
@@ -88,10 +88,15 @@ formats and behaviors.
 
 * An `include` list is used to filter files or directories to be copied, expanded
   to zero or more matches relative to `src`.
-* `glob` follows the format of [Path.glob](https://docs.python.org/3/library/pathlib.html#pathlib.Path.glob), with recursion.
-* `rematch` may further discriminate files (already matched by `glob`) using [Regular Expression Syntax](https://docs.python.org/3/library/re.html#regular-expression-syntax).
-* `replace` can  change destination filenames using
+* `glob` follows the format of [Path.glob](https://docs.python.org/3/library/pathlib.html#pathlib.Path.glob).
+  If recursive pattern `**` is used, the glob will *not* match directories,
+  since the resulting `copytree` would end up copying all files in the directory.
+* `rematch` may further discriminate filenames (already matched by `glob`) using [Regular Expression Syntax](https://docs.python.org/3/library/re.html#regular-expression-syntax). Directories are *not* considered by `rematch`.
+* `replace` can  change destination *filenames* using
   [Format String Syntax](https://docs.python.org/3/library/string.html#format-string-syntax), with values supplied by any groups defined in `rematch`.
+  This cannot rename directories.
+* `strip` can remove (up to) the given number of path components from the relative
+  `src` path.
 
 **Ignore patterns**
 

{partis_pyproj-0.1.9 → partis_pyproj-0.2.0}/README.md

@@ -60,10 +60,15 @@ formats and behaviors.
 
 * An `include` list is used to filter files or directories to be copied, expanded
   to zero or more matches relative to `src`.
-* `glob` follows the format of [Path.glob](https://docs.python.org/3/library/pathlib.html#pathlib.Path.glob), with recursion.
-* `rematch` may further discriminate files (already matched by `glob`) using [Regular Expression Syntax](https://docs.python.org/3/library/re.html#regular-expression-syntax).
-* `replace` can  change destination filenames using
+* `glob` follows the format of [Path.glob](https://docs.python.org/3/library/pathlib.html#pathlib.Path.glob).
+  If recursive pattern `**` is used, the glob will *not* match directories,
+  since the resulting `copytree` would end up copying all files in the directory.
+* `rematch` may further discriminate filenames (already matched by `glob`) using [Regular Expression Syntax](https://docs.python.org/3/library/re.html#regular-expression-syntax). Directories are *not* considered by `rematch`.
+* `replace` can  change destination *filenames* using
   [Format String Syntax](https://docs.python.org/3/library/string.html#format-string-syntax), with values supplied by any groups defined in `rematch`.
+  This cannot rename directories.
+* `strip` can remove (up to) the given number of path components from the relative
+  `src` path.
 
 **Ignore patterns**
 

{partis_pyproj-0.1.9 → partis_pyproj-0.2.0}/pyproject.toml

@@ -26,7 +26,7 @@
 
 [project]
 name = "partis-pyproj"
-version = "0.1.9"
+version = "0.2.0"
 description = "Minimal set of Python project utilities (PEP-517/621)"
 maintainers = [
   { name = "Nanohmics Inc.", email = "software.support@nanohmics.com" } ]
@@ -119,7 +119,7 @@ copy = [
 #===============================================================================
 [tool.noxfile]
 python = [
-  "3.14",
+  # "3.14",
   "3.13",
   "3.12",
   "3.11",

{partis_pyproj-0.1.9 → partis_pyproj-0.2.0}/src/pyproj/backend.py

@@ -53,7 +53,7 @@ def backend_init(
 
   if not root_logger.handlers:
     basicConfig(
-      level = logging.INFO,
+      level = os.environ.get('PARTIS_PYPROJ_LOGLEVEL', 'INFO').upper(),
       format = "{message}",
       style = "{" )
 

{partis_pyproj-0.1.9 → partis_pyproj-0.2.0}/src/pyproj/builder/builder.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 import os
 import os.path as osp
+import sys
 import tempfile
 import sysconfig
 import re
@@ -30,6 +31,23 @@ from ..pptoml import pyproj_targets
 
 ERROR_REC = re.compile(r"error:", re.I)
 
+pyexe = sys.executable
+
+try:
+  pyexe = osp.realpath(pyexe)
+except Exception:
+  ...
+
+# fallback for commonly needed config. variables, but sometimes are not set
+_sysconfig_vars_alt = {
+  'LIBDEST': sysconfig.get_path('stdlib'),
+  'BINLIBDEST': sysconfig.get_path('platstdlib'),
+  'INCLUDEPY': sysconfig.get_path('include'),
+  'EXENAME': pyexe,
+  'BINDIR': osp.dirname(pyexe)}
+
+_sysconfig_vars = _sysconfig_vars_alt|sysconfig.get_config_vars()
+
 #===============================================================================
 class BuildCommandError(ValidationError):
   pass
@@ -71,7 +89,7 @@ class Builder:
       'targets': targets,
       'env': os.environ,
       'tmpdir': self.tmpdir,
-      'config_vars': sysconfig.get_config_vars()},
+      'config_vars': _sysconfig_vars},
       root=root,
       # better way for builders to whitelist templated directories?
       dirs=[self.tmpdir, Path(tempfile.gettempdir())/'partis-pyproj-downloads'])

{partis_pyproj-0.1.9 → partis_pyproj-0.2.0}/src/pyproj/builder/download.py

@@ -20,6 +20,18 @@ from ..norms import b64_nopad, nonempty_str
 # replace runs of non-alphanumeric, dot, dash, or underscore
 _filename_subs = re.compile(r'[^a-z0-9\.\-\_]+', re.I)
 
+try:
+  # prefer user home directory to avoid clashing in global "tmp" directory
+  CACHE_DIR = Path.home()/'.cache'/'partis-pyproj'
+
+except RuntimeError:
+  # use global temporary directory, suffixed by username to try to avoid conficts
+  # between users
+  import getpass
+  username = getpass.getuser()
+  tmp_dir = tempfile.gettempdir()
+  CACHE_DIR = Path(tmp_dir)/f'.cache-partis-pyproj-{username}'
+
 #===============================================================================
 def download(
   pyproj,
@@ -94,7 +106,12 @@ def download(
     try:
       logger.info(f"- downloading: {url} -> {tmp_file}")
 
-      with requests.get(url, stream=True) as req, tmp_file.open('wb') as fp:
+      req = requests.get(url, stream=True)
+
+      if not req.ok:
+        req.raise_for_status()
+
+      with req, tmp_file.open('wb') as fp:
         for chunk in req.iter_content(chunk_size=chunk_size):
           if chunk:
             fp.write(chunk)
@@ -107,6 +124,9 @@ def download(
               logger.info(f"- {size/1e6:,.1f} MB")
               last_size = size
 
+      if size == 0:
+        raise ValidationError(f"Downloaded file had zero size: {url}")
+
       logger.info(f"- complete {size/1e6:,.1f} MB")
 
       if hash:
@@ -137,18 +157,24 @@ def download(
   out_file.symlink_to(cache_file)
 
   if extract:
-    logger.info(f"- extracting: {cache_file} -> {build_dir}")
+    out_dir = build_dir
+
+    if isinstance(extract, (str,Path)):
+      out_dir = extract
+
+    logger.info(f"- extracting: {cache_file} -> {out_dir}")
+
     with tarfile.open(cache_file, 'r:*') as fp:
       if sys.version_info >= (3, 12):
         # 'filter' argument added, controls behavior of extract
         fp.extractall(
-          path=build_dir,
+          path=out_dir,
           members=None,
           numeric_owner=False,
           filter='tar')
       else:
         fp.extractall(
-          path=build_dir,
+          path=out_dir,
           members=None,
           numeric_owner=False)
 
@@ -161,7 +187,6 @@ def _cached_download(url: str, checksum: str) -> Path:
   if not checksum:
     checksum = '0'
 
-  cache_dir = Path(tempfile.gettempdir())/'partis-pyproj-downloads'
   name = url.split('/')[-1]
   _url = url
 
@@ -178,7 +203,7 @@ def _cached_download(url: str, checksum: str) -> Path:
   url_dirname = _filename_subs.sub('_', _url)
   url_filename = f"{short}-" + _filename_subs.sub('_', name)
 
-  url_dir = cache_dir/url_dirname
+  url_dir = CACHE_DIR/url_dirname
   url_dir.mkdir(exist_ok=True, parents=True)
 
   file = url_dir/url_filename

partis_pyproj-0.2.0/src/pyproj/dist_file/dist_copy.py

@@ -0,0 +1,187 @@
+from __future__ import annotations
+import os
+import glob
+from pathlib import (
+  Path)
+import logging
+from ..validate import (
+  FileOutsideRootError,
+  ValidationError,
+  validating )
+from ..path import (
+  PathFilter,
+  subdir,
+  combine_ignore_patterns,
+  resolve)
+from ..pptoml import (
+  pyproj_dist_copy)
+
+#===============================================================================
+def _rglob(pattern: str, *, root_dir: Path) -> list[Path]:
+  # detect if glob will be recursive by finding '**' in the pattern
+  recursive = '**' in pattern
+
+  # NOTE: root_dir added in Python 3.10
+  cwd = Path.cwd()
+
+  try:
+    os.chdir(root_dir)
+    matches = glob.glob(pattern, recursive = recursive)
+
+    matches = [Path(m) for m in matches]
+
+    if recursive:
+      # don't match directories in recursive mode, since copying a parent
+      # directory negates the need to recurse
+      matches = [m for m in matches if not m.is_dir()]
+
+  finally:
+    os.chdir(cwd)
+
+  return matches
+
+#===============================================================================
+def dist_iter(*,
+  copy_items: list[pyproj_dist_copy],
+  ignore: list[str],
+  root: Path,
+  logger: logging.Logger):
+
+  patterns  = PathFilter(
+    patterns = ignore )
+
+
+
+  for i, incl in enumerate(copy_items):
+    src = incl.src
+    dst = incl.dst
+    _ignore = incl.ignore
+
+    _ignore_patterns = combine_ignore_patterns(
+      patterns,
+      PathFilter(
+        patterns = _ignore,
+        start = src ) )
+
+    if not incl.include:
+      # each copy specifies a single path
+      # logger.debug(f"  - from: {src}\n  -   to: {dst}")
+      yield ( i, src, dst, _ignore_patterns, True )
+
+    else:
+      # each copy can result in many paths
+      for incl_pattern in incl.include:
+        # produce list of possible copies by glob pattern, relative to 'src'
+        matches = _rglob(incl_pattern.glob, root_dir=src)
+        # logger.debug(f"- glob: {len(matches)} matches with pattern {incl_pattern.glob!r} in {str(src)!r}")
+
+        if not matches:
+          logger.warning(f"Copy pattern did not yield any files: {incl_pattern.glob!r}")
+          continue
+
+        for i, match in enumerate(matches):
+          parent = match.parent
+          src_filename = match.name
+
+          if _ignore_patterns(src/parent, [src_filename]):
+            # Only filter by ignore pattern if this path was part of a glob
+            # logger.debug(f"  - ignored: {match}")
+            continue
+
+          # logger.debug(f"  - match: {match}")
+
+          if incl_pattern.strip:
+            # remove leading path components
+            dst_parent = type(parent)(*parent.parts[incl_pattern.strip:])
+            # logger.debug(f"    - stripped:  {parent.parts[:incl_pattern.strip]}")
+          else:
+            dst_parent = parent
+
+          # match to regular expression
+          m = incl_pattern.rematch.fullmatch(src_filename)
+
+          if not m:
+            # logger.debug(f"    - !rematch: {src_filename!r} (pattern = {incl_pattern.rematch})")
+            continue
+
+          # apply replacement
+          if incl_pattern.replace == '{0}':
+            dst_filename = src_filename
+
+          else:
+            args = (m.group(0), *m.groups())
+            kwargs = m.groupdict()
+
+            try:
+              dst_filename = incl_pattern.replace.format(*args, **kwargs)
+              # logger.debug(f"    - renamed: {dst_filename!r} (template = {incl_pattern.replace!r})")
+
+            except (IndexError, KeyError) as e:
+              raise ValidationError(
+                f"Replacement '{incl_pattern.replace}' failed for"
+                f" '{incl_pattern.rematch.pattern}':"
+                f" {args}, {kwargs}") from None
+
+          _src = src/parent/src_filename
+          # re-base the dst path, (path relative to src) == (path relative to dst)
+          _dst = dst/dst_parent/dst_filename
+
+          # logger.debug(f"    - from: {str(_src)!r}\n    -   to: {str(_dst)!r}")
+
+          yield (i, _src, _dst, _ignore_patterns, False)
+
+
+#===============================================================================
+def dist_copy(*,
+  base_path: Path,
+  copy_items: list[pyproj_dist_copy],
+  ignore,
+  dist,
+  root = None,
+  logger = None ):
+
+  if len(copy_items) == 0:
+    return
+
+  logger = logger or logging.getLogger( __name__ )
+
+  history: dict[Path, Path] = {}
+
+  with validating(key = 'copy'):
+
+    for i, src, dst, ignore_patterns, individual in dist_iter(
+      copy_items = copy_items,
+      ignore = ignore,
+      root = root,
+      logger = logger):
+
+      with validating(key = i):
+
+        dst = base_path.joinpath(dst)
+        src_abs = resolve(src)
+
+        if root and not subdir(root, src_abs, check = False):
+          raise FileOutsideRootError(
+            f"Must have common path with root:\n  file = \"{src_abs}\"\n  root = \"{root}\"")
+
+        _src = history.get(dst)
+
+        if _src == src:
+          continue
+
+        if _src is not None:
+          raise ValidationError(
+            f"Overwriting destination {str(dst)!r} from {str(_src)!r} with {str(src)!r}")
+
+        history[dst] = src
+
+        if src.is_dir():
+          dist.copytree(
+            src = src,
+            dst = dst,
+            ignore = ignore_patterns )
+
+        else:
+          dist.copyfile(
+            src = src,
+            dst = dst )

{partis_pyproj-0.1.9 → partis_pyproj-0.2.0}/src/pyproj/pep.py

@@ -1,42 +1,18 @@
 from __future__ import annotations
 import sys
-import os
-import os.path as osp
-import io
-import warnings
-import stat
 import re
-import pathlib
 import inspect
-from copy import copy
-from collections.abc import (
-  Mapping,
-  Sequence,
-  Iterable )
 
 from collections import namedtuple
-import hashlib
-from base64 import urlsafe_b64encode
-from email.message import Message
-from email.generator import BytesGenerator
 from email.utils import parseaddr, formataddr
 from urllib.parse import urlparse
 import keyword
 
 from packaging.tags import sys_tags
-from packaging.requirements import Requirement
-from packaging.specifiers import SpecifierSet
-from packaging.version import VERSION_PATTERN
 
 from .validate import (
   ValidationError,
-  validating,
-  valid_type,
-  valid_keys,
-  valid_dict,
-  valid_list,
-  mapget,
-  as_list)
+  validating)
 
 #===============================================================================
 CompatibilityTags = namedtuple('CompatibilityTags', ['py_tag', 'abi_tag', 'plat_tag'])
@@ -152,7 +128,7 @@ def norm_dist_name( name ):
 
   # > The name should be lowercased with all runs of the
   # > characters ., -, or _ replaced with a single - character.
-  name = re.sub( r'[\-\_\.]+', "-", name )
+  name = pep_503_name_norm.sub('-', name)
 
   return name
 
@@ -197,6 +173,12 @@ def join_dist_filename( parts ):
 def norm_dist_version( version ):
   """Checks for valid distribution version (:pep:`440`)
 
+  .. versionchanged:: 0.1.9
+
+    Allow local version identifiers ``<public version identifier>[+<local version label>]``,
+    in addition to public versions.
+    Version pattern now uses :ref:`~packaging.version.VERSION_PATTERN`.
+
   See Also
   --------
   * https://www.python.org/dev/peps/pep-0440/#version-scheme
@@ -393,16 +375,30 @@ def norm_dist_url( label, url ):
 def norm_dist_extra( extra ):
   """Normalize distribution 'extra' requirement
 
+  .. versionchanged:: 0.2.0
+
+    Extra names are normalized according to PEP-685 and validated according to
+    Core Metadata 2.3.
+    Previously, extra names "must be a valid Python identifier" (Core Metadata 2.1)
+
+
   Note
   ----
-  * No known PEP specifies this format, but is treated as
+  * MUST write out extra names in their normalized form.
+  * This applies to the Provides-Extra field and the extra marker when used
+    in the Requires-Dist field.
+
+  See Also
+  --------
+  * https://peps.python.org/pep-0685/#specification
   """
 
-  extra = norm_printable( extra )
+  extra = norm_printable(extra).lower()
+  extra = pep_503_name_norm.sub('-', extra)
 
-  if not pep_621_extra.fullmatch( extra ):
+  if not pep_685_extra.fullmatch(extra):
     raise PEPValidationError(
-      pep = 621,
+      pep = 685,
       msg = "Invalid extra",
       val = extra )
 
@@ -593,6 +589,8 @@ def norm_entry_point_name( name ):
   See Also
   --------
   * https://packaging.python.org/en/latest/specifications/entry-points/
+  * The name may contain any characters except =, but it cannot start or end with
+    any whitespace character, or start with [
   """
 
   name = norm_printable( name )
@@ -638,15 +636,49 @@ def norm_entry_point_ref( ref ):
         or 'importable.module:object.attr': {ref}""") from e
 
 #===============================================================================
+# https://packaging.python.org/en/latest/specifications/name-normalization/#name-format
 pep426_dist_name = re.compile(
   r'^([A-Z0-9]|[A-Z0-9][A-Z0-9._\-]*[A-Z0-9])$',
   re.IGNORECASE )
 
+# https://packaging.python.org/en/latest/specifications/name-normalization/#name-normalization
+# > runs of characters ., -, or _ replaced with a single - character.
+pep_503_name_norm = re.compile(r'[\-\_\.]+', re.IGNORECASE)
+
+# value of packaging.version.VERSION_PATTERN, as of 'packaging == 25.0'
+# just in case the variable is ever deprecated
+VERSION_PATTERN = r"""
+    v?
+    (?:
+        (?:(?P<epoch>[0-9]+)!)?                           # epoch
+        (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
+        (?P<pre>                                          # pre-release
+            [-_\.]?
+            (?P<pre_l>alpha|a|beta|b|preview|pre|c|rc)
+            [-_\.]?
+            (?P<pre_n>[0-9]+)?
+        )?
+        (?P<post>                                         # post release
+            (?:-(?P<post_n1>[0-9]+))
+            |
+            (?:
+                [-_\.]?
+                (?P<post_l>post|rev|r)
+                [-_\.]?
+                (?P<post_n2>[0-9]+)?
+            )
+        )?
+        (?P<dev>                                          # dev release
+            [-_\.]?
+            (?P<dev_l>dev)
+            [-_\.]?
+            (?P<dev_n>[0-9]+)?
+        )?
+    )
+    (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
+"""
+
 pep440_version = re.compile(VERSION_PATTERN, re.VERBOSE | re.IGNORECASE)
-# pep440_version = re.compile(
-#   r'^([1-9][0-9]*!)?(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))*'
-#   r'((a|b|rc)(0|[1-9][0-9]*))?'
-#   r'(\.post(0|[1-9][0-9]*))?(\.dev(0|[1-9][0-9]*))?$' )
 
 # NOTE: PEP 427 does not specify any constraints on the string following the
 # digits, but given the form it is used in the filenames it really cannot
@@ -720,16 +752,22 @@ pep_301_classifier = re.compile(
 pep_621_keyword = re.compile( r'^[^\s\,]+$' )
 
 #===============================================================================
-pep_621_extra = re.compile( r'^([A-Z0-9_]+)?$', re.IGNORECASE  )
+# https://packaging.python.org/en/latest/specifications/core-metadata/#core-metadata-provides-extra
+pep_685_extra = re.compile( r'^[a-z0-9]+(-[a-z0-9]+)*$', re.IGNORECASE)
+
 
 #===============================================================================
 # https://packaging.python.org/en/latest/specifications/entry-points/
 # Group names must be one or more groups of letters, numbers and underscores,
 # separated by dots
 entry_point_group = re.compile( r'^[A-Z0-9_]+(\.[A-Z0-9_]+)*$', re.IGNORECASE  )
+
+# The name may contain any characters except =, but it cannot start or end with
+# any whitespace character, or start with [
 # For new entry points (names), it is recommended to use only letters, numbers,
 # underscores, dots and dashes
-entry_point_name = re.compile( r'^([A-Z0-9_\.\-]+)?$', re.IGNORECASE  )
+# entry_point_name = re.compile(r'^([A-Z0-9_\.\-]+)?$', re.IGNORECASE)
+entry_point_name = re.compile(r'^([^\[\]\=\s]+)?$', re.IGNORECASE)
 
 #===============================================================================
 py_keyword = re.compile( '^(' + '|'.join(keyword.kwlist) + ')$' )

{partis_pyproj-0.1.9 → partis_pyproj-0.2.0}/src/pyproj/pkginfo.py

@@ -121,9 +121,10 @@ class PkgInfoReq:
     self.req = Requirement( norm_printable(req) )
 
     marker = str( self.req.marker ) if self.req.marker else ''
-    extra = norm_dist_extra(extra)
 
     if extra:
+      extra = norm_dist_extra(extra)
+
       if marker:
         self.req.marker = Marker(f'extra == "{extra}" and ( {marker} )')
       else:

{partis_pyproj-0.1.9 → partis_pyproj-0.2.0}/src/pyproj/pptoml.py

@@ -362,7 +362,8 @@ class include(valid_dict):
   default = {
     'glob': valid(r'**', nonempty_str),
     'rematch': valid(r'.*', nonempty_str, re.compile),
-    'replace': valid('{0}', nonempty_str)}
+    'replace': valid('{0}', nonempty_str),
+    'strip': valid(int)}
 
 #===============================================================================
 class include_list(valid_list):
@@ -463,4 +464,5 @@ class pptoml(valid_dict):
   default = {
     'project': valid(REQUIRED, project),
     'build-system': valid(REQUIRED, build_system),
+    'dependency-groups': valid(OPTIONAL, dependency_groups),
     'tool': valid(OPTIONAL, tool) }

{partis_pyproj-0.1.9 → partis_pyproj-0.2.0}/src/pyproj/pyproj.py

@@ -364,7 +364,7 @@ class PyProjBase:
     with validating( key = 'tool.pyproj.dist.source'):
       dist_copy(
         base_path = dist.named_dirs['root'],
-        include = self.source.copy,
+        copy_items = self.source.copy,
         ignore = self.dist.ignore + self.source.ignore,
         dist = dist,
         root = self.root,
@@ -413,7 +413,7 @@ class PyProjBase:
 
       dist_copy(
         base_path = dist.named_dirs['root'],
-        include = self.binary.copy,
+        copy_items = self.binary.copy,
         ignore = ignore,
         dist = dist,
         root = self.root,
@@ -437,7 +437,7 @@ class PyProjBase:
           with validating( key = k ):
             dist_copy(
               base_path = dist.named_dirs[k],
-              include = _include,
+              copy_items = _include,
               ignore = _ignore,
               dist = dist,
               root = self.root,

partis_pyproj-0.1.9/src/pyproj/dist_file/dist_copy.py

@@ -1,139 +0,0 @@
-from __future__ import annotations
-import os
-import glob
-from pathlib import (
-  Path)
-import logging
-from ..validate import (
-  FileOutsideRootError,
-  validating )
-from ..path import (
-  PathFilter,
-  subdir,
-  combine_ignore_patterns,
-  resolve)
-
-# #===============================================================================
-# def rematch_replace(rematch, replace, name):
-
-#   m = rematch.fullmatch(path)
-#   if not m:
-#     continue
-
-#   args = (m.group(0), *m.groups())
-#   kwargs = m.groupdict()
-#   try:
-#     replace.format(*args, **kwargs))
-#   except (IndexError, KeyError) as e:
-#     raise ValueError(
-#       f"Replacement '{replace}' failed to format match '{m.group(0)}': "
-#       f"{args}, {kwargs}") from None
-
-
-
-#===============================================================================
-def dist_iter(*,
-  include,
-  ignore,
-  root ):
-
-  patterns = PathFilter(
-    patterns = ignore )
-
-  for i, incl in enumerate(include):
-    src = incl.src
-    dst = incl.dst
-    _ignore = incl.ignore
-
-    _ignore_patterns = combine_ignore_patterns(
-      patterns,
-      PathFilter(
-        patterns = _ignore,
-        start = src ) )
-
-    if not incl.include:
-      yield ( i, src, dst, _ignore_patterns, True )
-    else:
-      for incl_pattern in incl.include:
-        cwd = Path.cwd()
-        try:
-          # TODO: better way of globing *relative* to src directory
-          # root_dir added in Python 3.10
-          os.chdir(src)
-          matches = glob.glob(incl_pattern.glob, recursive = True)
-        finally:
-          os.chdir(cwd)
-
-        for match in matches:
-          match = Path(match)
-          basename = match.parent
-          src_filename = match.name
-
-          m = incl_pattern.rematch.fullmatch(src_filename)
-          if not m:
-            continue
-
-          args = (m.group(0), *m.groups())
-          kwargs = m.groupdict()
-          try:
-            dst_filename = incl_pattern.replace.format(*args, **kwargs)
-          except (IndexError, KeyError) as e:
-            raise ValueError(
-              f"Replacement '{incl_pattern.replace}' failed for"
-              f" '{incl_pattern.rematch.pattern}':"
-              f" {args}, {kwargs}") from None
-
-          _src = src/basename/src_filename
-          # re-base the dst path, path relative to src == path relative to dst
-          _dst = dst/basename/dst_filename
-
-          yield (i, _src, _dst, _ignore_patterns, False)
-
-
-#===============================================================================
-def dist_copy(*,
-  base_path,
-  include,
-  ignore,
-  dist,
-  root = None,
-  logger = None ):
-
-  if len(include) == 0:
-    return
-
-  logger = logger or logging.getLogger( __name__ )
-
-  with validating(key = 'copy'):
-
-    for i, src, dst, ignore_patterns, individual in dist_iter(
-      include = include,
-      ignore = ignore,
-      root = root ):
-
-      with validating(key = i):
-
-        dst = base_path.joinpath(dst)
-
-        if not individual and ignore_patterns( src.parent, [src.name]):
-          logger.debug( f'ignoring: {src}' )
-          continue
-
-        src_abs = resolve(src)
-
-        if root and not subdir(root, src_abs, check = False):
-          raise FileOutsideRootError(
-            f"Must have common path with root:\n  file = \"{src_abs}\"\n  root = \"{root}\"")
-
-        logger.debug(f"dist copy: {src} -> {dst}")
-
-        if src.is_dir():
-          dist.copytree(
-            src = src,
-            dst = dst,
-            ignore = ignore_patterns )
-
-        else:
-          dist.copyfile(
-            src = src,
-            dst = dst )