partis-pyproj 0.1.5__tar.gz → 0.1.7__tar.gz

{partis_pyproj-0.1.5 → partis_pyproj-0.1.7}/PKG-INFO

@@ -1,22 +1,23 @@
 Metadata-Version: 2.1
 Name: partis-pyproj
-Version: 0.1.5
+Version: 0.1.7
 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
-Classifier: Topic :: Software Development :: Build Tools
+Classifier: Development Status :: 4 - Beta
 Classifier: Operating System :: POSIX :: Linux
+Classifier: Topic :: Software Development :: Build Tools
+Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: Microsoft :: Windows
-Classifier: Programming Language :: Python
-Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Provides-Extra: meson
 Provides-Extra: cmake
 Requires-Dist: packaging>=24.2
+Requires-Dist: requests>=2.32.3
 Requires-Dist: tomli>=2.0.1
 Requires-Dist: meson>=0.61.3; extra == "meson"
 Requires-Dist: ninja>=1.10.2.3; extra == "meson"
@@ -278,6 +279,7 @@ setup_args: array{STRING}    # 3-stage build
 compile_args: array{STRING}  # 3-stage build
 install_args: array{STRING}  # 3-stage build
 options: table{STRING|BOOL}? # options passed to builder from pyproject.toml
+env: table{STRING|STRING}?   # environment variables to set
 build_clean: BOOL?           # control cleanup (ie for development builds)
 enabled: (BOOL|MARKER)?      # environment marker
 ```
@@ -287,11 +289,28 @@ There are several entry points available as-is:
 - `partis.pyproj.builder:meson` - Support for [Meson Build system](https://mesonbuild.com/)  with the 'extra' ``partis-pyproj[meson]``
 - `partis.pyproj.builder:cmake` - Support for [CMake](https://cmake.org/) with the 'extra' ``partis-pyproj[cmake]``
 - `partis.pyproj.builder:process` - Support for running arbitrary command line executable
+- `partis.pyproj.builder:download` - Support for downloading a file to `build_dir`
+
+
+Options for `partis.pyproj.builder:download`:
+
+```
+[tool.pyproj.targets.options]
+url: URL
+checksum: ALG=HEX     # expected checksum
+filename: STRING?     # rename in build_dir, defaults to mangled version of url
+extract: BOOL?        # extract/decompress as a tar file
+executable: BOOL?     # set execute permission
+```
+
+Checksum `ALG` can be `sha256`, `md5`, or another algorithm in [hashlib](https://docs.python.org/3/library/hashlib.html)
+
+**Example**
 
 In this example, the source directory must contain appropriate `meson.build` files,
 since the 'pyproject.toml' configuration only provides a way of running
 ``meson setup`` and ``meson compile``.
-For example:
+
 
 ```toml
 # pyproject.toml
@@ -358,7 +377,7 @@ Python [Template string](https://docs.python.org/3/library/string.html#template-
 - `$$` is an escape; it is replaced with a single `$`.
 - `${identifier}` names a substitution placeholder matching a mapping key of "identifier".
 
-However, `$identifier` (without braces) is not supported, instead allowing more expressive substitutions.
+However, `$identifier` (without braces) is *not supported*, but this restriction allows more expressive substitutions.
 
 ```
 substitution: "${" (variable|literal|SEP)+ "}"
@@ -367,16 +386,30 @@ SEP: "/"
 literal: "'" CHAR+ "'"
 IDENTIFIER: < python identifier >
 INTEGER: < integer >
-CHAR: < ascii letter, number (not leading), or underscore >
+CHAR: < ascii alpha-numeric, dot ".", dash "-", underscore "_" >
 ```
 
-Variable names can reference most of the content of the original 'pyproject.toml',
-as well as values already substituted in the build target or earlier targets.
+Top-level template variable identifiers can reference the content of the original 'pyproject.toml', config. settings, environment variables, and values already substituted in the build target or earlier targets.
 If the substitution contains any separators the result is interpreted as a path, converted to platform-specific filesystem format, and resolved to project directory.
-
-**Example**
-
-The value of `options.some_option` in the example below would be substituted with a filesystem equivalent path for `{root}/build/something/my_pkg/xyz/abc.so`:
+The template namespace contains the following keys:
+
+- `root`: Absolute path to project root directory
+- `tmpdir`: A temporary directory created and shared by all build targets.
+  This directory is removed before the distribution is created, so any needed files must be copied back to a location within the project tree by one of the targets
+  (eg. the "install" step of 3-stage builds with a `prefix` within the project).
+- `pptoml`: Top-level of parsed `pyproject.toml`
+- `project`: The `project` section, including `name`, `version`, etc.
+- `pyproj`: The `tool.pyproj` section.
+- `config_settings`: A mapping from the `config_settings` passed to backend per PEP-517
+  after defaults applied from `tool.pyproj.config` (described below).
+- `targets`': List from `tool.pyproj.targets`, updated as targets are processed.
+- `work_dir`, `src_dir`, `build_dir`, `prefix`: Per-target values (if processed before the substitution)
+- `env`: Defaults to `os.environ`, or per-target value from `tool.pyproj.targets.env`
+  (if processed before the substitution).
+- `options`: Per-target value from `tool.pyproj.targets.options` (if processed before the substitution)
+
+Template substitutions are processed (once) in the *order in which they appear* from the `pyproject.toml`, no static analysis is performed. It is up to the developer to put them in the needed order if one template references a value resulting from another template.
+In the example below, the value of `options.some_option` would be substituted with a filesystem equivalent path for `{root}/build/something/my_pkg/xyz/abc.so`:
 
 
 ```toml
@@ -397,14 +430,14 @@ location according to a local installation scheme
 these can be specified within sub-tables.
 Available install scheme keys, and **example** corresponding install locations, are:
 
-- `purelib` ("pure" library Python path): ``{prefix}/lib/python{X}.{Y}/site-packages/``
-- `platlib` (platform specific Python path): ``{prefix}/lib{platform}/python{X}.{Y}/site-packages/``
+- `purelib` ("pure" library Python path): ``{venv}/lib/python{X}.{Y}/site-packages/``
+- `platlib` (platform specific Python path): ``{venv}/lib{platform}/python{X}.{Y}/site-packages/``
   Both `purelib` and `platlib` install to the base 'site-packages'
   directory, so any files copied to these paths should be placed within a
   desired top-level package directory.
 
-- `headers` (INCLUDE search paths): ``{prefix}/include/{site}/python{X}.{Y}{abiflags}/{distname}/``
-- `scripts` (executable search path): ``{prefix}/bin/``
+- `headers` (INCLUDE search paths): ``{venv}/include/{site}/python{X}.{Y}{abiflags}/{distname}/``
+- `scripts` (executable search path): ``{venv}/bin/``
   Even though any files added to the `scripts` path will be installed to
   the `bin` directory, there is often an issue with the 'execute' permission
   being set correctly by the installer (e.g. `pip`).
@@ -412,7 +445,7 @@ Available install scheme keys, and **example** corresponding install locations,
   use the ``[project.scripts]`` section to add an entry point that will then
   run the desired executable as a sub-process.
 
-- `data` (generic data path): ``{prefix}/``
+- `data` (generic data path): ``{venv}/``
 
 ```toml
 # pyproject.toml

{partis_pyproj-0.1.5 → partis_pyproj-0.1.7}/README.md

@@ -252,6 +252,7 @@ setup_args: array{STRING}    # 3-stage build
 compile_args: array{STRING}  # 3-stage build
 install_args: array{STRING}  # 3-stage build
 options: table{STRING|BOOL}? # options passed to builder from pyproject.toml
+env: table{STRING|STRING}?   # environment variables to set
 build_clean: BOOL?           # control cleanup (ie for development builds)
 enabled: (BOOL|MARKER)?      # environment marker
 ```
@@ -261,11 +262,28 @@ There are several entry points available as-is:
 - `partis.pyproj.builder:meson` - Support for [Meson Build system](https://mesonbuild.com/)  with the 'extra' ``partis-pyproj[meson]``
 - `partis.pyproj.builder:cmake` - Support for [CMake](https://cmake.org/) with the 'extra' ``partis-pyproj[cmake]``
 - `partis.pyproj.builder:process` - Support for running arbitrary command line executable
+- `partis.pyproj.builder:download` - Support for downloading a file to `build_dir`
+
+
+Options for `partis.pyproj.builder:download`:
+
+```
+[tool.pyproj.targets.options]
+url: URL
+checksum: ALG=HEX     # expected checksum
+filename: STRING?     # rename in build_dir, defaults to mangled version of url
+extract: BOOL?        # extract/decompress as a tar file
+executable: BOOL?     # set execute permission
+```
+
+Checksum `ALG` can be `sha256`, `md5`, or another algorithm in [hashlib](https://docs.python.org/3/library/hashlib.html)
+
+**Example**
 
 In this example, the source directory must contain appropriate `meson.build` files,
 since the 'pyproject.toml' configuration only provides a way of running
 ``meson setup`` and ``meson compile``.
-For example:
+
 
 ```toml
 # pyproject.toml
@@ -332,7 +350,7 @@ Python [Template string](https://docs.python.org/3/library/string.html#template-
 - `$$` is an escape; it is replaced with a single `$`.
 - `${identifier}` names a substitution placeholder matching a mapping key of "identifier".
 
-However, `$identifier` (without braces) is not supported, instead allowing more expressive substitutions.
+However, `$identifier` (without braces) is *not supported*, but this restriction allows more expressive substitutions.
 
 ```
 substitution: "${" (variable|literal|SEP)+ "}"
@@ -341,16 +359,30 @@ SEP: "/"
 literal: "'" CHAR+ "'"
 IDENTIFIER: < python identifier >
 INTEGER: < integer >
-CHAR: < ascii letter, number (not leading), or underscore >
+CHAR: < ascii alpha-numeric, dot ".", dash "-", underscore "_" >
 ```
 
-Variable names can reference most of the content of the original 'pyproject.toml',
-as well as values already substituted in the build target or earlier targets.
+Top-level template variable identifiers can reference the content of the original 'pyproject.toml', config. settings, environment variables, and values already substituted in the build target or earlier targets.
 If the substitution contains any separators the result is interpreted as a path, converted to platform-specific filesystem format, and resolved to project directory.
-
-**Example**
-
-The value of `options.some_option` in the example below would be substituted with a filesystem equivalent path for `{root}/build/something/my_pkg/xyz/abc.so`:
+The template namespace contains the following keys:
+
+- `root`: Absolute path to project root directory
+- `tmpdir`: A temporary directory created and shared by all build targets.
+  This directory is removed before the distribution is created, so any needed files must be copied back to a location within the project tree by one of the targets
+  (eg. the "install" step of 3-stage builds with a `prefix` within the project).
+- `pptoml`: Top-level of parsed `pyproject.toml`
+- `project`: The `project` section, including `name`, `version`, etc.
+- `pyproj`: The `tool.pyproj` section.
+- `config_settings`: A mapping from the `config_settings` passed to backend per PEP-517
+  after defaults applied from `tool.pyproj.config` (described below).
+- `targets`': List from `tool.pyproj.targets`, updated as targets are processed.
+- `work_dir`, `src_dir`, `build_dir`, `prefix`: Per-target values (if processed before the substitution)
+- `env`: Defaults to `os.environ`, or per-target value from `tool.pyproj.targets.env`
+  (if processed before the substitution).
+- `options`: Per-target value from `tool.pyproj.targets.options` (if processed before the substitution)
+
+Template substitutions are processed (once) in the *order in which they appear* from the `pyproject.toml`, no static analysis is performed. It is up to the developer to put them in the needed order if one template references a value resulting from another template.
+In the example below, the value of `options.some_option` would be substituted with a filesystem equivalent path for `{root}/build/something/my_pkg/xyz/abc.so`:
 
 
 ```toml
@@ -371,14 +403,14 @@ location according to a local installation scheme
 these can be specified within sub-tables.
 Available install scheme keys, and **example** corresponding install locations, are:
 
-- `purelib` ("pure" library Python path): ``{prefix}/lib/python{X}.{Y}/site-packages/``
-- `platlib` (platform specific Python path): ``{prefix}/lib{platform}/python{X}.{Y}/site-packages/``
+- `purelib` ("pure" library Python path): ``{venv}/lib/python{X}.{Y}/site-packages/``
+- `platlib` (platform specific Python path): ``{venv}/lib{platform}/python{X}.{Y}/site-packages/``
   Both `purelib` and `platlib` install to the base 'site-packages'
   directory, so any files copied to these paths should be placed within a
   desired top-level package directory.
 
-- `headers` (INCLUDE search paths): ``{prefix}/include/{site}/python{X}.{Y}{abiflags}/{distname}/``
-- `scripts` (executable search path): ``{prefix}/bin/``
+- `headers` (INCLUDE search paths): ``{venv}/include/{site}/python{X}.{Y}{abiflags}/{distname}/``
+- `scripts` (executable search path): ``{venv}/bin/``
   Even though any files added to the `scripts` path will be installed to
   the `bin` directory, there is often an issue with the 'execute' permission
   being set correctly by the installer (e.g. `pip`).
@@ -386,7 +418,7 @@ Available install scheme keys, and **example** corresponding install locations,
   use the ``[project.scripts]`` section to add an entry point that will then
   run the desired executable as a sub-process.
 
-- `data` (generic data path): ``{prefix}/``
+- `data` (generic data path): ``{venv}/``
 
 ```toml
 # pyproject.toml

{partis_pyproj-0.1.5 → partis_pyproj-0.1.7}/pyproject.toml

@@ -26,7 +26,7 @@
 
 [project]
 name = "partis-pyproj"
-version = "0.1.5"
+version = "0.1.7"
 description = "Minimal set of Python project utilities (PEP-517/621)"
 maintainers = [
   { name = "Nanohmics Inc.", email = "software.support@nanohmics.com" } ]
@@ -45,7 +45,8 @@ classifiers = [
 requires-python = ">= 3.8"
 dependencies = [
   "packaging >= 24.2",
-  "tomli >= 2.0.1" ]
+  "tomli >= 2.0.1",
+  "requests >= 2.32.3"]
 
 #===============================================================================
 [project.optional-dependencies]

{partis_pyproj-0.1.5 → partis_pyproj-0.1.7}/src/pyproj/_nonprintable.py

@@ -4,13 +4,13 @@ import re
 
 #===============================================================================
 def _gen_nonprintable():
-  test = ''
+  test = []
 
   ns = [ [0,], ]
 
   for i in range(1, sys.maxunicode+1):
     c = chr(i)
-    test += c
+    test.append(c)
 
     if not ( c.isprintable() or c in '\n\t' ):
       n = ns[-1]
@@ -23,6 +23,8 @@ def _gen_nonprintable():
       else:
         ns.append([i,])
 
+  test = ''.join(test)
+
   # print(len(test), test.isprintable())
   # print(len(ns))
   # print(ns)

{partis_pyproj-0.1.5 → partis_pyproj-0.1.7}/src/pyproj/builder/__init__.py

@@ -1,6 +1,7 @@
 
 from .builder import Builder
 from .process import process
+from .download import download
 from .meson import meson
 from .cmake import cmake
 from .cargo import cargo

{partis_pyproj-0.1.5 → partis_pyproj-0.1.7}/src/pyproj/builder/builder.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import os
 import os.path as osp
-import sys
+import tempfile
 import sysconfig
 import re
 from copy import copy
@@ -61,6 +61,7 @@ class Builder:
     self.targets = [copy(v) for v in targets]
     self.clean_dirs = [False]*len(self.targets)
     self.logger = logger
+    self.tmpdir = Path(tempfile.mkdtemp(prefix=f"build-{pyproj.project.name}-"))
     self.namespace = Namespace({
       'root': root,
       'pptoml': pyproj.pptoml,
@@ -69,8 +70,11 @@ class Builder:
       'config_settings': pyproj.config_settings,
       'targets': targets,
       'env': os.environ,
+      'tmpdir': self.tmpdir,
       'config_vars': sysconfig.get_config_vars()},
-      root=root)
+      root=root,
+      # better way for builders to whitelist templated directories?
+      dirs=[self.tmpdir, Path(tempfile.gettempdir())/'partis-pyproj-downloads'])
 
   #-----------------------------------------------------------------------------
   def __enter__(self):
@@ -85,11 +89,37 @@ class Builder:
 
   #-----------------------------------------------------------------------------
   def build_targets(self):
+    exclusive = {
+      target.exclusive: None
+      for target in self.targets
+      if target.exclusive}
+
+    if exclusive:
+      for i, target in enumerate(self.targets):
+        if not (group := target.exclusive):
+          continue
+
+        cur = exclusive[group]
+
+        if target.enabled:
+          if cur is None:
+            exclusive[group] = i
+
+
+      missing = [group for group, idx in exclusive.items() if idx is None]
+
+      if missing:
+        raise ValidationError(f"Exclusive group {missing} does not have an enabled target")
+
     for i, target in enumerate(self.targets):
       if not target.enabled:
         self.logger.info(f"Skipping targets[{i}], disabled for environment markers")
         continue
 
+      if (group := target.exclusive) and (group_idx := exclusive.get(group)) != i:
+        self.logger.warning(
+          f"Skipping targets[{i}], exclusive group {group!r} already satisfied by targets[{group_idx}]")
+
       # each target isolated (shallow) changes to namespace
       namespace = copy(self.namespace)
 
@@ -106,9 +136,9 @@ class Builder:
 
           abs_path = resolve(abs_path)
 
-          if not subdir(self.root, abs_path, check=False):
+          if not (subdir(self.root, abs_path, check=False) or subdir(self.tmpdir, abs_path, check=False)):
             raise FileOutsideRootError(
-              f"Must be within project root directory:"
+              f"Must be within project root directory or tmpdir:"
               f"file = \"{abs_path}\",  root = \"{self.root}\"")
 
           if k in ('build_dir', 'prefix') and subdir(abs_path, self.root, check=False):
@@ -249,6 +279,8 @@ class Builder:
         self.logger.info(f"Removing build dir: {build_dir}")
         shutil.rmtree(build_dir)
 
+    shutil.rmtree(self.tmpdir)
+
 #===============================================================================
 class ProcessRunner:
   #-----------------------------------------------------------------------------
@@ -273,10 +305,11 @@ class ProcessRunner:
     cmd_exec_src = shutil.which(cmd_exec)
 
     if cmd_exec_src is None:
-      raise ValueError(
+      raise ValidationError(
         f"Executable does not exist or has in-sufficient permissions: {cmd_exec}")
 
-    cmd_exec_src = resolve(Path(cmd_exec_src))
+    # cmd_exec_src = resolve(Path(cmd_exec_src))
+    cmd_exec_src = Path(cmd_exec_src)
     cmd_name = cmd_exec_src.name
     args = [str(cmd_exec_src)]+args[1:]
 

partis_pyproj-0.1.7/src/pyproj/builder/download.py

@@ -0,0 +1,189 @@
+from __future__ import annotations
+import sys
+import os
+import platform
+import stat
+import re
+from pathlib import Path
+import hashlib
+from urllib.parse import urlsplit
+import tarfile
+import tempfile
+from base64 import urlsafe_b64encode
+import logging
+from .builder import (
+  ProcessRunner)
+from ..validate import (
+  ValidationError)
+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)
+
+#===============================================================================
+def download(
+  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):
+  """Download a file
+  """
+  import requests
+
+  chunk_size = int(options.get('chunk_size', 2**16))
+
+  url = options.get('url')
+  executable = options.get('executable')
+
+  if not url:
+    raise ValidationError(
+      "Download 'url' required")
+
+  url = nonempty_str(url)
+
+  checksum = options.get('checksum')
+
+  if checksum is None:
+    raise ValidationError(
+      "Download 'checksum' required, or explicitly set 'checksum=false'")
+
+
+  filename = options.get('filename', url.split('/')[-1])
+  extract = options.get('extract', None)
+
+  cache_file = _cached_download(url, checksum)
+  out_file = build_dir/filename
+
+  if cache_file.exists():
+    logger.info(f"Using cache file: {cache_file}")
+
+  else:
+    # name unique to host/process as countermeasure for race condition
+    hostname = re.sub(r'[^a-zA-Z0-9]+', '_', str(platform.node()))
+    tmp_name = f"{cache_file.name}-{hostname}-{os.getpid():06d}.tmp"
+    tmp_file = cache_file.with_name(tmp_name)
+
+    if tmp_file.exists():
+      tmp_file.unlink()
+
+    if checksum:
+      checksum = checksum.lower()
+      alg, _, checksum = checksum.partition('=')
+
+      try:
+        hash = getattr(hashlib, alg)()
+
+      except AttributeError:
+        raise ValidationError(
+          f"Checksum algorithm must be one of {hashlib.algorithms_available}: got {alg}") from None
+
+    else:
+      hash = None
+
+    size = 0
+    last_size = 0
+
+    try:
+      logger.info(f"- downloading: {url} -> {tmp_file}")
+
+      with requests.get(url, stream=True) as req, tmp_file.open('wb') as fp:
+        for chunk in req.iter_content(chunk_size=chunk_size):
+          if chunk:
+            fp.write(chunk)
+            size += len(chunk)
+
+            if hash:
+              hash.update(chunk)
+
+            if size - last_size > 50e6:
+              logger.info(f"- {size/1e6:,.1f} MB")
+              last_size = size
+
+      logger.info(f"- complete {size/1e6:,.1f} MB")
+
+      if hash:
+        digest = hash.digest()
+
+        if checksum.endswith('='):
+          digest = urlsafe_b64encode(digest).decode("ascii")
+        elif checksum.startswith('x'):
+          digest = 'x'+digest.hex()
+        else:
+          digest = digest.hex()
+
+        checksum_ok = checksum == digest
+        logger.info(f"- checksum{' (OK)' if checksum_ok else ''}: {alg}={digest}")
+
+        if not checksum_ok:
+          raise ValidationError(f"Download checksum did not match: {digest} != {checksum}")
+
+    except Exception:
+      if tmp_file.exists():
+        tmp_file.unlink()
+
+      raise
+
+    tmp_file.replace(cache_file)
+
+
+  out_file.symlink_to(cache_file)
+
+  if extract:
+    logger.info(f"- extracting: {cache_file} -> {build_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,
+          members=None,
+          numeric_owner=False,
+          filter='tar')
+      else:
+        fp.extractall(
+          path=build_dir,
+          members=None,
+          numeric_owner=False)
+
+  if executable:
+    logger.info("- setting executable permission")
+    out_file.chmod(out_file.stat().st_mode|stat.S_IXUSR)
+
+#===============================================================================
+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
+
+  # hash of url + checksum used to prevent filename collision after url is sanitized
+  h = hashlib.sha256()
+  h.update(url.encode('utf-8') + checksum.encode('utf-8'))
+  # keep only 4 bytes (8 hex characters) worth of the hash
+  short = h.digest()[:4].hex()
+
+  if name != _url:
+    # possible for url without a path segment?
+    _url = _url.removesuffix('/'+name)
+
+  url_dirname = _filename_subs.sub('_', _url)
+  url_filename = f"{short}-" + _filename_subs.sub('_', name)
+
+  url_dir = cache_dir/url_dirname
+  url_dir.mkdir(exist_ok=True, parents=True)
+
+  file = url_dir/url_filename
+
+  info_file = file.with_name(file.name+'.info')
+  info_file.write_text(f"{url}\n{checksum}")
+
+  return file

{partis_pyproj-0.1.5 → partis_pyproj-0.1.7}/src/pyproj/load_module.py

@@ -24,7 +24,7 @@ from .validate import (
   mapget )
 
 #===============================================================================
-class EntryPointError(ValueError):
+class EntryPointError(ValidationError):
   pass
 
 #===============================================================================
@@ -177,16 +177,18 @@ class EntryPoint:
 
     cwd = os.getcwd()
 
-    try:
-
-      with validating( file = f"{self.name} -> {self.entry}" ):
+    with validating( file = f"{self.name} -> {self.entry}" ):
+      try:
         self.func(
           self.pyproj,
           logger = self.logger,
-          **kwargs )
+          **kwargs)
 
-    except Exception as e:
-      raise EntryPointError(f"failed to run '{self.entry}'") from e
+      except ValidationError:
+        raise
+
+      except Exception as e:
+        raise EntryPointError(f"failed to run '{self.entry}'") from e
 
-    finally:
-      os.chdir(cwd)
+      finally:
+        os.chdir(cwd)

{partis_pyproj-0.1.5 → partis_pyproj-0.1.7}/src/pyproj/pptoml.py

@@ -49,7 +49,7 @@ from .pep import (
   norm_entry_point_ref,
   norm_dist_keyword,
   norm_dist_classifier,
-  norm_dist_url )
+  norm_dist_url)
 
 #===============================================================================
 class dynamic(valid_list):
@@ -260,6 +260,7 @@ class pyproj_build_target(valid_dict):
     ('compile', 'enabled')]
   default = {
     'enabled': valid(True, marker_evaluated),
+    'exclusive': valid('', norm_printable),
     # NOTE: default builder from backward compatibility
     'entry': valid('partis.pyproj.builder:meson', norm_entry_point_ref),
     'options': dict,

{partis_pyproj-0.1.5 → partis_pyproj-0.1.7}/src/pyproj/pyproj.py

@@ -201,6 +201,10 @@ class PyProjBase:
     """
     return self._config_settings
 
+  #-----------------------------------------------------------------------------
+  # alias for backward compatibility
+  config = config_settings
+
   #-----------------------------------------------------------------------------
   @property
   def targets(self):
@@ -218,6 +222,9 @@ class PyProjBase:
       These are no longer restricted to meson, but this attribute kept for backward
       compatability.
 
+      Inplace changes to the returned object are not propagated back to the target
+      configuration.
+
     """
     targets = self._pptoml.tool.pyproj.targets
 
@@ -227,6 +234,7 @@ class PyProjBase:
     meson = dict(targets[0])
     meson.pop('entry')
     meson.pop('work_dir')
+    meson.pop('env')
     meson['compile'] = meson.pop('enabled')
     return pyproj_meson(meson)
 

{partis_pyproj-0.1.5 → partis_pyproj-0.1.7}/src/pyproj/template.py

@@ -71,12 +71,12 @@ class Template:
         return '$'
 
       if m.group('unterminated') is not None:
-        raise TemplateError(f"Unterminated template substitution: {m.group()}")
+        raise TemplateError(f"Unterminated template substitution {m.group()!r}: {self.template!r}")
 
       name = m.group('braced').strip()
 
       if not _idpattern.fullmatch(name):
-        raise TemplateError(f"Invalid template substitution: {name}")
+        raise TemplateError(f"Invalid template substitution {name!r}: {self.template!r}")
 
       return str(namespace[name])
 
@@ -95,13 +95,21 @@ class Namespace(Mapping):
   root:
     If given, absolute path to project root, used to resolve relative paths and ensure
     any derived paths are within this parent directory.
+  dirs:
+    Additional white-listed directories to allow paths
   """
-  __slots__ = ['data', 'root']
+  __slots__ = ['data', 'root', 'dirs']
 
   #-----------------------------------------------------------------------------
-  def __init__(self, data: Mapping, *, root: Path = None):
+  def __init__(self, data: Mapping, *, root: Path = None, dirs: list[Path]|None = None):
+    if dirs is None:
+      dirs = []
+    elif isinstance(dirs, Path):
+      dirs = [dirs]
+
     self.data = data
     self.root = root
+    self.dirs = dirs
 
   #-----------------------------------------------------------------------------
   def __iter__(self):
@@ -150,7 +158,10 @@ class Namespace(Mapping):
         # NOTE: ignored if root is a pure path
         out = resolve(out)
 
-      if not subdir(root, out, check = False):
+      if any(subdir(v, out, check = False) for v in self.dirs):
+        ...
+
+      elif not subdir(root, out, check = False):
         raise FileOutsideRootError(
           f"Must be within project root directory:"
           f"\n  file = \"{out}\"\n  root = \"{root}\"")
@@ -163,6 +174,7 @@ class Namespace(Mapping):
     obj = cls.__new__(cls)
     obj.data = copy(self.data)
     obj.root = self.root
+    obj.dirs = self.dirs
     return obj
 
   #-----------------------------------------------------------------------------
@@ -210,9 +222,10 @@ def template_substitute(
     return cls(Template(value).substitute(namespace))
 
   if isinstance(value, Path):
-    return cls(*(
-      Template(v).substitute(namespace)
-      for v in value.parts))
+    return cls(Template(str(value)).substitute(namespace))
+    # return cls(*(
+    #   Template(v).substitute(namespace)
+    #   for v in value.parts))
 
   if isinstance(value, Mapping):
     return cls({