Merge pull request #212 from coveooss/feature/flex/unions-in-python-3-10

Support 3.10 unions with |
coveooss · Aug 9, 2024 · e5dc452 · e5dc452
2 parents 6fdb473 + ce28aba
commit e5dc452
Show file tree

Hide file tree

Showing 17 changed files with 1,590 additions and 1,517 deletions.
diff --git a/.github/workflows/coveo-arnparse.yml b/.github/workflows/coveo-arnparse.yml
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.10"]
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Run stew ci

diff --git a/.github/workflows/coveo-example-library.yml b/.github/workflows/coveo-example-library.yml
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.10"]
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Run stew ci

diff --git a/.github/workflows/coveo-functools.yml b/.github/workflows/coveo-functools.yml
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.10"]
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Run stew ci

diff --git a/.github/workflows/coveo-itertools.yml b/.github/workflows/coveo-itertools.yml
@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.10"]
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Run stew ci

diff --git a/.github/workflows/coveo-pypi-cli.yml b/.github/workflows/coveo-pypi-cli.yml
@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.10"]
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Run stew ci

diff --git a/.github/workflows/coveo-ref.yml b/.github/workflows/coveo-ref.yml
@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.10"]
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Run stew ci

diff --git a/.github/workflows/coveo-settings.yml b/.github/workflows/coveo-settings.yml
@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.10"]
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Run stew ci

diff --git a/.github/workflows/coveo-styles.yml b/.github/workflows/coveo-styles.yml
@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.10"]
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Run stew ci

diff --git a/.github/workflows/coveo-systools.yml b/.github/workflows/coveo-systools.yml
@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.10"]
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Run stew ci

diff --git a/.github/workflows/coveo-testing-extras.yml b/.github/workflows/coveo-testing-extras.yml
@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.10"]
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Run stew ci

diff --git a/.github/workflows/coveo-testing.yml b/.github/workflows/coveo-testing.yml
@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.10"]
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Run stew ci

diff --git a/coveo-functools/coveo_functools/flex/deserializer.py b/coveo-functools/coveo_functools/flex/deserializer.py
@@ -1,6 +1,7 @@
 import enum
 import inspect
 import logging
+import sys
 import warnings
 from collections import abc
 from contextlib import contextmanager
@@ -34,6 +35,11 @@
 from coveo_functools.flex.subclass_adapter import get_subclass_adapter
 from coveo_functools.flex.types import TypeHint, is_passthrough_type, PASSTHROUGH_TYPES
 
+if sys.version_info >= (3, 10):  # pragma: no cover
+    from types import UnionType
+else:
+    from typing import Union as UnionType  # :shrug:
+
 
 T = TypeVar("T")
 
@@ -180,7 +186,10 @@ def deserialize(
     # always puts the real type first. This is only applicable to the thing-or-list-of-things feature.
     target_type: TypeHint = args[0] if args else Any
 
-    if origin is Union:
+    if origin in (
+        Union,  # Union[str, int]
+        UnionType,  # str | int (py3.10)
+    ):
         if not {*args}.difference(PASSTHROUGH_TYPES):
             # Unions of PASSTHROUGH_TYPES are allowed and assumed to be in the proper type already
             return cast(T, value)