Merge branch 'develop' of github.com:MISP/MISP into 2.4

SteveClement · Sep 22, 2023 · 84a6cb6 · 84a6cb6
2 parents a110fb6 + 6ecea2c
commit 84a6cb6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -260,9 +260,9 @@ jobs:
 
               . ./venv/bin/activate
               pushd PyMISP
-              ls
-              ls tests
-              ls tests/viper-test-files
+              ls -la .
+              ls -la tests
+              ls -la tests/viper-test-files
               python tests/testlive_comprehensive.py
               python tests/test_mispevent.py
               popd

diff --git a/PyMISP b/PyMISP
diff --git a/app/files/scripts/misp-stix b/app/files/scripts/misp-stix
+53 −0		CHANGELOG.txt
+111 −111		poetry.lock
+4 −4		pyproject.toml
+7 −3		tests/testlive_comprehensive.py
+2 −2		misp_stix_converter/__init__.py
+2 −0		misp_stix_converter/misp2stix/misp_to_stix2.py
+2 −0		misp_stix_converter/misp2stix/misp_to_stix21.py
+0 −1		misp_stix_converter/stix2misp/external_stix2_mapping.py
+303 −174		misp_stix_converter/stix2misp/external_stix2_to_misp.py
+29 −26		misp_stix_converter/stix2misp/stix2_pattern_parser.py
+1 −1		misp_stix_converter/stix2misp/stix2_to_misp.py
+24 −24		poetry.lock
+2 −2		pyproject.toml