Remove PyProject From Interface __init__

cppython/plugins/interface/console.py

@@ -9,7 +9,7 @@
 import tomlkit
 
 from cppython.project import Project
-from cppython.schema import GeneratorData, GeneratorDataType, Interface, PyProject
+from cppython.schema import GeneratorDataType, Interface, PyProject
 
 
 def _create_pyproject():
@@ -41,10 +41,10 @@ def __init__(self):
         pyproject = _create_pyproject()
 
         # Initialize the object hook into CPPython
-        interface = ConsoleInterface(pyproject)
+        interface = ConsoleInterface()
 
         # Initialize the CPPython context
-        self.project = Project(interface)
+        self.project = Project(interface, pyproject)
 
 
 pass_config = click.make_pass_decorator(Config)

cppython/plugins/test/pytest.py

@@ -7,6 +7,7 @@
 
 import pytest
 
+from cppython.plugins.test.data import default_pyproject
 from cppython.project import Project
 from cppython.schema import Generator, Interface
 
@@ -32,7 +33,7 @@ class GeneratorIntegrationTests(GeneratorTests):
 
     def test_plugin_registration(self, generator: Generator):
         """
-        TODO
+        Test the registration with setuptools entry_points
         """
         plugin_entries = entry_points(group=f"cppython.{generator.plugin_group()}")
         assert len(plugin_entries) > 0
@@ -86,7 +87,7 @@ def test_project(self, interface: Interface):
         """
         Test that the project can be constructed from the given interface
         """
-        Project(interface)
+        Project(interface, default_pyproject)
 
 
 class InterfaceUnitTests(InterfaceTests):

cppython/project.py

@@ -6,15 +6,15 @@
 from typing import Callable, Optional, Type, TypeVar
 
 from cppython.exceptions import ConfigError
-from cppython.schema import API, Generator, Interface, Plugin
+from cppython.schema import API, Generator, Interface, Plugin, PyProject
 
 
 class Project(API):
     """
     The object constructed at each entry_point
     """
 
-    def __init__(self, interface: Interface) -> None:
+    def __init__(self, interface: Interface, pyproject: PyProject) -> None:
 
         self._interface = interface
 
@@ -35,15 +35,13 @@ def find_plugin_type(plugin_type: PluginType, condition: Callable[[str], bool])
 
             return None
 
-        plugin_type = find_plugin_type(Generator, lambda name: name == interface.pyproject.cppython_data.generator)
+        plugin_type = find_plugin_type(Generator, lambda name: name == pyproject.cppython_data.generator)
 
         if plugin_type is None:
-            raise ConfigError(
-                f"No generator plugin with the name '{interface.pyproject.cppython_data.generator}' was found."
-            )
+            raise ConfigError(f"No generator plugin with the name '{pyproject.cppython_data.generator}' was found.")
 
         generator_data = interface.read_generator_data(plugin_type.data_type())
-        self._generator = plugin_type(interface.pyproject, generator_data)
+        self._generator = plugin_type(pyproject, generator_data)
         self._generator.install_generator()
 
     # API Contract

cppython/schema.py

@@ -93,10 +93,6 @@ class Plugin(ABC):
     Abstract plugin type
     """
 
-    @abstractmethod
-    def __init__(self) -> None:
-        pass
-
     @staticmethod
     @abstractmethod
     def plugin_group() -> str:
@@ -120,26 +116,6 @@ class Interface:
     Abstract type to be inherited by CPPython interfaces
     """
 
-    def __init__(self, pyproject: PyProject) -> None:
-        super().__init__()
-
-        self.pyproject = pyproject
-
-    @property
-    def pyproject(self) -> PyProject:
-        """
-        PyProject getter
-        """
-        return self._pyproject
-
-    @pyproject.setter
-    def pyproject(self, value: PyProject):
-        """
-        PyProject setter
-        """
-
-        self._pyproject = value
-
     @abstractmethod
     def read_generator_data(self, generator_data_type: Type[GeneratorDataType]) -> GeneratorDataType:
         """
@@ -194,3 +170,4 @@ def install_generator(self) -> bool:
         Installs the external tooling required by the generator if necessary
         Returns whether anything was installed or not
         """
+        raise NotImplementedError()

pyproject.toml

@@ -46,9 +46,6 @@ cppython = "cppython.plugins.interface.console:cli"
 [project.entry-points."cppython.generator_plugins"]
 cmake = "cppython.plugins.generator.cmake:CMakeGenerator"
 
-[project.entry-points."cppython.interface_plugins"]
-console = "cppython.plugins.interface.console:ConsoleInterface"
-
 # Pytest plugins
 [tool.entry-points.pytest11]
 pytest_cppython = "cppython.plugins.test.pytest"

tests/integration/test_interface.py

@@ -5,7 +5,6 @@
 import pytest
 
 from cppython.plugins.interface.console import ConsoleInterface
-from cppython.plugins.test.data import default_pyproject
 from cppython.plugins.test.pytest import InterfaceIntegrationTests
 
 
@@ -22,4 +21,4 @@ def fixture_interface(self):
         Returns:
             ConsoleInterface -- The Interface object to use for the CPPython defined tests
         """
-        return ConsoleInterface(default_pyproject)
+        return ConsoleInterface()

tests/unit/test_interface.py

@@ -25,7 +25,7 @@ def fixture_interface(self) -> ConsoleInterface:
         Returns:
             ConsoleInterface -- The Interface object to use for the CPPython defined tests
         """
-        return ConsoleInterface(default_pyproject)
+        return ConsoleInterface()
 
     # Grab the API methods and parameterize them for automatic testing of the entry_points
     method_list = [func for func in dir(API) if callable(getattr(API, func)) and not func.startswith("__")]