Read version from pyproject.toml instead of acsoo.cfg

Towards removing acsoo.cfg

acsoo/config.py

@@ -4,8 +4,10 @@
 
 import os
 from configparser import NoOptionError, NoSectionError, RawConfigParser
+from pathlib import Path
 
 import click
+import tomli
 
 DEFAULT_CONFIG_FILE = "acsoo.cfg"
 SECTION = "acsoo"
@@ -31,6 +33,10 @@ def __init__(self, filename):
                 )
             self.__cfgfile = filename
             self.__cfg.read(filename)
+        pyproject_path = Path("pyproject.toml")
+        self.__pyproject = {}
+        if pyproject_path.is_file():
+            self.__pyproject = tomli.loads(pyproject_path.read_text())
 
     @staticmethod
     def add_default_map_reader(reader):
@@ -44,9 +50,13 @@ def get_default_map(self):
 
     @property
     def series(self):
-        r = self.__cfg.get(SECTION, "series")
+        r = self.__pyproject.get("tool", {}).get("hatch-odoo", {}).get(
+            "odoo_version_override", None
+        ) or self.__cfg.get(SECTION, "series")
         if not r:
-            raise click.ClickException("Missing series in {}.".format(self.__cfgfile))
+            raise click.ClickException(
+                "Odoo series not found in pyproject.toml and {}.".format(self.__cfgfile)
+            )
         if r not in ("14.0", "15.0", "16.0"):
             raise click.ClickException(
                 "Unsupported series {} in {}.".format(r, self.__cfgfile)
@@ -55,9 +65,15 @@ def series(self):
 
     @property
     def version(self):
-        r = self.__cfg.get(SECTION, "version")
+        r = self.__pyproject.get("project", {}).get("version", None) or self.__cfg.get(
+            SECTION, "version"
+        )
         if not r:
-            raise click.ClickException("Missing version in {}.".format(self.__cfgfile))
+            raise click.ClickException(
+                "Missing version in pyproject.toml and {}.".format(self.__cfgfile)
+            )
+        if r.startswith(self.series + ".") and len(r.split(".")) > 4:
+            r = r[len(self.series) + 1 :]
         return r
 
     @property

acsoo/templates/project/+project.name+/acsoo.cfg.bob

@@ -1,4 +1,2 @@
 [acsoo]
 trigram={{{ project.trigram }}}
-series={{{ odoo.series }}}
-version=1.0.0

acsoo/templates/project/+project.name+/pyproject.toml.bob

@@ -36,7 +36,7 @@ packages = ["odoo"]
 
 [tool.hatch-odoo]
 # If our addons have non standard version numbers, let's help hatch-odoo discover the Odoo version.
-#odoo_version_override = "16.0"
+odoo_version_override = "{{{ odoo.series }}}"
 # Add dependencies that are not declared in Odoo addons manifests.
 dependencies = [
   "click-odoo-contrib",

setup.cfg

@@ -29,6 +29,7 @@ install_requires =
   setuptools  # must use odoo-autodiscover>=2 in Odoo<=10
   wheel>=0.29
   httpx
+  tomli
 
 [options.entry_points]
 console_scripts =