Support new-style unions

configen/utils.py

@@ -2,6 +2,7 @@
 import sys
 from enum import Enum
 from pathlib import Path
+from types import UnionType
 from typing import (
     Any,
     List,
@@ -87,7 +88,10 @@ def is_tuple_annotation(type_: Any) -> bool:
 def convert_imports(imports: Set[Type], string_imports: Set[str]) -> List[str]:
     tmp = set()
     for import_ in imports:
-        if import_ is Any:
+        if isinstance(import_, UnionType):
+            tmp.add("from typing import Union")
+            continue
+        elif import_ is Any:
             classname = "Any"
         elif import_ is Optional:  # type: ignore
             classname = "Optional"

pyproject.toml

@@ -8,9 +8,9 @@ license = "MIT License"
 packages = [{ include = "configen" }]
 include=["configen/py.typed"]
 classifiers=[
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "License :: OSI Approved :: Apache Software License",
   "Operating System :: OS Independent",
   "Typing :: Typed",
@@ -19,7 +19,7 @@ keywords=["hydra", "python"]
 readme="README.md"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.13"
+python = ">=3.10,<3.13"
 hydra-core = "^1.2.0"
 jinja2 = "^3.0.3"
 markupsafe = "*"
@@ -36,7 +36,7 @@ configen = 'configen.configen:main'
 
 [tool.black]
 line-length = 100
-target-version = ['py39']
+target-version = ['py310']
 include = '\.pyi?$'
 extend-exclude = "(hydra/grammar/gen|tools/configen/example/gen)"
 
@@ -73,7 +73,7 @@ classes = ["MISSING"]
 include = ["configen"]
 exclude = ["**/node_modules", "**/__pycache__"]
 typeCheckingMode = "basic"
-pythonVersion = "3.9"
+pythonVersion = "3.10"
 reportUnusedImport = "error"
 reportDuplicateImport  = "error"
 reportIncompatibleVariableOverride = "error"

tests/test_modules/__init__.py

@@ -88,13 +88,15 @@ def __init__(
         param4: Union[str, DictConfig] = "",
         param5: Union[str, List[str], Tuple[str, ...]] = ("foo", "bar"),
         param6: Union[str, list[str], tuple[str, ...]] = ("foo", "bar"),
+        param7: str | Path = "",
     ):
         self.param = param
         self.param2 = param2
         self.param3 = param3
         self.param4 = param4
         self.param5 = param5
         self.param6 = param6
+        self.param7 = param7
 
     def __eq__(self, other):
         return (
@@ -105,6 +107,7 @@ def __eq__(self, other):
             and other.param4 == self.param4
             and other.param5 == self.param5
             and other.param6 == self.param6
+            and other.param7 == self.param7
         )
 
 

tests/test_modules/generated.py

@@ -60,6 +60,7 @@ class UnionArgConf:
     param4: Any = ""  # Union[DictConfig, str]
     param5: Any = ('foo', 'bar')  # Union[List[str], Tuple[str, ...], str]
     param6: Any = ('foo', 'bar')  # Union[list[str], str, tuple[str, ...]]
+    param7: Union[Path, str] = ""
 
 
 @dataclass