T

Author: Behemyth

examples/conan_cmake/inject/pyproject.toml

@@ -3,13 +3,13 @@ description = "A simple project showing how to use conan with CPPython"
 name = "cppython-conan-cmake-simple"
 version = "1.0.0"
 
-license = {text = "MIT"}
+license = { text = "MIT" }
 
-authors = [{name = "Synodic Software", email = "contact@synodic.software"}]
+authors = [{ name = "Synodic Software", email = "contact@synodic.software" }]
 
 requires-python = ">=3.13"
 
-dependencies = ["cppython[conan, cmake]>=0.1.0"]
+dependencies = ["cppython[conan, cmake, git]>=0.9.0"]
 
 [tool.cppython]
 generator-name = "cmake"

examples/conan_cmake/simple/pyproject.toml

@@ -3,13 +3,14 @@ description = "A simple project showing how to use conan with CPPython"
 name = "cppython-conan-cmake-simple"
 version = "1.0.0"
 
-license = {text = "MIT"}
+license = { text = "MIT" }
 
-authors = [{name = "Synodic Software", email = "contact@synodic.software"}]
+authors = [{ name = "Synodic Software", email = "contact@synodic.software" }]
 
 requires-python = ">=3.13"
 
-dependencies = ["cppython[conan, cmake]>=0.1.0"]
+dependencies = ["cppython[conan, cmake, git]>=0.9.0"]
+
 
 [tool.cppython]
 generator-name = "cmake"

examples/vcpkg_cmake/simple/pyproject.toml

@@ -3,13 +3,14 @@ description = "A simple project showing how to use vcpkg with CPPython"
 name = "cppython-vcpkg-cmake-simple"
 version = "1.0.0"
 
-license = {text = "MIT"}
+license = { text = "MIT" }
 
-authors = [{name = "Synodic Software", email = "contact@synodic.software"}]
+authors = [{ name = "Synodic Software", email = "contact@synodic.software" }]
 
 requires-python = ">=3.13"
 
-dependencies = ["cppython[vcpkg, cmake]>=0.1.0"]
+dependencies = ["cppython[vcpkg, cmake, git]>=0.9.0"]
+
 
 [tool.cppython]
 generator-name = "cmake"

pyproject.toml

@@ -100,7 +100,8 @@ skip_empty = true
 plugins = ["-e file:///${PROJECT_ROOT}"]
 
 [tool.pdm.options]
-update = ["--update-all", "--unconstrained"]
+install = ["-G:all"]
+update = ["--update-all"]
 
 [tool.pdm.version]
 source = "scm"

tests/fixtures/cli.py

@@ -22,7 +22,7 @@ def fixture_typer_runner() -> CliRunner:
     name='fresh_environment',
     scope='session',
 )
-def fixture_fresh_environment() -> dict[str, str]:
+def fixture_fresh_environment(request: pytest.FixtureRequest) -> dict[str, str]:
     """Create a fresh environment for subprocess calls."""
     # Start with a minimal environment
     new_env = {}
@@ -33,4 +33,8 @@ def fixture_fresh_environment() -> dict[str, str]:
 
     # Provide a PATH that doesn't contain venv references
     new_env['PATH'] = os.environ['PATH']
+
+    # Set the Cppython root directory
+    new_env['CPPYTHON_ROOT'] = str(request.config.rootpath.resolve())
+
     return new_env

tests/integration/examples/test_conan_cmake.py

@@ -19,6 +19,12 @@ class TestConanCMake:
     def test_simple(example_runner: CliRunner, fresh_environment: dict[str, str]) -> None:
         """Simple project"""
         # By nature of running the test, we require PDM to develop the project and so it will be installed
+        result = subprocess.run(
+            ['pdm', 'install', '--plugins'], capture_output=True, text=True, env=fresh_environment, check=False
+        )
+
+        assert result.returncode == 0, f'PDM plugin installation failed: {result.stderr}'
+
         result = subprocess.run(['pdm', 'install'], capture_output=True, text=True, env=fresh_environment, check=False)
 
         assert result.returncode == 0, f'PDM install failed: {result.stderr}'
@@ -37,6 +43,12 @@ def test_simple(example_runner: CliRunner, fresh_environment: dict[str, str]) ->
     def test_inject(example_runner: CliRunner, fresh_environment: dict[str, str]) -> None:
         """Inject"""
         # By nature of running the test, we require PDM to develop the project and so it will be installed
+        result = subprocess.run(
+            ['pdm', 'install', '--plugins'], capture_output=True, text=True, env=fresh_environment, check=False
+        )
+
+        assert result.returncode == 0, f'PDM plugin installation failed: {result.stderr}'
+
         result = subprocess.run(['pdm', 'install'], capture_output=True, text=True, env=fresh_environment, check=False)
 
         assert result.returncode == 0, f'PDM install failed: {result.stderr}'