Changed dependency to pyTooling and renamed to pyTooling.TerminalUI.

(cherry picked from commit 9e551c2)

# Conflicts:
#	pyTooling/TerminalUI/__init__.py

Author: Paebbels

README.md

@@ -33,7 +33,7 @@ A set of helpers to implement a text user interface (TUI) in a terminal.
 This is a minimal terminal application example which inherits from `LineTerminal`.
 
 ```python
-from pyTerminalUI import LineTerminal
+from pyTooling.TerminalUI import LineTerminal
 
 class Application(LineTerminal):
   def __init__(self):
@@ -46,7 +46,7 @@ class Application(LineTerminal):
 
 # entry point
 if __name__ == "__main__":
-  Application.versionCheck((3,6,0))
+  Application.versionCheck((3, 6, 0))
   app = Application()
   app.run()
   app.exit()
@@ -58,8 +58,8 @@ This example hands over the terminal instance to a submodule, which implements
 `ILineTerminal`, so the submodule can also use the terminal's writing methods.
 
 ```python
-from pathlib      import Path
-from pyTerminalUI import LineTerminal, ILineTerminal
+from pathlib import Path
+from pyTooling.TerminalUI import LineTerminal, ILineTerminal
 
 class SubModule(ILineTerminal):
   def __init__(self, configFile, terminal):

doc/index.rst

@@ -139,7 +139,7 @@ Contributors
 ************
 
 * `Patrick Lehmann <https://github.com/Paebbels>`_ (Maintainer)
-* `and more... <https://github.com/paebbels/pyCallBy/graphs/contributors>`__
+* `and more... <https://github.com/pyTooling/pyTooling.TerminalUI/graphs/contributors>`__
 
 
 

pyTooling/TerminalUI/__init__.py

@@ -1,19 +1,15 @@
 # =============================================================================
-#              _____                   _             _ _   _ ___
-#   _ __  _   |_   _|__ _ __ _ __ ___ (_)_ __   __ _| | | | |_ _|
-#  | '_ \| | | || |/ _ \ '__| '_ ` _ \| | '_ \ / _` | | | | || |
-#  | |_) | |_| || |  __/ |  | | | | | | | | | | (_| | | |_| || |
-#  | .__/ \__, ||_|\___|_|  |_| |_| |_|_|_| |_|\__,_|_|\___/|___|
-#  |_|    |___/
+#             _____           _ _             _____                   _             _ _   _ ___
+#  _ __  _   |_   _|__   ___ | (_)_ __   __ _|_   _|__ _ __ _ __ ___ (_)_ __   __ _| | | | |_ _|
+# | '_ \| | | || |/ _ \ / _ \| | | '_ \ / _` | | |/ _ \ '__| '_ ` _ \| | '_ \ / _` | | | | || |
+# | |_) | |_| || | (_) | (_) | | | | | | (_| |_| |  __/ |  | | | | | | | | | | (_| | | |_| || |
+# | .__/ \__, ||_|\___/ \___/|_|_|_| |_|\__, (_)_|\___|_|  |_| |_| |_|_|_| |_|\__,_|_|\___/|___|
+# |_|    |___/                          |___/
 # =============================================================================
 # Authors:            Patrick Lehmann
 #
 # Python package:     A set of helpers to implement a text user interface (TUI) in a terminal.
 #
-# Description:
-# ------------------------------------
-#		TODO
-#
 # License:
 # ============================================================================
 # Copyright 2017-2021 Patrick Lehmann - Bötzingen, Germany
@@ -38,6 +34,13 @@
 import sys
 from platform       import system as platform_system
 
+from pyTooling.Decorators   import export
+from pyTooling.MetaClasses  import Singleton
+
+
+__version__ = "1.4.2"
+
+
 from pydecor        import export
 from pyMetaClasses  import Singleton
 

requirements.txt

@@ -1,5 +1,2 @@
 colorama>=0.4.4
-pydecor>=2.0.1
-
-pyExceptions>=1.1.1
-pyMetaClasses>=1.3.1
+pyTooling>=1.4.1

setup.py

@@ -1,16 +1,15 @@
 # =============================================================================
-#              _____                   _             _ _   _ ___
-#   _ __  _   |_   _|__ _ __ _ __ ___ (_)_ __   __ _| | | | |_ _|
-#  | '_ \| | | || |/ _ \ '__| '_ ` _ \| | '_ \ / _` | | | | || |
-#  | |_) | |_| || |  __/ |  | | | | | | | | | | (_| | | |_| || |
-#  | .__/ \__, ||_|\___|_|  |_| |_| |_|_|_| |_|\__,_|_|\___/|___|
-#  |_|    |___/
+#             _____           _ _             _____                   _             _ _   _ ___
+#  _ __  _   |_   _|__   ___ | (_)_ __   __ _|_   _|__ _ __ _ __ ___ (_)_ __   __ _| | | | |_ _|
+# | '_ \| | | || |/ _ \ / _ \| | | '_ \ / _` | | |/ _ \ '__| '_ ` _ \| | '_ \ / _` | | | | || |
+# | |_) | |_| || | (_) | (_) | | | | | | (_| |_| |  __/ |  | | | | | | | | | | (_| | | |_| || |
+# | .__/ \__, ||_|\___/ \___/|_|_|_| |_|\__, (_)_|\___|_|  |_| |_| |_|_|_| |_|\__,_|_|\___/|___|
+# |_|    |___/                          |___/
 # =============================================================================
 # Authors:            Patrick Lehmann
 #
 # Package installer:  A set of helpers to implement a text user interface (TUI) in a terminal.
 #
-#
 # License:
 # ============================================================================
 # Copyright 2017-2021 Patrick Lehmann - Bötzingen, Germany
@@ -30,43 +29,55 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============================================================================
 #
-import setuptools
+from pathlib    import Path
+from setuptools import (
+	setup as setuptools_setup,
+	find_namespace_packages as setuptools_find_namespace_packages
+)
 
-with open("README.md", "r") as file:
-	long_description = file.read()
+gitHubNamespace =       "pyTooling"
+projectName =           "TerminalUI"
+projectNameWithPrefix = "pyTooling." + projectName
+version =               "1.4.2"
 
-requirements = []
-with open("requirements.txt") as file:
-	for line in file.readlines():
-		requirements.append(line)
+# Read README for upload to PyPI
+readmeFile = Path("README.md")
+with readmeFile.open("r") as file:
+	long_description = file.read()
 
-projectName = "pyTerminalUI"
+# Read requirements file and add them to package dependency list
+requirementsFile = Path("requirements.txt")
+with requirementsFile.open("r") as file:
+	requirements = [line for line in file.readlines()]
 
-github_url =  "https://github.com/Paebbels/" + projectName
-rtd_url =     "https://" + projectName + ".readthedocs.io/en/latest/"
+# Derive URLs
+sourceCodeURL =     f"https://github.com/{gitHubNamespace}/{projectName}"
+#documentationURL =  f"https://{gitHubNamespace}.github.io/{projectName}"
+documentationURL =  f"https://{projectName}.readthedocs.io/en/latest/"
 
-setuptools.setup(
-	name=projectName,
-	version="1.4.2",
+# Assemble all package information
+setuptools_setup(
+	name=projectNameWithPrefix,
+	version=version,
 
 	author="Patrick Lehmann",
 	author_email="Paebbels@gmail.com",
 	# maintainer="Patrick Lehmann",
 	# maintainer_email="Paebbels@gmail.com",
+  license='Apache 2.0',
 
 	description="A set of helpers to implement a text user interface (TUI) in a terminal.",
 	long_description=long_description,
 	long_description_content_type="text/markdown",
 
-	url=github_url,
+	url=sourceCodeURL,
 	project_urls={
-		'Documentation': rtd_url,
-		'Source Code':   github_url,
-		'Issue Tracker': github_url + "/issues"
+		'Documentation': f"{documentationURL}",
+		'Source Code':   f"{sourceCodeURL}",
+		'Issue Tracker': f"{sourceCodeURL}/issues"
 	},
-	# download_url="",
 
-	packages=setuptools.find_packages(exclude=["tests", "tests.*"]),
+	packages=setuptools_find_namespace_packages(exclude=["doc", "doc.*", "tests", "tests.*",]),
 	classifiers=[
 		"License :: OSI Approved :: Apache Software License",
 		"Operating System :: OS Independent",
@@ -75,6 +86,7 @@
 		"Programming Language :: Python :: 3.7",
 		"Programming Language :: Python :: 3.8",
 		"Programming Language :: Python :: 3.9",
+		"Programming Language :: Python :: 3.10",
 		"Development Status :: 5 - Production/Stable",
 		"Intended Audience :: Developers",
 		"Topic :: Utilities"
@@ -83,6 +95,4 @@
 
 	python_requires='>=3.6',
 	install_requires=requirements,
-	# provides=
-	# obsoletes=
 )

tests/unit/TerminalUI.py

@@ -10,10 +10,6 @@
 #
 # Python unittest:    Testing the pyTerminalUI module
 #
-# Description:
-# ------------------------------------
-#		TODO
-#
 # License:
 # ============================================================================
 # Copyright 2017-2021 Patrick Lehmann - Bötzingen, Germany
@@ -35,15 +31,15 @@
 # ============================================================================
 #
 """
-pyTerminalUI
-############
+pyTooling.TerminalUI
+####################
 
 :copyright: Copyright 2007-2021 Patrick Lehmann - Bötzingen, Germany
 :license: Apache License, Version 2.0
 """
 from unittest     import TestCase
 
-from pyTerminalUI import LineTerminal
+from pyTooling.TerminalUI import LineTerminal
 
 
 if __name__ == "__main__":

tests/unit/__init__.py

@@ -10,10 +10,6 @@
 #
 # Python unittest:    Helper functions for unittests
 #
-# Description:
-# ------------------------------------
-#		TODO
-#
 # License:
 # ============================================================================
 # Copyright 2017-2021 Patrick Lehmann - Bötzingen, Germany
@@ -35,8 +31,8 @@
 # ============================================================================
 #
 """
-pyTerminalUI
-############
+pyTooling.TerminalUI
+####################
 
 :copyright: Copyright 2007-2021 Patrick Lehmann - Bötzingen, Germany
 :license: Apache License, Version 2.0