From 2e06daea7a7e2a017406eb934ae979fd9b929cbc Mon Sep 17 00:00:00 2001 From: Xiaokui Shu Date: Wed, 26 Jul 2023 09:57:19 -0400 Subject: [PATCH 1/2] remove SIMPLE_STRING from grammar --- src/kestrel/syntax/kestrel.lark | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/kestrel/syntax/kestrel.lark b/src/kestrel/syntax/kestrel.lark index 830673bf..8c7d2155 100644 --- a/src/kestrel/syntax/kestrel.lark +++ b/src/kestrel/syntax/kestrel.lark @@ -283,8 +283,6 @@ ESCAPED_STRING: "\"" _STRING_ESC_INNER "\"" | "'" _STRING_ESC_INNER "'" ESCAPED_STRING_WS: WS* ESCAPED_STRING WS* -SIMPLE_STRING: ECNAME - // nearly Python string, but no [ubf]? as prefix options // check Lark example of Python parser for reference advanced_string: /(r?)("(?!"").*?(? Date: Wed, 26 Jul 2023 10:09:48 -0400 Subject: [PATCH 2/2] fix #370 with firepit 2.3.25 --- setup.cfg | 2 +- tests/test_stixshifter_translator.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 58a5bcb2..4f31b81e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -38,7 +38,7 @@ install_requires = nest-asyncio>=1.5.6 stix-shifter==5.3.1 stix-shifter-utils==5.3.1 - firepit>=2.3.24 + firepit>=2.3.25 tests_require = pytest diff --git a/tests/test_stixshifter_translator.py b/tests/test_stixshifter_translator.py index 6c702aa8..94c58d9d 100644 --- a/tests/test_stixshifter_translator.py +++ b/tests/test_stixshifter_translator.py @@ -172,7 +172,6 @@ def test_fast_translate(): assert translator.is_alive() == False -@pytest.mark.skip(reason="kestrel v1.7.1 released with issue #370 unfixed") def test_stixshifter_fast_translate_with_parquet_writing_to_disk(tmpdir): query_id = "8df266aa-2901-4a94-ace9-a4403e310fa1" check_module_availability(CONNECTOR_NAME)