From 6c04c8266bae8db9f848b6747a3df9c48e9a0a4a Mon Sep 17 00:00:00 2001 From: palinatolmach Date: Tue, 20 Feb 2024 21:54:18 +0800 Subject: [PATCH 1/9] Select all tests starting with `prove`, `check`, and `test` by default --- src/kontrol/foundry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kontrol/foundry.py b/src/kontrol/foundry.py index 89b6de280..4e0695867 100644 --- a/src/kontrol/foundry.py +++ b/src/kontrol/foundry.py @@ -263,7 +263,7 @@ def all_tests(self) -> list[str]: for contract in self.contracts.values() if contract.name_with_path.endswith('Test') for method in contract.methods - if method.name.startswith('test') + if method.is_test ] @cached_property From 87a2d04497604c765f5585eb9fb6b9c7905fb96d Mon Sep 17 00:00:00 2001 From: palinatolmach Date: Wed, 21 Feb 2024 16:19:36 +0800 Subject: [PATCH 2/9] Select test contracts located in `/test` folder by default --- src/kontrol/foundry.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kontrol/foundry.py b/src/kontrol/foundry.py index 4e0695867..38ab02a9d 100644 --- a/src/kontrol/foundry.py +++ b/src/kontrol/foundry.py @@ -258,10 +258,11 @@ def build(self) -> None: @cached_property def all_tests(self) -> list[str]: + test_dir = self.profile.get('test', 'test') return [ f'{contract.name_with_path}.{method.signature}' for contract in self.contracts.values() - if contract.name_with_path.endswith('Test') + if test_dir in contract.contract_path.split('/') for method in contract.methods if method.is_test ] From 09d71f5b5b3d307592d430224443350c58dfe89a Mon Sep 17 00:00:00 2001 From: palinatolmach Date: Wed, 21 Feb 2024 16:51:02 +0800 Subject: [PATCH 3/9] Refactored selecting test contracts by default to allow longer paths (`test/kontrol`) --- src/kontrol/foundry.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kontrol/foundry.py b/src/kontrol/foundry.py index 38ab02a9d..f076c4e35 100644 --- a/src/kontrol/foundry.py +++ b/src/kontrol/foundry.py @@ -259,10 +259,11 @@ def build(self) -> None: @cached_property def all_tests(self) -> list[str]: test_dir = self.profile.get('test', 'test') + test_dir += '/' if not test_dir.endswith('/') else '' return [ f'{contract.name_with_path}.{method.signature}' for contract in self.contracts.values() - if test_dir in contract.contract_path.split('/') + if contract.contract_path.startswith(test_dir) for method in contract.methods if method.is_test ] From 15f1830ebf5e99c581cabb4a497eccae12c5e7eb Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 21 Feb 2024 09:01:13 +0000 Subject: [PATCH 4/9] Set Version: 0.1.163 --- package/version | 2 +- pyproject.toml | 2 +- src/kontrol/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/version b/package/version index ea779d0cb..805de215c 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.161 +0.1.163 diff --git a/pyproject.toml b/pyproject.toml index 0ace38c75..ad8d0b91c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kontrol" -version = "0.1.161" +version = "0.1.163" description = "Foundry integration for KEVM" authors = [ "Runtime Verification, Inc. ", diff --git a/src/kontrol/__init__.py b/src/kontrol/__init__.py index 094f0a9a0..571867b44 100644 --- a/src/kontrol/__init__.py +++ b/src/kontrol/__init__.py @@ -5,4 +5,4 @@ if TYPE_CHECKING: from typing import Final -VERSION: Final = '0.1.161' +VERSION: Final = '0.1.163' From f059ff86f4f3c7bd7a2496facbab9f167f232377 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 21 Feb 2024 13:17:38 +0000 Subject: [PATCH 5/9] Set Version: 0.1.164 --- package/version | 2 +- pyproject.toml | 2 +- src/kontrol/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/version b/package/version index 805de215c..68d9ebd16 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.163 +0.1.164 diff --git a/pyproject.toml b/pyproject.toml index 257152f59..bd52a9a4b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kontrol" -version = "0.1.163" +version = "0.1.164" description = "Foundry integration for KEVM" authors = [ "Runtime Verification, Inc. ", diff --git a/src/kontrol/__init__.py b/src/kontrol/__init__.py index 571867b44..ff487db5e 100644 --- a/src/kontrol/__init__.py +++ b/src/kontrol/__init__.py @@ -5,4 +5,4 @@ if TYPE_CHECKING: from typing import Final -VERSION: Final = '0.1.163' +VERSION: Final = '0.1.164' From a6edaa572d372d0de6f50265788f2a7d2449a952 Mon Sep 17 00:00:00 2001 From: Palina Tolmach Date: Thu, 22 Feb 2024 15:47:27 +0800 Subject: [PATCH 6/9] Use `os.path.join` to build a `test_dir` string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Andrei Văcaru <16517508+anvacaru@users.noreply.github.com> --- src/kontrol/foundry.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/kontrol/foundry.py b/src/kontrol/foundry.py index b80de5602..e0762f7f8 100644 --- a/src/kontrol/foundry.py +++ b/src/kontrol/foundry.py @@ -258,8 +258,7 @@ def build(self) -> None: @cached_property def all_tests(self) -> list[str]: - test_dir = self.profile.get('test', 'test') - test_dir += '/' if not test_dir.endswith('/') else '' + test_dir = os.path.join(self.profile.get('test', 'test'), '') return [ f'{contract.name_with_path}.{method.signature}' for contract in self.contracts.values() From 1fd5e9a24c0e2594403501a6a10985f5a430e3d7 Mon Sep 17 00:00:00 2001 From: devops Date: Thu, 22 Feb 2024 07:47:55 +0000 Subject: [PATCH 7/9] Set Version: 0.1.165 --- package/version | 2 +- pyproject.toml | 2 +- src/kontrol/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/version b/package/version index 68d9ebd16..513095931 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.164 +0.1.165 diff --git a/pyproject.toml b/pyproject.toml index b6fdc5060..f15782d2d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kontrol" -version = "0.1.164" +version = "0.1.165" description = "Foundry integration for KEVM" authors = [ "Runtime Verification, Inc. ", diff --git a/src/kontrol/__init__.py b/src/kontrol/__init__.py index ff487db5e..f02369589 100644 --- a/src/kontrol/__init__.py +++ b/src/kontrol/__init__.py @@ -5,4 +5,4 @@ if TYPE_CHECKING: from typing import Final -VERSION: Final = '0.1.164' +VERSION: Final = '0.1.165' From df15433327c5dc7285aa434da55bc3ca57bfb8c9 Mon Sep 17 00:00:00 2001 From: devops Date: Thu, 22 Feb 2024 11:14:56 +0000 Subject: [PATCH 8/9] Set Version: 0.1.166 --- package/version | 2 +- pyproject.toml | 2 +- src/kontrol/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/version b/package/version index 513095931..8708376b8 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.165 +0.1.166 diff --git a/pyproject.toml b/pyproject.toml index 01eadaec4..b4fe9f3b2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kontrol" -version = "0.1.165" +version = "0.1.166" description = "Foundry integration for KEVM" authors = [ "Runtime Verification, Inc. ", diff --git a/src/kontrol/__init__.py b/src/kontrol/__init__.py index f02369589..e9d93b43d 100644 --- a/src/kontrol/__init__.py +++ b/src/kontrol/__init__.py @@ -5,4 +5,4 @@ if TYPE_CHECKING: from typing import Final -VERSION: Final = '0.1.165' +VERSION: Final = '0.1.166' From edd2b31bc7c09276463c25cbba52ddaafb7c39b2 Mon Sep 17 00:00:00 2001 From: devops Date: Thu, 22 Feb 2024 12:48:20 +0000 Subject: [PATCH 9/9] Set Version: 0.1.167 --- package/version | 2 +- pyproject.toml | 2 +- src/kontrol/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/version b/package/version index 8708376b8..160644738 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.166 +0.1.167 diff --git a/pyproject.toml b/pyproject.toml index 70721b95c..b731e5446 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kontrol" -version = "0.1.166" +version = "0.1.167" description = "Foundry integration for KEVM" authors = [ "Runtime Verification, Inc. ", diff --git a/src/kontrol/__init__.py b/src/kontrol/__init__.py index e9d93b43d..292089263 100644 --- a/src/kontrol/__init__.py +++ b/src/kontrol/__init__.py @@ -5,4 +5,4 @@ if TYPE_CHECKING: from typing import Final -VERSION: Final = '0.1.166' +VERSION: Final = '0.1.167'