ovld 0.5.4__tar.gz → 0.5.6__tar.gz

{ovld-0.5.4 → ovld-0.5.6}/.github/workflows/python-package.yml

@@ -39,6 +39,8 @@ jobs:
           coverage: false
         - python: '3.11'
           coverage: false
+        - python: 'pypy3.11'
+          coverage: false
         - python: '3.12'
           coverage: false
         - python: '3.13'

{ovld-0.5.4 → ovld-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ovld
-Version: 0.5.4
+Version: 0.5.6
 Summary: Overloading Python functions
 Project-URL: Homepage, https://ovld.readthedocs.io/en/latest/
 Project-URL: Documentation, https://ovld.readthedocs.io/en/latest/
@@ -251,13 +251,13 @@ f3 = Total(punctuation="!", factor=3)
 
 Time relative to the fastest implementation (1.00) (lower is better).
 
-| Benchmark | custom | [ovld](https://github.com/breuleux/ovld) | [plum](https://github.com/beartype/plum) | [multim](https://github.com/coady/multimethod) | [multid](https://github.com/mrocklin/multipledispatch) | [runtype](https://github.com/erezsh/runtype) | [sd](https://docs.python.org/3/library/functools.html#functools.singledispatch) |
+| Benchmark | custom | [ovld](https://github.com/breuleux/ovld) | [plum](https://github.com/beartype/plum) | [multim](https://github.com/coady/multimethod) | [multid](https://github.com/mrocklin/multipledispatch/) | [runtype](https://github.com/erezsh/runtype) | [sd](https://docs.python.org/3/library/functools.html#functools.singledispatch) |
 | --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: |
-|[trivial](https://github.com/breuleux/ovld/tree/master/benchmarks/test_trivial.py)|1.45|1.00|3.32|4.63|2.04|2.41|1.91|
-|[multer](https://github.com/breuleux/ovld/tree/master/benchmarks/test_multer.py)|1.13|1.00|11.05|4.53|8.31|2.19|7.32|
-|[add](https://github.com/breuleux/ovld/tree/master/benchmarks/test_add.py)|1.08|1.00|3.73|5.21|2.37|2.79|x|
-|[ast](https://github.com/breuleux/ovld/tree/master/benchmarks/test_ast.py)|1.00|1.08|23.14|3.09|1.68|1.91|1.66|
-|[calc](https://github.com/breuleux/ovld/tree/master/benchmarks/test_calc.py)|1.00|1.23|54.61|29.32|x|x|x|
-|[regexp](https://github.com/breuleux/ovld/tree/master/benchmarks/test_regexp.py)|1.00|1.87|19.18|x|x|x|x|
-|[fib](https://github.com/breuleux/ovld/tree/master/benchmarks/test_fib.py)|1.00|3.30|444.31|125.77|x|x|x|
-|[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|2.09|x|x|x|x|x|
+|[trivial](https://github.com/breuleux/ovld/tree/master/benchmarks/test_trivial.py)|1.56|1.00|3.38|4.92|2.00|2.38|2.15|
+|[multer](https://github.com/breuleux/ovld/tree/master/benchmarks/test_multer.py)|1.22|1.00|11.06|4.67|9.22|2.24|3.92|
+|[add](https://github.com/breuleux/ovld/tree/master/benchmarks/test_add.py)|1.27|1.00|3.61|4.93|2.24|2.62|x|
+|[ast](https://github.com/breuleux/ovld/tree/master/benchmarks/test_ast.py)|1.01|1.00|22.98|2.72|1.52|1.70|1.57|
+|[calc](https://github.com/breuleux/ovld/tree/master/benchmarks/test_calc.py)|1.00|1.28|57.86|29.79|x|x|x|
+|[regexp](https://github.com/breuleux/ovld/tree/master/benchmarks/test_regexp.py)|1.00|2.28|22.71|x|x|x|x|
+|[fib](https://github.com/breuleux/ovld/tree/master/benchmarks/test_fib.py)|1.00|3.39|403.38|114.69|x|x|x|
+|[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|1.86|x|x|x|x|x||[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|1.86|x|x|x|x|x|

{ovld-0.5.4 → ovld-0.5.6}/README.md

@@ -238,13 +238,13 @@ f3 = Total(punctuation="!", factor=3)
 
 Time relative to the fastest implementation (1.00) (lower is better).
 
-| Benchmark | custom | [ovld](https://github.com/breuleux/ovld) | [plum](https://github.com/beartype/plum) | [multim](https://github.com/coady/multimethod) | [multid](https://github.com/mrocklin/multipledispatch) | [runtype](https://github.com/erezsh/runtype) | [sd](https://docs.python.org/3/library/functools.html#functools.singledispatch) |
+| Benchmark | custom | [ovld](https://github.com/breuleux/ovld) | [plum](https://github.com/beartype/plum) | [multim](https://github.com/coady/multimethod) | [multid](https://github.com/mrocklin/multipledispatch/) | [runtype](https://github.com/erezsh/runtype) | [sd](https://docs.python.org/3/library/functools.html#functools.singledispatch) |
 | --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: |
-|[trivial](https://github.com/breuleux/ovld/tree/master/benchmarks/test_trivial.py)|1.45|1.00|3.32|4.63|2.04|2.41|1.91|
-|[multer](https://github.com/breuleux/ovld/tree/master/benchmarks/test_multer.py)|1.13|1.00|11.05|4.53|8.31|2.19|7.32|
-|[add](https://github.com/breuleux/ovld/tree/master/benchmarks/test_add.py)|1.08|1.00|3.73|5.21|2.37|2.79|x|
-|[ast](https://github.com/breuleux/ovld/tree/master/benchmarks/test_ast.py)|1.00|1.08|23.14|3.09|1.68|1.91|1.66|
-|[calc](https://github.com/breuleux/ovld/tree/master/benchmarks/test_calc.py)|1.00|1.23|54.61|29.32|x|x|x|
-|[regexp](https://github.com/breuleux/ovld/tree/master/benchmarks/test_regexp.py)|1.00|1.87|19.18|x|x|x|x|
-|[fib](https://github.com/breuleux/ovld/tree/master/benchmarks/test_fib.py)|1.00|3.30|444.31|125.77|x|x|x|
-|[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|2.09|x|x|x|x|x|
+|[trivial](https://github.com/breuleux/ovld/tree/master/benchmarks/test_trivial.py)|1.56|1.00|3.38|4.92|2.00|2.38|2.15|
+|[multer](https://github.com/breuleux/ovld/tree/master/benchmarks/test_multer.py)|1.22|1.00|11.06|4.67|9.22|2.24|3.92|
+|[add](https://github.com/breuleux/ovld/tree/master/benchmarks/test_add.py)|1.27|1.00|3.61|4.93|2.24|2.62|x|
+|[ast](https://github.com/breuleux/ovld/tree/master/benchmarks/test_ast.py)|1.01|1.00|22.98|2.72|1.52|1.70|1.57|
+|[calc](https://github.com/breuleux/ovld/tree/master/benchmarks/test_calc.py)|1.00|1.28|57.86|29.79|x|x|x|
+|[regexp](https://github.com/breuleux/ovld/tree/master/benchmarks/test_regexp.py)|1.00|2.28|22.71|x|x|x|x|
+|[fib](https://github.com/breuleux/ovld/tree/master/benchmarks/test_fib.py)|1.00|3.39|403.38|114.69|x|x|x|
+|[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|1.86|x|x|x|x|x||[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|1.86|x|x|x|x|x|

ovld-0.5.6/benchmarks/conftest.py

@@ -0,0 +1,37 @@
+import json
+
+from pytest_benchmark import utils
+
+from ovld import ovld, recurse
+
+
+@ovld
+def _cleanup(obj: str | int | float):
+    return obj
+
+
+@ovld
+def _cleanup(obj: list):
+    return [recurse(x) for x in obj]
+
+
+@ovld
+def _cleanup(obj: dict):
+    if type(obj) is not dict:
+        return f"UNSERIALIZABLE[{obj}]"
+    return {k: recurse(v) for k, v in obj.items()}
+
+
+@ovld
+def _cleanup(obj: object):
+    return f"UNSERIALIZABLE[{obj}]"
+
+
+def safer_dumps(obj, **kwargs):
+    # multimethod is not safe for dump of benchmarks because it's a subclass of dict
+    # with non-str keys and the json serialization just craps out.
+    return json.dumps(_cleanup(obj), **kwargs)
+
+
+utils._cleanup = _cleanup
+utils.safe_dumps.__code__ = safer_dumps.__code__

{ovld-0.5.4 → ovld-0.5.6}/benchmarks/test_add.py

@@ -85,8 +85,8 @@ C = {"xs": list(range(10, 110, 2)), "ys": ("ox", (13, 13))}
     multimethod=make_add(multimethod_dispatch),
     multipledispatch=make_add(multipledispatch_dispatch),
     runtype=make_add(runtype_dispatch),
-    isinstance=add_isinstance,
-    match=add_match,
+    custom__isinstance=add_isinstance,
+    custom__match=add_match,
 )
 def test_add(fn, benchmark):
     result = benchmark(fn, A, B)

{ovld-0.5.4 → ovld-0.5.6}/benchmarks/test_calc.py

@@ -135,8 +135,8 @@ expected_result = 19
     ovld=make_calc(ovld_dispatch),
     plum=make_calc(plum_dispatch),
     multimethod=make_calc(multimethod_dispatch),
-    custom_dict=calc_dict,
-    custom_match=calc_match,
+    custom__dict=calc_dict,
+    custom__match=calc_match,
 )
 def test_calc(fn, benchmark):
     result = benchmark(fn, expr)

{ovld-0.5.4 → ovld-0.5.6}/benchmarks/test_multer.py

@@ -143,13 +143,13 @@ C = {"xs": list(range(0, 150, 3)), "ys": ("ooo", (18, 21))}
 @pytest.mark.benchmark(group="multer")
 @with_functions(
     ovld=make_multer(ovld_dispatch),
-    recurse=OvldRecurseMulter,
+    ovld__recurse=OvldRecurseMulter,
     plum=make_multer(plum_dispatch),
     multimethod=make_multer(multimethod_dispatch),
     singledispatch=SingleDispatchMulter,
     multipledispatch=MultipleDispatchMulter,
     runtype=make_multer(runtype_dispatch),
-    isinstance=IsinstanceMulter,
+    custom=IsinstanceMulter,
 )
 def test_multer(fn, benchmark):
     result = benchmark(fn(3), A)

{ovld-0.5.4 → ovld-0.5.6}/benchmarks/test_regexp.py

@@ -82,9 +82,9 @@ def regexp_compiled_nonexclusive(x):
 @with_functions(
     ovld=make_regexp(ovld_dispatch),
     plum=make_regexp(plum_dispatch),
-    custom_search=regexp_search,
-    custom_compiled=regexp_compiled,
-    custom_compiled_nx=regexp_compiled_nonexclusive,
+    custom__search=regexp_search,
+    custom__compiled=regexp_compiled,
+    custom__compiled_nx=regexp_compiled_nonexclusive,
 )
 def test_regexp(fn, benchmark):
     def run():

{ovld-0.5.4 → ovld-0.5.6}/benchmarks/test_trivial.py

@@ -107,7 +107,7 @@ def trivial_isinstance(x):
     multipledispatch=make_trivial(multipledispatch_dispatch),
     runtype=make_trivial(runtype_dispatch),
     singledispatch=make_trivial(singledispatch_dispatch),
-    custom_isinstance=trivial_isinstance,
+    custom__isinstance=trivial_isinstance,
 )
 def test_trivial(fn, benchmark):
     def run():

{ovld-0.5.4 → ovld-0.5.6}/benchmarks/test_tweaknum.py

@@ -66,8 +66,8 @@ def tweaknum_match(n, **kwargs):
 @pytest.mark.benchmark(group="tweaknum")
 @with_functions(
     ovld=make_tweaknum(ovld_dispatch),
-    custom_ifs=tweaknum_ifs,
-    custom_match=tweaknum_match,
+    custom__ifs=tweaknum_ifs,
+    custom__match=tweaknum_match,
 )
 def test_tweaknum(fn, benchmark):
     def run():

{ovld-0.5.4 → ovld-0.5.6}/docs/compare.md

@@ -3,7 +3,7 @@
 
 ## Unique features
 
-Current as of October 2024: I have investigated and benchmarked six other multiple/single dispatch libraries. Performance-wise, `ovld` is faster than all of them, ranging from 1.5x to 100x less overhead. Feature-wise, `ovld` is among the most featureful. Some features I could not find elsewhere:
+Current as of May 2025: I have investigated and benchmarked five other multiple/single dispatch libraries. Performance-wise, `ovld` is faster than all of them, ranging from 1.5x to 100x less overhead. Feature-wise, `ovld` is among the most featureful. Some features I could not find elsewhere:
 
 * Support for [keyword arguments](usage.md#keyword-arguments).
 * [Variants](usage.md#variants), especially working with recursion.
@@ -18,7 +18,6 @@ Current as of October 2024: I have investigated and benchmarked six other multip
 * [**multimethod**](https://github.com/coady/multimethod): Also pretty featureful. Performs a bit worse than plum in simple cases, but better in more complicated cases.
 * [**multipledispatch**](https://github.com/mrocklin/multipledispatch/): Fair performance, interface is a bit dated, does not support dependent types.
 * [**runtype**](https://github.com/erezsh/runtype): Fair performance. Runtype supports Literal in theory, but it unfortunately bugged out on the calc and fib benchmarks.
-* [**fastcore**](https://github.com/fastai/fastcore): Somewhat limited (seems like it only dispatches on two arguments at most), and for a library with "fast" in its name, I must say it is impressively slow.
 * [**singledispatch**](https://docs.python.org/3/library/functools.html#functools.singledispatch): Comes native in Python, but only supports dispatch on a single argument.
 
 
@@ -38,20 +37,21 @@ Applicable libraries were tested on the following problems:
 
 ## Results
 
-Time relative to the fastest implementation (1.00) (lower is better). Python version: 3.12.4
+Time relative to the fastest implementation (1.00) (lower is better). Python version: 3.13.0
 
 The **custom** column represents custom implementations using isinstance, match, a dispatch dict, etc. They are usually the fastest, but that should not be surprising. ovld's performance ranges from 1.5x faster to 3.3x slower.
 
-| Benchmark | custom | [ovld](https://github.com/breuleux/ovld) | [plum](https://github.com/beartype/plum) | [multim](https://github.com/coady/multimethod) | [multid](https://github.com/mrocklin/multipledispatch) | [runtype](https://github.com/erezsh/runtype) | [sd](https://docs.python.org/3/library/functools.html#functools.singledispatch) |
+| Benchmark | custom | [ovld](https://github.com/breuleux/ovld) | [plum](https://github.com/beartype/plum) | [multim](https://github.com/coady/multimethod) | [multid](https://github.com/mrocklin/multipledispatch/) | [runtype](https://github.com/erezsh/runtype) | [sd](https://docs.python.org/3/library/functools.html#functools.singledispatch) |
 | --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: |
-|[trivial](https://github.com/breuleux/ovld/tree/master/benchmarks/test_trivial.py)|1.45|1.00|3.32|4.63|2.04|2.41|1.91|
-|[multer](https://github.com/breuleux/ovld/tree/master/benchmarks/test_multer.py)|1.13|1.00|11.05|4.53|8.31|2.19|7.32|
-|[add](https://github.com/breuleux/ovld/tree/master/benchmarks/test_add.py)|1.08|1.00|3.73|5.21|2.37|2.79|x|
-|[ast](https://github.com/breuleux/ovld/tree/master/benchmarks/test_ast.py)|1.00|1.08|23.14|3.09|1.68|1.91|1.66|
-|[calc](https://github.com/breuleux/ovld/tree/master/benchmarks/test_calc.py)|1.00|1.23|54.61|29.32|x|x|x|
-|[regexp](https://github.com/breuleux/ovld/tree/master/benchmarks/test_regexp.py)|1.00|1.87|19.18|x|x|x|x|
-|[fib](https://github.com/breuleux/ovld/tree/master/benchmarks/test_fib.py)|1.00|3.30|444.31|125.77|x|x|x|
-|[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|2.09|x|x|x|x|x|
+|[trivial](https://github.com/breuleux/ovld/tree/master/benchmarks/test_trivial.py)|1.56|1.00|3.38|4.92|2.00|2.38|2.15|
+|[multer](https://github.com/breuleux/ovld/tree/master/benchmarks/test_multer.py)|1.22|1.00|11.06|4.67|9.22|2.24|3.92|
+|[add](https://github.com/breuleux/ovld/tree/master/benchmarks/test_add.py)|1.27|1.00|3.61|4.93|2.24|2.62|x|
+|[ast](https://github.com/breuleux/ovld/tree/master/benchmarks/test_ast.py)|1.01|1.00|22.98|2.72|1.52|1.70|1.57|
+|[calc](https://github.com/breuleux/ovld/tree/master/benchmarks/test_calc.py)|1.00|1.28|57.86|29.79|x|x|x|
+|[regexp](https://github.com/breuleux/ovld/tree/master/benchmarks/test_regexp.py)|1.00|2.28|22.71|x|x|x|x|
+|[fib](https://github.com/breuleux/ovld/tree/master/benchmarks/test_fib.py)|1.00|3.39|403.38|114.69|x|x|x|
+|[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|1.86|x|x|x|x|x||[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|1.86|x|x|x|x|x|
+
 
 ## Comments
 

{ovld-0.5.4 → ovld-0.5.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ovld"
-version = "0.5.4"
+version = "0.5.6"
 description = "Overloading Python functions"
 authors = [
     { name = "Olivier Breuleux", email = "breuleux@gmail.com" }
@@ -32,7 +32,7 @@ benchmark = [
     "multimethod>=1.12",
     "multipledispatch>=1.0.0",
     "plum-dispatch>=2.5.2",
-    "runtype>=0.5.4",
+    "runtype>=0.5.3",
 ]
 
 [tool.hatch.build.targets.wheel]

{ovld-0.5.4 → ovld-0.5.6}/src/ovld/codegen.py

@@ -45,13 +45,22 @@ def transfer_function(
     globals=MISSING,
     name=MISSING,
 ):
-    new_fn = FunctionType(
-        argdefs=func.__defaults__ if argdefs is MISSING else argdefs,
-        closure=func.__closure__ if closure is MISSING else closure,
-        code=func.__code__ if code is MISSING else code,
-        globals=func.__globals__ if globals is MISSING else globals,
-        name=func.__name__ if name is MISSING else name,
-    )
+    closure = func.__closure__ if closure is MISSING else closure
+    if closure:
+        new_fn = FunctionType(
+            argdefs=func.__defaults__ if argdefs is MISSING else argdefs,
+            closure=func.__closure__ if closure is MISSING else closure,
+            code=func.__code__ if code is MISSING else code,
+            globals=func.__globals__ if globals is MISSING else globals,
+            name=func.__name__ if name is MISSING else name,
+        )
+    else:
+        new_fn = FunctionType(
+            argdefs=func.__defaults__ if argdefs is MISSING else argdefs,
+            code=func.__code__ if code is MISSING else code,
+            globals=func.__globals__ if globals is MISSING else globals,
+            name=func.__name__ if name is MISSING else name,
+        )
     new_fn.__kwdefaults__ = func.__kwdefaults__
     new_fn.__annotations__ = func.__annotations__
     new_fn.__dict__.update(func.__dict__)

{ovld-0.5.4 → ovld-0.5.6}/src/ovld/dependent.py

@@ -15,22 +15,15 @@ from .types import (
     Intersection,
     Order,
     clsstring,
-    get_args,
     normalize_type,
     subclasscheck,
     typeorder,
 )
 
 
-def is_dependent(t):
-    if isinstance(t, DependentType):
-        return True
-    elif any(is_dependent(subt) for subt in get_args(t)):
-        return True
-    return False
-
-
 class DependentType(type):
+    __dependent__ = True
+
     exclusive_type = False
     keyable_type = False
     bound_is_name = False

{ovld-0.5.4 → ovld-0.5.6}/src/ovld/mro.py

@@ -3,7 +3,7 @@ from enum import Enum
 from graphlib import TopologicalSorter
 from typing import get_args, get_origin
 
-from .utils import UnionTypes
+from .utils import UnionTypes, is_dependent
 
 
 class Order(Enum):
@@ -123,6 +123,11 @@ def subclasscheck(t1, t2):
     ):
         return result
 
+    if is_dependent(t2):
+        # t2's instancecheck could return anything, and unless it defines
+        # __is_supertype__ or __is_subtype__ the bound devolves to object
+        return True
+
     if t2 in UnionTypes:
         return isinstance(t1, t2)
 

{ovld-0.5.4 → ovld-0.5.6}/src/ovld/recode.py

@@ -12,7 +12,7 @@ from .codegen import (
     rename_function,
     transfer_function,
 )
-from .utils import MISSING, NameDatabase, SpecialForm, UsageError, subtler_type
+from .utils import MISSING, NameDatabase, SpecialForm, UsageError, is_dependent, subtler_type
 
 recurse = SpecialForm("recurse")
 call_next = SpecialForm("call_next")
@@ -160,8 +160,6 @@ def generate_dispatch(ov, arganal):
 
 
 def generate_dependent_dispatch(tup, handlers, next_call, slf, name, err, nerr):
-    from .dependent import is_dependent
-
     def to_dict(tup):
         return dict(
             entry if isinstance(entry, tuple) else (i, entry) for i, entry in enumerate(tup)

{ovld-0.5.4 → ovld-0.5.6}/src/ovld/typemap.py

@@ -6,7 +6,7 @@ from types import CodeType
 
 from .mro import sort_types
 from .recode import generate_dependent_dispatch
-from .utils import MISSING, CodegenInProgress, subtler_type
+from .utils import MISSING, CodegenInProgress, is_dependent, subtler_type
 
 
 class TypeMap(dict):
@@ -213,8 +213,6 @@ class MultiTypeMap(dict):
             sig: A Signature object.
             handler: A function to handle the tuple.
         """
-        from .dependent import is_dependent
-
         self.clear()
 
         obj_t_tup = sig.types
@@ -251,8 +249,6 @@ class MultiTypeMap(dict):
             print(f"{'':{width - 2}} @ {co.co_filename}:{co.co_firstlineno}")
 
     def display_resolution(self, *args, **kwargs):
-        from .dependent import is_dependent
-
         def dependent_match(tup, args):
             for t, a in zip(tup, args):
                 if isinstance(t, tuple):

{ovld-0.5.4 → ovld-0.5.6}/src/ovld/types.py

@@ -10,14 +10,9 @@ from .codegen import Code
 from .mro import Order, TypeRelationship, subclasscheck, typeorder
 from .recode import generate_checking_code
 from .typemap import TypeMap
-from .utils import UnionType, UnionTypes, UsageError, clsstring
+from .utils import UnionType, UnionTypes, UsageError, clsstring, get_args
 
-
-def get_args(tp):
-    args = getattr(tp, "__args__", None)
-    if not isinstance(args, tuple):
-        args = ()
-    return args
+NoneType = type(None)
 
 
 def eval_annotation(t, ctx, locals, catch=False):
@@ -90,6 +85,8 @@ class TypeNormalizer:
             raise UsageError(
                 f"Dependent type {t} has not been given a type bound. Please use Dependent[<bound>, {t}] instead."
             )
+        elif t is None:
+            return NoneType
         else:
             return t
 
@@ -103,6 +100,8 @@ def _(self, t, fn):
 
 
 class MetaMC(type):
+    __dependent__ = False
+
     def __new__(T, name, handler):
         return super().__new__(T, name, (), {"_handler": handler})
 

{ovld-0.5.4 → ovld-0.5.6}/src/ovld/utils.py

@@ -1,10 +1,15 @@
 """Miscellaneous utilities."""
 
+import builtins
 import functools
 import re
 import typing
+from abc import ABCMeta
 from itertools import count
 
+_builtins_dict = vars(builtins)
+
+
 try:
     from types import UnionType
 
@@ -152,7 +157,7 @@ class NameDatabase:
         i = 1
         name = desired_name
         while name in self.registered or (
-            name in __builtins__ and __builtins__[name] != value
+            name in _builtins_dict and _builtins_dict[name] != value
         ):
             name = f"{desired_name}{i}"
             i += 1
@@ -179,3 +184,31 @@ class NameDatabase:
         return name
 
     __getitem__ = get
+
+
+def get_args(tp):
+    args = getattr(tp, "__args__", None)
+    if not isinstance(args, tuple):
+        args = ()
+    return args
+
+
+_standard_instancechecks = {
+    type.__instancecheck__,
+    GenericAlias.__instancecheck__,
+    type(list[object]).__instancecheck__,
+    ABCMeta.__instancecheck__,
+    type(typing.Protocol).__instancecheck__,
+}
+
+
+def is_dependent(t):
+    if any(is_dependent(subt) for subt in get_args(t)):
+        return True
+    elif hasattr(t, "__dependent__"):
+        return t.__dependent__
+    elif not isinstance(t, type):
+        return False
+    elif type(t).__instancecheck__ not in _standard_instancechecks:
+        return True
+    return False

ovld-0.5.6/src/ovld/version.py

@@ -0,0 +1 @@
+version = "0.5.6"

{ovld-0.5.4 → ovld-0.5.6}/tests/test_dependent.py

@@ -350,3 +350,31 @@ def test_keyed_plus_other():
     assert f(0, 50) == "yes"
     assert f(3, 50) == "yes"
     assert f(0, 150) == "no"
+
+
+class Lettered(type):
+    def __instancecheck__(cls, x):
+        return cls.letter in (getattr(x, "__name__", None) or str(x))
+
+
+LetterF = Lettered("LetterF", (), {"letter": "f"})
+LetterX = Lettered("LetterX", (), {"letter": "x"})
+
+
+def test_arbitrary_instancecheck():
+    @ovld
+    def f(x: LetterX):
+        return "X-TREME"
+
+    @ovld
+    def f(x: LetterF):
+        return "fudged"
+
+    @ovld
+    def f(x: object):
+        return False
+
+    assert f(next) == "X-TREME"
+    assert f("wow") is False
+    assert f("extreme") == "X-TREME"
+    assert f(filter) == "fudged"

{ovld-0.5.4 → ovld-0.5.6}/tests/test_ovld.py

@@ -324,6 +324,19 @@ def test_optional():
     assert f(1.0) == "f"
 
 
+def test_none():
+    @ovld
+    def f(x: None):
+        return "null"
+
+    @ovld
+    def f(x: object):
+        return "X"
+
+    assert f(None) == "null"
+    assert f(123) == "X"
+
+
 def test_abstract_types():
     from collections.abc import Iterable
 
@@ -1160,6 +1173,10 @@ def test_unregister():
         f([-2, -1, 0, 1, 2, 3])
 
 
+@pytest.mark.xfail(
+    condition="platform.python_implementation() == 'PyPy'",
+    reason="codefind dependency fails here",
+)
 def test_conform():
     @ovld
     def f(xs: list):
@@ -1182,6 +1199,10 @@ def test_conform():
         f([-2, -1, 0, 1, 2, 3])
 
 
+@pytest.mark.xfail(
+    condition="platform.python_implementation() == 'PyPy'",
+    reason="codefind dependency fails here",
+)
 def test_conform_2():
     @ovld
     def f(xs: list):

{ovld-0.5.4 → ovld-0.5.6}/uv.lock

@@ -1,5 +1,10 @@
 version = 1
+revision = 1
 requires-python = ">=3.9"
+resolution-markers = [
+    "python_full_version >= '3.10'",
+    "python_full_version < '3.10'",
+]
 
 [[package]]
 name = "beartype"
@@ -14,14 +19,32 @@ wheels = [
 name = "click"
 version = "8.1.8"
 source = { registry = "https://pypi.org/simple" }
+resolution-markers = [
+    "python_full_version < '3.10'",
+]
 dependencies = [
-    { name = "colorama", marker = "platform_system == 'Windows'" },
+    { name = "colorama", marker = "python_full_version < '3.10' and sys_platform == 'win32'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/b9/2e/0090cbf739cee7d23781ad4b89a9894a41538e4fcf4c31dcdd705b78eb8b/click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a", size = 226593 }
 wheels = [
     { url = "https://files.pythonhosted.org/packages/7e/d4/7ebdbd03970677812aac39c869717059dbb71a4cfc033ca6e5221787892c/click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2", size = 98188 },
 ]
 
+[[package]]
+name = "click"
+version = "8.2.0"
+source = { registry = "https://pypi.org/simple" }
+resolution-markers = [
+    "python_full_version >= '3.10'",
+]
+dependencies = [
+    { name = "colorama", marker = "python_full_version >= '3.10' and sys_platform == 'win32'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/cd/0f/62ca20172d4f87d93cf89665fbaedcd560ac48b465bd1d92bfc7ea6b0a41/click-8.2.0.tar.gz", hash = "sha256:f5452aeddd9988eefa20f90f05ab66f17fce1ee2a36907fd30b05bbb5953814d", size = 235857 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a2/58/1f37bf81e3c689cc74ffa42102fa8915b59085f54a6e4a80bc6265c0f6bf/click-8.2.0-py3-none-any.whl", hash = "sha256:6b303f0b2aa85f1cb4e5303078fadcbcd4e476f114fab9b5007005711839325c", size = 102156 },
+]
+
 [[package]]
 name = "codefind"
 version = "0.1.7"
@@ -117,11 +140,14 @@ toml = [
 
 [[package]]
 name = "exceptiongroup"
-version = "1.2.2"
+version = "1.3.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/09/35/2495c4ac46b980e4ca1f6ad6db102322ef3ad2410b79fdde159a4b0f3b92/exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc", size = 28883 }
+dependencies = [
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/0b/9f/a65090624ecf468cdca03533906e7c69ed7588582240cfe7cc9e770b50eb/exceptiongroup-1.3.0.tar.gz", hash = "sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88", size = 29749 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/02/cc/b7e31358aac6ed1ef2bb790a9746ac2c69bcb3c8588b41616914eb106eaf/exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b", size = 16453 },
+    { url = "https://files.pythonhosted.org/packages/36/f4/c6e662dade71f56cd2f3735141b265c3c79293c109549c1e6933b0651ffc/exceptiongroup-1.3.0-py3-none-any.whl", hash = "sha256:4d111e6e0c13d0644cad6ddaa7ed0261a0b36971f6d23e7ec9b4b9097da78a10", size = 16674 },
 ]
 
 [[package]]
@@ -138,14 +164,14 @@ wheels = [
 
 [[package]]
 name = "importlib-metadata"
-version = "8.6.1"
+version = "8.7.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "zipp" },
+    { name = "zipp", marker = "python_full_version < '3.10'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/33/08/c1395a292bb23fd03bdf572a1357c5a733d3eecbab877641ceacab23db6e/importlib_metadata-8.6.1.tar.gz", hash = "sha256:310b41d755445d74569f993ccfc22838295d9fe005425094fad953d7f15c8580", size = 55767 }
+sdist = { url = "https://files.pythonhosted.org/packages/76/66/650a33bd90f786193e4de4b3ad86ea60b53c89b669a5c7be931fac31cdb0/importlib_metadata-8.7.0.tar.gz", hash = "sha256:d13b81ad223b890aa16c5471f2ac3056cf76c5f10f82d6f9292f0b415f389000", size = 56641 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/79/9d/0fb148dc4d6fa4a7dd1d8378168d9b4cd8d4560a6fbf6f0121c5fc34eb68/importlib_metadata-8.6.1-py3-none-any.whl", hash = "sha256:02a89390c1e15fdfdc0d7c6b25cb3e62650d0494005c97d6f148bf5b9787525e", size = 26971 },
+    { url = "https://files.pythonhosted.org/packages/20/b0/36bd937216ec521246249be3bf9855081de4c5e06a0c9b4219dbeda50373/importlib_metadata-8.7.0-py3-none-any.whl", hash = "sha256:e5dd1551894c77868a30651cef00984d50e1002d06942a7101d34870c5f02afd", size = 27656 },
 ]
 
 [[package]]
@@ -284,8 +310,9 @@ name = "mkdocs"
 version = "1.6.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "click" },
-    { name = "colorama", marker = "platform_system == 'Windows'" },
+    { name = "click", version = "8.1.8", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" },
+    { name = "click", version = "8.2.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.10'" },
+    { name = "colorama", marker = "sys_platform == 'win32'" },
     { name = "ghp-import" },
     { name = "importlib-metadata", marker = "python_full_version < '3.10'" },
     { name = "jinja2" },
@@ -339,7 +366,7 @@ wheels = [
 
 [[package]]
 name = "ovld"
-version = "0.5.0"
+version = "0.5.5"
 source = { editable = "." }
 
 [package.dev-dependencies]
@@ -365,7 +392,7 @@ benchmark = [
     { name = "multimethod", specifier = ">=1.12" },
     { name = "multipledispatch", specifier = ">=1.0.0" },
     { name = "plum-dispatch", specifier = ">=2.5.2" },
-    { name = "runtype", specifier = ">=0.5.0" },
+    { name = "runtype", specifier = ">=0.5.3" },
 ]
 dev = [
     { name = "codefind", specifier = "~=0.1.6" },
@@ -378,11 +405,11 @@ dev = [
 
 [[package]]
 name = "packaging"
-version = "24.2"
+version = "25.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d0/63/68dbb6eb2de9cb10ee4c9c14a0148804425e13c4fb20d61cce69f53106da/packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f", size = 163950 }
+sdist = { url = "https://files.pythonhosted.org/packages/a1/d4/1fc4078c65507b51b96ca8f8c3ba19e6a61c8253c72794544580a7b6c24d/packaging-25.0.tar.gz", hash = "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f", size = 165727 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/88/ef/eb23f262cca3c0c4eb7ab1933c3b1f03d021f2c48f54763065b6f0e321be/packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759", size = 65451 },
+    { url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", size = 66469 },
 ]
 
 [[package]]
@@ -396,11 +423,11 @@ wheels = [
 
 [[package]]
 name = "platformdirs"
-version = "4.3.7"
+version = "4.3.8"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/b6/2d/7d512a3913d60623e7eb945c6d1b4f0bddf1d0b7ada5225274c87e5b53d1/platformdirs-4.3.7.tar.gz", hash = "sha256:eb437d586b6a0986388f0d6f74aa0cde27b48d0e3d66843640bfb6bdcdb6e351", size = 21291 }
+sdist = { url = "https://files.pythonhosted.org/packages/fe/8b/3c73abc9c759ecd3f1f7ceff6685840859e8070c4d947c93fae71f6a0bf2/platformdirs-4.3.8.tar.gz", hash = "sha256:3d512d96e16bcb959a814c9f348431070822a6496326a4be0911c40b5a74c2bc", size = 21362 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/6d/45/59578566b3275b8fd9157885918fcd0c4d74162928a5310926887b856a51/platformdirs-4.3.7-py3-none-any.whl", hash = "sha256:a03875334331946f13c549dbd8f4bac7a13a50a895a0eb1e8c6a8ace80d40a94", size = 18499 },
+    { url = "https://files.pythonhosted.org/packages/fe/39/979e8e21520d4e47a0bbe349e2713c0aac6f3d853d0e5b34d76206c439aa/platformdirs-4.3.8-py3-none-any.whl", hash = "sha256:ff7059bb7eb1179e2685604f4aaf157cfd9535242bd23742eadc3c13542139b4", size = 18567 },
 ]
 
 [[package]]
@@ -580,14 +607,14 @@ wheels = [
 
 [[package]]
 name = "pyyaml-env-tag"
-version = "0.1"
+version = "1.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pyyaml" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/fb/8e/da1c6c58f751b70f8ceb1eb25bc25d524e8f14fe16edcce3f4e3ba08629c/pyyaml_env_tag-0.1.tar.gz", hash = "sha256:70092675bda14fdec33b31ba77e7543de9ddc88f2e5b99160396572d11525bdb", size = 5631 }
+sdist = { url = "https://files.pythonhosted.org/packages/eb/2e/79c822141bfd05a853236b504869ebc6b70159afc570e1d5a20641782eaa/pyyaml_env_tag-1.1.tar.gz", hash = "sha256:2eb38b75a2d21ee0475d6d97ec19c63287a7e140231e4214969d0eac923cd7ff", size = 5737 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/5a/66/bbb1dd374f5c870f59c5bb1db0e18cbe7fa739415a24cbd95b2d1f5ae0c4/pyyaml_env_tag-0.1-py3-none-any.whl", hash = "sha256:af31106dec8a4d68c60207c1886031cbf839b68aa7abccdb19868200532c2069", size = 3911 },
+    { url = "https://files.pythonhosted.org/packages/04/11/432f32f8097b03e3cd5fe57e88efb685d964e2e5178a48ed61e841f7fdce/pyyaml_env_tag-1.1-py3-none-any.whl", hash = "sha256:17109e1a528561e32f026364712fee1264bc2ea6715120891174ed1b980d2e04", size = 4722 },
 ]
 
 [[package]]

ovld-0.5.4/src/ovld/version.py

@@ -1 +0,0 @@
-version = "0.5.4"