From 4c0843ffb1721197666953b3d4ec885510dddacc Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Tue, 16 Apr 2024 21:51:20 +0200 Subject: [PATCH] .. --- python/sdist/amici/__init__.py | 2 -- swig/amici.i | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/python/sdist/amici/__init__.py b/python/sdist/amici/__init__.py index cd7bcb0500..76369eda37 100644 --- a/python/sdist/amici/__init__.py +++ b/python/sdist/amici/__init__.py @@ -134,8 +134,6 @@ def get_model(self) -> amici.Model: """Create a model instance.""" ... - AmiciModel = Union[amici.Model, amici.ModelPtr] - class add_path: """Context manager for temporarily changing PYTHONPATH""" diff --git a/swig/amici.i b/swig/amici.i index f49b75d02c..bea99fbe0c 100644 --- a/swig/amici.i +++ b/swig/amici.i @@ -355,7 +355,7 @@ if sys.platform == 'win32' and (dll_dirs := os.environ.get('AMICI_DLL_DIRS')): // import additional types for typehints // also import np for use in __repr__ functions %pythonbegin %{ -from typing import TYPE_CHECKING, Iterable +from typing import TYPE_CHECKING, Iterable, Union from collections.abc import Sequence import numpy as np if TYPE_CHECKING: @@ -372,11 +372,11 @@ __all__ = [ and x not in {"np", "sys", "os", "numpy", "IntEnum", "enum", "pi", "TYPE_CHECKING", "Iterable", "Sequence"} ] -AmiciModel = Model | ModelPtr -AmiciSolver = Solver | SolverPtr -AmiciExpData = ExpData | ExpDataPtr -AmiciReturnData = ReturnData | ReturnDataPtr -AmiciExpDataVector = ExpDataPtrVector | Sequence[AmiciExpData] +AmiciModel = Union['Model', 'ModelPtr'] +AmiciSolver = Union['Solver', 'SolverPtr'] +AmiciExpData = Union['ExpData', 'ExpDataPtr'] +AmiciReturnData = Union['ReturnData', 'ReturnDataPtr'] +AmiciExpDataVector = Union['ExpDataPtrVector', Sequence['AmiciExpData']] def _get_ptr( obj: AmiciModel | AmiciExpData | AmiciSolver | AmiciReturnData,