3 files changed, 10 insertions, 11 deletions
diff --git a/pyGHDL/cli/dom.py b/pyGHDL/cli/dom.py
index 99f59c277..6ba5894fe 100755
--- a/pyGHDL/cli/dom.py
+++ b/pyGHDL/cli/dom.py
@@ -40,8 +40,9 @@ from textwrap import wrap, dedent
 from pyGHDL.dom import DOMException
 
 from pyGHDL.libghdl import LibGHDLException
-from pydecor import export
-from pyMetaClasses import Singleton
+from pyTooling.Decorators import export
+from pyTooling.MetaClasses import Singleton
+from pyTooling.TerminalUI import LineTerminal, Severity
 from pyAttributes import Attribute
 from pyAttributes.ArgParseAttributes import (
     ArgParseMixin,
@@ -51,7 +52,6 @@ from pyAttributes.ArgParseAttributes import (
     ArgumentAttribute,
     SwitchArgumentAttribute,
 )
-from pyTerminalUI import LineTerminal, Severity
 
 from pyGHDL import GHDLBaseException
 from pyGHDL.dom.NonStandard import Design, Document
@@ -64,8 +64,6 @@ __email__ = ""
 __version__ = "0.0.0"
 __status__ = "Alpha"
 __license__ = ""
-__all__ = []
-__api__ = __all__
 
 
 class SourceAttribute(Attribute):
diff --git a/pyGHDL/cli/lsp.py b/pyGHDL/cli/lsp.py
index fd9a8834a..694988153 100644
--- a/pyGHDL/cli/lsp.py
+++ b/pyGHDL/cli/lsp.py
@@ -48,10 +48,11 @@ from os import environ as os_environ, getcwd as os_getcwd
 import os
 from pathlib import Path
 
-from pydecor import export
+from pyTooling.Decorators import export
 
+from pyGHDL import __version__ as ghdlVersion
 import pyGHDL.libghdl as libghdl
-from pyGHDL.libghdl import version, errorout_console
+from pyGHDL.libghdl import errorout_console
 from pyGHDL.lsp import LSPConnTrace
 from pyGHDL.lsp.lsp import LSPConn, LanguageProtocolServer
 from pyGHDL.lsp.vhdl_ls import VhdlLanguageServer
@@ -85,7 +86,7 @@ def _generateCLIParser() -> ArgumentParser:
     parser = ArgumentParser(
         description="VHDL Language Protocol Server. Find info about clients in `ghdl/ghdl-language-server <https://github.com/ghdl/ghdl-language-server>`__."
     )
-    parser.add_argument("--version", "-V", action="version", version="%(prog)s " + version.__version__)
+    parser.add_argument("--version", "-V", action="version", version="%(prog)s " + ghdlVersion)
     parser.add_argument("--verbose", "-v", action="count", default=0, help="Show debug output")
     parser.add_argument("--log-file", help="Redirect logs to the given file instead of stderr")
     parser.add_argument(
diff --git a/pyGHDL/cli/requirements.txt b/pyGHDL/cli/requirements.txt
index 30f22625c..b9167b8ed 100644
--- a/pyGHDL/cli/requirements.txt
+++ b/pyGHDL/cli/requirements.txt
@@ -1,5 +1,5 @@
 -r ../dom/requirements.txt
 
-pyAttributes==2.2.1
-pyMetaClasses==1.3.1
-pyTerminalUI==1.4.1
+pyTooling>=1.6.0
+pyTooling.TerminalUI>=1.5.3
+pyAttributes>=2.3.2