Merge pull request #383 from opencybersecurityalliance/cleanup-gramma…

…r-simplestring Cleanup grammar simplestring
opencybersecurityalliance · Jul 26, 2023 · 9b2680f · 9b2680f
2 parents fed9dbc + 0184de2
commit 9b2680f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git 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/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?)("(?!"").*?(?<!\\)(\\\\)*?"|'(?!'').*?(?<!\\)(\\\\)*?')/

diff --git 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)