v1.5.3

Author: Paebbels

README.md

@@ -14,7 +14,6 @@
 ![PyPI - Status](https://img.shields.io/pypi/status/pyTooling.TerminalUI?logo=PyPI&logoColor=FBE072)
 [![Libraries.io status for latest release](https://img.shields.io/librariesio/release/pypi/pyTooling.TerminalUI?logo=librariesdotio)](https://libraries.io/github/pyTooling/pyTooling.TerminalUI)
 [![Requires.io](https://img.shields.io/requires/github/pyTooling/pyTooling.TerminalUI)](https://requires.io/github/pyTooling/pyTooling.TerminalUI/requirements/?branch=main)  
-[![Read the Docs](https://img.shields.io/readthedocs/pyterminalui?label=ReadTheDocs&logo=readthedocs)](https://pyTerminalUI.readthedocs.io/)
 [![Documentation License](https://img.shields.io/badge/doc%20license-CC--BY%204.0-green?logo=readthedocs)](doc/Doc-License.rst)
 [![Documentation - Read Now!](https://img.shields.io/badge/doc-read%20now%20%E2%9E%9A-blueviolet?logo=readthedocs)](https://pyTooling.GitHub.io/pyTooling.TerminalUI)
 

doc/conf.py

@@ -10,6 +10,7 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
+from ast     import parse as ast_parse, iter_child_nodes, Assign, Constant, Name
 from json    import loads
 from os.path import abspath
 from pathlib import Path
@@ -21,40 +22,39 @@
 sys_path.insert(0, abspath('_extensions'))
 #sys_path.insert(0, os.path.abspath('_themes/sphinx_rtd_theme'))
 
-
-# ==============================================================================
-# Project information
-# ==============================================================================
-project = 'pyTooling.TerminalUI'
-copyright = '2007-2021, Patrick Lehmann'
-author = 'Patrick Lehmann'
-
 # ==============================================================================
-# Versioning
+# Project information and versioning
 # ==============================================================================
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
-from subprocess import check_output
+project =     "pyTooling.TerminalUI"
+
+__author =    None
+__copyright = None
+__version =   None
+
+# Read __version__ from source file
+versionFile = Path(f"../{project.replace('.', '/')}/__init__.py")
+with versionFile.open("r") as file:
+	for item in iter_child_nodes(ast_parse(file.read())):
+		if isinstance(item, Assign) and len(item.targets) == 1:
+			target = item.targets[0]
+			value =  item.value
+			if isinstance(target, Name) and target.id == "__author__" and isinstance(value, Constant) and isinstance(value.value, str):
+				__author = value.value
+			if isinstance(target, Name) and target.id == "__copyright__" and isinstance(value, Constant) and isinstance(value.value, str):
+				__copyright = value.value
+			if isinstance(target, Name) and target.id == "__version__" and isinstance(value, Constant) and isinstance(value.value, str):
+				__version = value.value
+if __version is None:
+	raise AssertionError(f"Could not extract '__version__' from '{versionFile}'.")
+
+author =    __author
+copyright = __copyright
+version =   ".".join(__version.split(".")[:2])  # e.g. 2.3    The short X.Y version.
+release =   __version
 
-def _IsUnderGitControl():
-	return (check_output(["git", "rev-parse", "--is-inside-work-tree"], universal_newlines=True).strip() == "true")
-
-def _LatestTagName():
-	return check_output(["git", "describe", "--abbrev=0", "--tags"], universal_newlines=True).strip()
-
-# The full version, including alpha/beta/rc tags
-version = "1.5"     # The short X.Y version.
-release = "1.5.2"   # The full version, including alpha/beta/rc tags.
-try:
-	if _IsUnderGitControl:
-		latestTagName = _LatestTagName()[1:]		# remove prefix "v"
-		versionParts =  latestTagName.split("-")[0].split(".")
-
-		version = ".".join(versionParts[:2])
-		release = latestTagName   # ".".join(versionParts[:3])
-except:
-	pass
 
 # ==============================================================================
 # Miscellaneous settings

pyTooling/TerminalUI/__init__.py

@@ -39,7 +39,7 @@
 __email__ =     "Paebbels@gmail.com"
 __copyright__ = "2007-2021, Patrick Lehmann"
 __license__ =   "Apache License, Version 2.0"
-__version__ =   "1.5.2"
+__version__ =   "1.5.3"
 
 
 @export

setup.py

@@ -45,7 +45,7 @@
 __version =             None
 
 # Read __version__ from source file
-versionFile = Path(f"{projectName}/__init__.py")
+versionFile = Path(f"{prefix}/{projectName}/__init__.py")
 with versionFile.open("r") as file:
 	for item in iter_child_nodes(ast_parse(file.read())):
 		if isinstance(item, Assign) and len(item.targets) == 1: