Remove deprecated generate option

Author: virtuald

robotpy_build/config/pyproject_toml.py

@@ -298,9 +298,6 @@ class WrapperConfig:
     #:
     autogen_headers: Optional[Dict[str, str]] = None
 
-    #: DEPRECATED: Same as autogen_headers, but more complicated
-    generate: Optional[List[Dict[str, str]]] = None
-
     #: Path to a single data.yml to use during code generation, or a directory
     #: of yaml files. If a directory, generation data will be looked up
     #: using the key in the generate dictionary.

robotpy_build/setup.py

@@ -79,24 +79,6 @@ def __init__(self):
                 f"robotpy-build configuration in pyproject.toml is incorrect"
             ) from e
 
-        # Remove deprecated 'generate' data and migrate
-        for wname, wrapper in self.project.wrappers.items():
-            if wrapper.generate:
-                if wrapper.autogen_headers:
-                    raise ValueError(
-                        "must not specify 'generate' and 'autogen_headers'"
-                    )
-                autogen_headers = {}
-                for l in wrapper.generate:
-                    for name, header in l.items():
-                        if name in autogen_headers:
-                            raise ValueError(
-                                f"{wname}.generate: duplicate key '{name}'"
-                            )
-                        autogen_headers[name] = header
-                wrapper.autogen_headers = autogen_headers
-                wrapper.generate = None
-
         # Shared wrapper writer instance
         self.wwriter = WrapperWriter()
 

tests/cpp/pyproject.toml.tmpl

@@ -41,75 +41,76 @@ sources = [
 ]
 
 generation_data = "gen/ft"
-generate = [
-    { abstract = "abstract.h" },
-    { base_qualname = "base_qualname.h" },
-    { base_qualname_hidden = "base_qualname_hidden.h" },
-    { buffers = "buffers.h" },
-    { custom_type_caster = "custom_type_caster.h" },
-    { defaults = "defaults.h" },
-    { docstrings = "docstrings.h" },
-    { docstrings_append = "docstrings_append.h" },
-    { enums = "enums.h" },
-    { factory = "factory.h" },
-    { fields = "fields.h" },
-    { gilsafe_container = "gilsafe_container.h" },
-    { keepalive = "keepalive.h" },
-    { ignore = "ignore.h" },
-    { ignored_by_default = "ignored_by_default.h" },
-    { inline_code = "inline_code.h" },
-    { lifetime = "lifetime.h" },
-    { nested = "nested.h" },
-    { ns_class = "ns_class.h" },
-    { ns_hidden = "ns_hidden.h" },
-    { operators = "operators.h" },
-    { overloads = "overloads.h" },
-    { parameters = "parameters.h" },
-    { refqual = "refqual.h" },
-    { rename = "rename.h" },
-    { retval = "retval.h" },
-    { subpkg = "subpkg.h" },
-    { static_only = "static_only.h" },
-    { trampoline = "trampoline.h" },
-    { type_caster = "type_caster.h" },
-    { type_caster_nested = "type_caster_nested.h" },
-    { using = "using.h" },
-    { using2 = "using2.h" },
-    { virtual_comma = "virtual_comma.h" },
-    { virtual_xform = "virtual_xform.h" },
-
-    # Inheritance
-    { IBase = "inheritance/ibase.h" },
-    { IChild = "inheritance/ichild.h" },
-    { IMChild = "inheritance/imchild.h" },
-    { IGChild = "inheritance/igchild.h" },
-    { Overloaded = "inheritance/overloaded.h" },
-    { mvi = "inheritance/mvi.h" },
-    { usingparent = "inheritance/usingparent.h" },
-
-    # Protection
-    { PBase = "protection/pbase.h" },
-    { PChild = "protection/pchild.h" },
-    { PGChild = "protection/pgchild.h" },
-
-    # Templates
-    {tbase = "templates/tbase.h"},
-    {tcrtp = "templates/tcrtp.h"},
-    {tcrtpfwd = "templates/tcrtpfwd.h"},
-    {tconcrete = "templates/tconcrete.h"},
-
-    {tvbase = "templates/tvbase.h"},
-    {tvchild = "templates/tvchild.h"},
-
-    {tbasic = "templates/basic.h"},
-    {tdependent_base = "templates/dependent_base.h"},
-    {tdependent_param = "templates/dependent_param.h"},
-    {tdependent_using = "templates/dependent_using.h"},
-    {tdependent_using2 = "templates/dependent_using2.h"},
-    {tfn = "templates/fn.h" },
-    {tnumeric = "templates/numeric.h"},
-    {tnested = "templates/nested.h"},
-]
+
+[tool.robotpy-build.wrappers."rpytest.ft".autogen_headers]
+abstract = "abstract.h"
+base_qualname = "base_qualname.h"
+base_qualname_hidden = "base_qualname_hidden.h"
+buffers = "buffers.h"
+custom_type_caster = "custom_type_caster.h"
+defaults = "defaults.h"
+docstrings = "docstrings.h"
+docstrings_append = "docstrings_append.h"
+enums = "enums.h"
+factory = "factory.h"
+fields = "fields.h"
+gilsafe_container = "gilsafe_container.h"
+keepalive = "keepalive.h"
+ignore = "ignore.h"
+ignored_by_default = "ignored_by_default.h"
+inline_code = "inline_code.h"
+lifetime = "lifetime.h"
+nested = "nested.h"
+ns_class = "ns_class.h"
+ns_hidden = "ns_hidden.h"
+operators = "operators.h"
+overloads = "overloads.h"
+parameters = "parameters.h"
+refqual = "refqual.h"
+rename = "rename.h"
+retval = "retval.h"
+subpkg = "subpkg.h"
+static_only = "static_only.h"
+trampoline = "trampoline.h"
+type_caster = "type_caster.h"
+type_caster_nested = "type_caster_nested.h"
+using = "using.h"
+using2 = "using2.h"
+virtual_comma = "virtual_comma.h"
+virtual_xform = "virtual_xform.h"
+
+# Inheritance
+IBase = "inheritance/ibase.h"
+IChild = "inheritance/ichild.h"
+IMChild = "inheritance/imchild.h"
+IGChild = "inheritance/igchild.h"
+Overloaded = "inheritance/overloaded.h"
+mvi = "inheritance/mvi.h"
+usingparent = "inheritance/usingparent.h"
+
+# Protection
+PBase = "protection/pbase.h"
+PChild = "protection/pchild.h"
+PGChild = "protection/pgchild.h"
+
+# Templates
+tbase = "templates/tbase.h"
+tcrtp = "templates/tcrtp.h"
+tcrtpfwd = "templates/tcrtpfwd.h"
+tconcrete = "templates/tconcrete.h"
+
+tvbase = "templates/tvbase.h"
+tvchild = "templates/tvchild.h"
+
+tbasic = "templates/basic.h"
+tdependent_base = "templates/dependent_base.h"
+tdependent_param = "templates/dependent_param.h"
+tdependent_using = "templates/dependent_using.h"
+tdependent_using2 = "templates/dependent_using2.h"
+tfn = "templates/fn.h"
+tnumeric = "templates/numeric.h"
+tnested = "templates/nested.h"
+
 
 [tool.robotpy-build.wrappers."rpytest.srconly"]
 name = "rpytest_srconly"