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

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

@@ -1,24 +1,25 @@
 Metadata-Version: 2.1
 Name: partis-pyproj
-Version: 0.1.7
+Version: 0.1.9
 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: Development Status :: 4 - Beta
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Topic :: Software Development :: Build Tools
+Project-URL: homepage, https://github.com/kcdodd/partis-pyproj/
 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: Programming Language :: Python :: 3
+Classifier: Operating System :: POSIX :: Linux
 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: requests>=2.32.3
 Requires-Dist: meson>=0.61.3; extra == "meson"
 Requires-Dist: ninja>=1.10.2.3; extra == "meson"
 Requires-Dist: ninja>=1.10.2.3; extra == "cmake"

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

@@ -26,7 +26,7 @@
 
 [project]
 name = "partis-pyproj"
-version = "0.1.7"
+version = "0.1.9"
 description = "Minimal set of Python project utilities (PEP-517/621)"
 maintainers = [
   { name = "Nanohmics Inc.", email = "software.support@nanohmics.com" } ]
@@ -64,6 +64,10 @@ cmake = [
 name = "Nanohmics Inc."
 email = "software.support@nanohmics.com"
 
+#===============================================================================
+[project.urls]
+homepage = "https://github.com/kcdodd/partis-pyproj/"
+
 #===============================================================================
 # Build and distribution configuration
 #===============================================================================

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

@@ -1,8 +1,6 @@
 from __future__ import annotations
 import os
-import os.path as osp
-import sys
-import shutil
+from copy import copy
 import logging
 from logging import (
   basicConfig,
@@ -22,6 +20,7 @@ from collections.abc import (
 
 from . import (
   valid_keys,
+  ValidationError,
   mapget,
   dist_build,
   PkgInfoReq,
@@ -34,7 +33,7 @@ def backend_init(
   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
+  """Called to initialize the backend upon a call to one of the hooks
 
   Parameters
   ----------
@@ -210,26 +209,30 @@ def build_wheel(
   * https://www.python.org/dev/peps/pep-0517/#build-wheel
   """
 
-  pyproj = backend_init(config_settings = config_settings)
+  try:
+    pyproj = backend_init(config_settings = config_settings)
 
-  pyproj.dist_prep()
+    pyproj.dist_prep()
+    pyproj.dist_binary_prep()
 
-  pyproj.dist_binary_prep()
+    with dist_binary_wheel(
+      pkg_info = pyproj.pkg_info,
+      build = dist_build(
+        pyproj.binary.get('build_number', None),
+        pyproj.binary.get('build_suffix', None) ),
+      compat = pyproj.binary.compat_tags,
+      outdir = wheel_directory,
+      logger = pyproj.logger ) as dist:
 
-  with dist_binary_wheel(
-    pkg_info = pyproj.pkg_info,
-    build = dist_build(
-      pyproj.binary.get('build_number', None),
-      pyproj.binary.get('build_suffix', None) ),
-    compat = pyproj.binary.compat_tags,
-    outdir = wheel_directory,
-    logger = pyproj.logger ) as dist:
+      pyproj.dist_binary_copy(
+        dist = dist )
 
-    pyproj.dist_binary_copy(
-      dist = dist )
+    pyproj.logger.info(
+      f"Top level packages {dist.top_level}")
 
-  pyproj.logger.info(
-    f"Top level packages {dist.top_level}")
+  except ValidationError as e:
+    known_exception_type = copy(e)
+    raise known_exception_type from e.__cause__
 
   return dist.outname
 

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

@@ -70,9 +70,9 @@ def cmake(
 
   compile_args = [
     'cmake',
-    *compile_args,
     '--build',
-    str(build_dir) ]
+    str(build_dir),
+    *compile_args]
 
   install_args = [
     'cmake',

{partis_pyproj-0.1.7 → partis_pyproj-0.1.9}/src/pyproj/dist_file/dist_copy.py

@@ -58,6 +58,7 @@ def dist_iter(*,
         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:

{partis_pyproj-0.1.7 → partis_pyproj-0.1.9}/src/pyproj/norms.py

@@ -391,12 +391,14 @@ class TimeEncode:
     Parameters
     ----------
     resolution : int
-      Number of seconds that are resolved
+      Number of seconds that are resolved.
+      The default resolution is 1 minute
     rollover : int
       Number of seconds upper bound before wrapping.
-      The number of distinct values is ``rollover // resolution``
+      The number of distinct values is ``rollover // resolution``.
+      The default rollover is 324 days
     width : int
-      Minimal witdth of encoded number
+      Minimal width of encoded number
     base : int
       Numeric base used to encode number
     """

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

@@ -26,6 +26,7 @@ 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,
@@ -164,12 +165,14 @@ def norm_dist_filename( name ):
   Each component of the filename is escaped by replacing runs of
   non-alphanumeric characters with an underscore '_'
 
+  Addendum - It seems that "local" versions require '+'
+
   See Also
   --------
   * https://www.python.org/dev/peps/pep-0427/#file-name-convention
   """
 
-  return re.sub( r"[^\w\d\.]+", "_", name )
+  return re.sub( r"[^\w\d\.\+]+", "_", name )
 
 #===============================================================================
 def join_dist_filename( parts ):
@@ -639,10 +642,11 @@ pep426_dist_name = re.compile(
   r'^([A-Z0-9]|[A-Z0-9][A-Z0-9._\-]*[A-Z0-9])$',
   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]*))?$' )
+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

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

@@ -130,6 +130,49 @@ class optional_dependencies(valid_dict):
   key_valid = valid(norm_dist_extra)
   value_valid = valid(optional_dependency_group)
 
+#===============================================================================
+class dependency_group_include(valid_dict):
+  allow_keys = list()
+  default = {
+    'include-group': valid(norm_dist_extra)}
+
+#===============================================================================
+class dependency_group(valid_list):
+  value_valid = union(dependency_group_include, valid(norm_printable, Requirement, str))
+
+#===============================================================================
+def _check_dependency_groups(groups):
+  for group,v in groups.items():
+    for dep in v:
+      if isinstance(dep, Mapping):
+        _group = dep.get('include-group')
+
+        if _group not in groups:
+          raise ValidationError(f"'include-group' must be one of {set(groups)}: got {_group!r}")
+
+        elif _group == group:
+          raise ValidationError(f"'include-group' cannot be recursive: {_group!r}")
+
+  return groups
+
+#===============================================================================
+class dependency_groups(valid_dict):
+  r"""Dependency Groups
+
+  * https://packaging.python.org/en/latest/specifications/dependency-groups/
+
+  .. code-block:: toml
+    :caption: Example Dependency Groups
+
+    [dependency-groups]
+    coverage = ["coverage[toml]"]
+    test = ["pytest>7", {include-group = "coverage"}]
+
+  """
+  key_valid = valid(norm_dist_extra)
+  value_valid = valid(dependency_group)
+  validator = valid(_check_dependency_groups)
+
 #===============================================================================
 class entry_point_group(valid_dict):
   key_valid = valid(norm_entry_point_name)
@@ -317,7 +360,7 @@ class include(valid_dict):
   proxy_key = 'glob'
   # TODO: how to normalize patterns?
   default = {
-    'glob': valid(nonempty_str),
+    'glob': valid(r'**', nonempty_str),
     'rematch': valid(r'.*', nonempty_str, re.compile),
     'replace': valid('{0}', nonempty_str)}
 

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

@@ -235,6 +235,7 @@ class PyProjBase:
     meson.pop('entry')
     meson.pop('work_dir')
     meson.pop('env')
+    meson.pop('exclusive')
     meson['compile'] = meson.pop('enabled')
     return pyproj_meson(meson)
 

{partis_pyproj-0.1.7 → partis_pyproj-0.1.9}/src/pyproj/validate.py

@@ -276,6 +276,10 @@ def validate(val, default, validators):
   if not isinstance(validators, Sequence):
     validators = [validators]
 
+  if not isinstance(validators, (list,tuple)):
+    raise ValidDefinitionError(
+      "Validators must be list or tuple")
+
   for validator in validators:
     if isinstance(validator, type):
       # cast to valid type (if needed)
@@ -755,7 +759,8 @@ class _ValidDictMeta(ABCMeta):
       'deprecate_keys',
       'forbid_keys',
       'default',
-      'proxy_keys')
+      'proxy_keys',
+      'validator')
 
     schema = {}
 
@@ -820,21 +825,24 @@ class _ValidDictMeta(ABCMeta):
     all_keys = tuple(all_keys)
 
     # compose validator with parameterized valid_keys method
-    validator = valid(
-      validator or (lambda v: v),
-      partial(valid_keys,
-        key_valid = key_valid,
-        value_valid = value_valid,
-        item_valid = item_valid,
-        allow_keys = allow_keys,
-        require_keys = require_keys,
-        min_keys = min_keys,
-        wedge_keys = wedge_keys,
-        mutex_keys = mutex_keys,
-        deprecate_keys = deprecate_keys,
-        forbid_keys = forbid_keys,
-        default = default,
-        proxy_keys = proxy_keys))
+    validators = [partial(valid_keys,
+      key_valid = key_valid,
+      value_valid = value_valid,
+      item_valid = item_valid,
+      allow_keys = allow_keys,
+      require_keys = require_keys,
+      min_keys = min_keys,
+      wedge_keys = wedge_keys,
+      mutex_keys = mutex_keys,
+      deprecate_keys = deprecate_keys,
+      forbid_keys = forbid_keys,
+      default = default,
+      proxy_keys = proxy_keys)]
+
+    if validator:
+      validators.append(validator)
+
+    validator = valid(*validators)
 
     namespace['_all_keys'] = all_keys
     namespace['_validator'] = validator
@@ -925,6 +933,9 @@ class valid_dict(Mapping, metaclass = _ValidDictMeta):
       elif cls.proxy_key:
         args = [{ cls.proxy_key : v }]
 
+      else:
+        raise ValidationError(f"Expected mapping: got {v!r}")
+
     self._data = dict(*args, **kwargs)
     self._validate()
 
@@ -1042,19 +1053,23 @@ class valid_list(list):
   #---------------------------------------------------------------------------#
   def __init__( self, vals = None ):
     cls = type(self)
-    self._as_list = cls._as_list or list
-    self.value_valid = valid(
-      cls.value_valid or (lambda v: v))
 
     if vals is None:
       vals = list()
 
-    elif self._as_list:
-      vals = self._as_list(vals)
+    elif cls._as_list:
+      vals = cls._as_list(vals)
+
+    elif not isinstance(vals, Iterable) or isinstance(vals, (str,Mapping)):
+      raise ValidationError(f"Excpected sequence: got {vals!r}")
 
-    for i,v in enumerate(vals):
-      with validating(key = i):
-        vals[i] = self.value_valid(v)
+    else:
+      vals = list(vals)
+
+    if cls.value_valid:
+      for i,v in enumerate(vals):
+        with validating(key = i):
+          vals[i] = cls.value_valid(v)
 
     super().__init__(vals)
     self._validate()
@@ -1072,8 +1087,9 @@ class valid_list(list):
 
   #---------------------------------------------------------------------------#
   def append(self, val ):
-    with validating(key = len(self)):
-      val = self.value_valid(val)
+    if self.value_valid:
+      with validating(key = len(self)):
+        val = self.value_valid(val)
 
     super().append(val)
 
@@ -1081,16 +1097,18 @@ class valid_list(list):
   def extend(self, vals ):
     vals = list(vals)
 
-    for i,v in enumerate(vals):
-      with validating(key = len(self) + i):
-        vals[i] = self.value_valid(v)
+    if self.value_valid:
+      for i,v in enumerate(vals):
+        with validating(key = len(self) + i):
+          vals[i] = self.value_valid(v)
 
     super().extend(vals)
 
   #-----------------------------------------------------------------------------
   def __setitem__( self, key, val ):
-    with validating(key = key):
-      val = self.value_valid(val)
+    if self.value_valid:
+      with validating(key = key):
+        val = self.value_valid(val)
 
     super().__setitem__(key, val)