Skip to content

Commit f287ede

Browse files
chrisr3dostefano
authored andcommitted
fix: [taxii21] Typo
1 parent 0c0bd88 commit f287ede

5 files changed

Lines changed: 22 additions & 30 deletions

File tree

.github/workflows/release-package.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
tags:
77
- 'v*.*.*'
88

9+
env:
10+
11+
PYTHONDONTWRITEBYTECODE: 1
12+
913
jobs:
1014

1115
release:

.github/workflows/test-package.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ on:
88
pull_request:
99
branches: [ main ]
1010

11+
12+
env:
13+
14+
PYTHONDONTWRITEBYTECODE: 1
15+
1116
jobs:
1217

1318
docs:

misp_modules/modules/import_mod/taxii21.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
import requests
1212
import taxii2client
1313
import taxii2client.exceptions
14-
from misp_stix_converter import ExternalSTIX2toMISPParser, InternalSTIX2toMISPParser, _is_stix2_from_misp
14+
from misp_stix_converter import ExternalSTIX2toMISPParser, InternalSTIX2toMISPParser
15+
from misp_stix_converter.tools import is_stix2_from_misp
1516
from stix2.v20 import Bundle as Bundle_v20
1617
from stix2.v21 import Bundle as Bundle_v21
1718

@@ -296,7 +297,7 @@ def _query_taxii(config):
296297

297298
bundle = (Bundle_v21 if config.spec_version == "2.1" else Bundle_v20)(stix_objects, allow_custom=True)
298299

299-
converter = InternalSTIX2toMISPParser() if _is_stix2_from_misp(bundle.objects) else ExternalSTIX2toMISPParser()
300+
converter = InternalSTIX2toMISPParser() if is_stix2_from_misp(bundle.objects) else ExternalSTIX2toMISPParser()
300301
converter.load_stix_bundle(bundle)
301302
converter.parse_stix_bundle(single_event=True)
302303

poetry.lock

Lines changed: 9 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ dependencies = [
2121
"orjson>=3.11.9",
2222
"psutil",
2323
"tornado",
24+
"click==8.1.8", # greynoise requires it
2425
## minimum dependencies
2526
"beautifulsoup4",
2627
"jinja2",
@@ -36,7 +37,6 @@ minimal = [
3637
"censys==2.0.9",
3738
"socialscan<2.0.0",
3839
"yara-python==4.5.0",
39-
"click==8.1.8", # greynoise requires it
4040
## module dependencies
4141
"backscatter",
4242
"blockchain",
@@ -75,7 +75,6 @@ all = [
7575
"censys==2.0.9", ## in minimal
7676
"socialscan<2.0.0", ## in minimal
7777
"yara-python==4.5.0", ## in minimal
78-
"click==8.1.8", # greynoise requires it
7978
"numpy>=1.26.4,<2.0.0",
8079
"pandas>=2.0.0",
8180
"pandas_ods_reader>=1.0.0",

0 commit comments

Comments
 (0)