From 83f387eec673ac27f44eeb61af82eef215c5ebd5 Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Thu, 17 Mar 2022 21:13:22 -0400 Subject: [PATCH 1/3] Rehash --- pdm.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pdm.lock b/pdm.lock index e8a8c76..12c683a 100644 --- a/pdm.lock +++ b/pdm.lock @@ -245,7 +245,7 @@ summary = "Module for decorators, wrappers and monkey patching." [metadata] lock_version = "3.1" -content_hash = "sha256:b6d2a606ea7991f32984857e73983e3be18a1fbe2fb694da7ec084bfaa002b63" +content_hash = "sha256:bde36450a64a7b8a8f4fd100acabb746a8136face027f51dc1e753e5cbf7b8bb" [metadata.files] "astroid 2.9.3" = [ From e8718a8d9d5dca69c82765913e6bf144359cd982 Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Sat, 19 Mar 2022 14:59:06 -0400 Subject: [PATCH 2/3] Change Default Info --- cppython/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cppython/data.py b/cppython/data.py index 61551b9..24dfb36 100644 --- a/cppython/data.py +++ b/cppython/data.py @@ -9,6 +9,6 @@ default_pep621 = PEP621(name="test_name", version="1.0") # CMake is a default plugin -default_cppython_data = CPPythonData(**{"generator": "cmake", "target": TargetEnum.EXE, "install-path": Path()}) +default_cppython_data = CPPythonData(**{"generator": None, "target": TargetEnum.EXE}) default_tool_data = ToolData(**{"cppython": default_cppython_data}) default_pyproject = PyProject(**{"project": default_pep621, "tool": default_tool_data}) From 7f9648708e5bf1c76426e5818281b79e1285e1e3 Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Sat, 19 Mar 2022 15:21:05 -0400 Subject: [PATCH 3/3] Remove Generator --- cppython/data.py | 4 +--- pdm.lock | 8 ++++---- pyproject.toml | 2 +- tests/unit/test_interface.py | 1 - 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cppython/data.py b/cppython/data.py index 24dfb36..55fe04b 100644 --- a/cppython/data.py +++ b/cppython/data.py @@ -2,13 +2,11 @@ Defaulted data to help testing """ -from pathlib import Path - from cppython_core.schema import PEP621, CPPythonData, PyProject, TargetEnum, ToolData default_pep621 = PEP621(name="test_name", version="1.0") # CMake is a default plugin -default_cppython_data = CPPythonData(**{"generator": None, "target": TargetEnum.EXE}) +default_cppython_data = CPPythonData(**{"target": TargetEnum.EXE}) default_tool_data = ToolData(**{"cppython": default_cppython_data}) default_pyproject = PyProject(**{"project": default_pep621, "tool": default_tool_data}) diff --git a/pdm.lock b/pdm.lock index 12c683a..cf0370e 100644 --- a/pdm.lock +++ b/pdm.lock @@ -68,7 +68,7 @@ dependencies = [ [[package]] name = "cppython-core" -version = "0.1.1" +version = "0.1.2" requires_python = ">=3.10" summary = "Data definitions for CPPython" dependencies = [ @@ -336,9 +336,9 @@ content_hash = "sha256:bde36450a64a7b8a8f4fd100acabb746a8136face027f51dc1e753e5c {file = "coverage-6.3.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:18d520c6860515a771708937d2f78f63cc47ab3b80cb78e86573b0a760161faf"}, {file = "coverage-6.3.2.tar.gz", hash = "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9"}, ] -"cppython-core 0.1.1" = [ - {file = "cppython_core-0.1.1-py3-none-any.whl", hash = "sha256:5ea0027328417d22f2f718a883bafeac1b049fed84db06f0ab925a89149ef897"}, - {file = "cppython-core-0.1.1.tar.gz", hash = "sha256:5df3d04010661f88f778317978eb3d5319976fa72d3289ec2a2b437daf717901"}, +"cppython-core 0.1.2" = [ + {file = "cppython_core-0.1.2-py3-none-any.whl", hash = "sha256:6320acc041d6fd012d05de93d8d9a3df7bfb4585ae71f564642f0c2177fc987c"}, + {file = "cppython-core-0.1.2.tar.gz", hash = "sha256:458e96ec672edce68b339a4b68a32a95dc4d2c0a37bf405bfd529208ca0b0469"}, ] "iniconfig 1.1.1" = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, diff --git a/pyproject.toml b/pyproject.toml index db56327..a4cbedb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ requires-python = ">=3.10" dependencies = [ "click>=8.0.3", "tomlkit>=0.10.0", - "cppython-core>=0.1.1", + "cppython-core>=0.1.2", ] [project.license-files] diff --git a/tests/unit/test_interface.py b/tests/unit/test_interface.py index ba862fd..079a455 100644 --- a/tests/unit/test_interface.py +++ b/tests/unit/test_interface.py @@ -10,7 +10,6 @@ from cppython.console import Config, ConsoleInterface, cli from cppython.data import default_pyproject -from cppython.project import ProjectConfiguration class TestCLIInterface(InterfaceUnitTests):