Fixes for versioning and installation; updating the deprecated pyproject.toml stuff for building

Author: MatejVitek

pyproject.toml

@@ -11,23 +11,21 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "matej-libs"
-version = "0.12.3"
+version = "0.12.4"
 authors = [{name = "Matej Vitek", email = "matej.vitek.business@gmail.com"}]
+license = "GPL-3.0-or-later"
+license-files = ["LICENSE"]
 requires-python = ">=3.12"
 dependencies = ["numpy"]
 description = "Collection of Python utility libraries."
 readme = "README.md"
 classifiers = [
 	"Programming Language :: Python :: 3",
-	"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
 	"Operating System :: OS Independent",
 	"Development Status :: 3 - Alpha",
 	"Intended Audience :: Developers",
 ]
 
-[tool.setuptools]   #TODO: This is needed until they fix twine packaging and uploading.
-license-files = []  #      Try removing on next build.
-
 [project.optional-dependencies]
 web = ["requests"]
 config = ["ruamel.yaml"]

src/matej/__init__.py

@@ -25,12 +25,26 @@
 
 
 try:
-	__version__ = importlib.metadata.version(__package__ or __name__)
+	__version__ = importlib.metadata.version('matej-libs')
 except importlib.metadata.PackageNotFoundError:
 	from pathlib import Path
 	import re
-	with (Path(__file__).resolve().parent.parent.parent/'pyproject.toml').open('r', encoding='utf-8') as f:
-		__version__ = re.search(r'version\s*=\s*[\'"]?([^\'"]*)[\'"]?', f.read()).group(1)
+
+	_current_dir = Path(__file__).resolve().parent
+	_toml_path = None
+
+	# Walk up the tree up to 4 levels looking for pyproject.toml
+	for _ in range(4):
+		if (_current_dir/'pyproject.toml').is_file():
+			_toml_path = _current_dir/'pyproject.toml'
+			break
+		_current_dir = _current_dir.parent
+
+	if _toml_path:
+		with _toml_path.open('r', encoding='utf-8') as f:
+			__version__ = re.search(r'version\s*=\s*[\'"]?([^\'"]*)[\'"]?', f.read()).group(1)
+	else:
+		__version__ = 'unknown'
 
 
 @contextmanager