From 481284dc120c638e5e979aba66547d3012eede5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 21 Jun 2021 11:20:41 -0700 Subject: [PATCH] chg: Update mypy, change accordingly --- .gitignore | 3 + .../README.md | 0 .../generate.py | 0 .../output/empty | 0 .../settings.default.py | 0 .../MISPItemToRedis.py | 0 .../ObjectConstructor/CowrieMISPObject.py | 0 .../README.md | 0 .../fromredis.py | 0 .../generator.py | 0 .../install.sh | 0 .../server.py | 0 .../settings.default.py | 0 examples/{ioc-2-misp => ioc_2_misp}/README.md | 0 .../{ioc-2-misp => ioc_2_misp}/ioc2misp.py | 0 .../{ioc-2-misp => ioc_2_misp}/keys.py.sample | 0 .../{ioc-2-misp => ioc_2_misp}/taxonomy.csv | 0 .../README.md | 0 examples/situational_awareness/__init__.py | 0 .../attribute_treemap.py | 0 .../bokeh_tools.py | 0 .../date_tools.py | 0 .../pygal_tools.py | 0 .../style.css | 0 .../style2.css | 0 .../tag_scatter.py | 0 .../tag_search.py | 0 .../tags_count.py | 0 .../tags_to_graphs.py | 0 .../test_attribute_treemap.html | 0 .../tools.py | 0 mypy.ini | 6 - poetry.lock | 187 ++++++++++++++---- pymisp/data/misp-objects | 2 +- pyproject.toml | 14 +- setup.py | 2 +- 36 files changed, 171 insertions(+), 43 deletions(-) rename examples/{feed-generator => feed_generator}/README.md (100%) rename examples/{feed-generator => feed_generator}/generate.py (100%) rename examples/{feed-generator => feed_generator}/output/empty (100%) rename examples/{feed-generator => feed_generator}/settings.default.py (100%) rename examples/{feed-generator-from-redis => feed_generator_from_redis}/MISPItemToRedis.py (100%) rename examples/{feed-generator-from-redis => feed_generator_from_redis}/ObjectConstructor/CowrieMISPObject.py (100%) rename examples/{feed-generator-from-redis => feed_generator_from_redis}/README.md (100%) rename examples/{feed-generator-from-redis => feed_generator_from_redis}/fromredis.py (100%) rename examples/{feed-generator-from-redis => feed_generator_from_redis}/generator.py (100%) rename examples/{feed-generator-from-redis => feed_generator_from_redis}/install.sh (100%) rename examples/{feed-generator-from-redis => feed_generator_from_redis}/server.py (100%) rename examples/{feed-generator-from-redis => feed_generator_from_redis}/settings.default.py (100%) rename examples/{ioc-2-misp => ioc_2_misp}/README.md (100%) rename examples/{ioc-2-misp => ioc_2_misp}/ioc2misp.py (100%) rename examples/{ioc-2-misp => ioc_2_misp}/keys.py.sample (100%) rename examples/{ioc-2-misp => ioc_2_misp}/taxonomy.csv (100%) rename examples/{situational-awareness => situational_awareness}/README.md (100%) create mode 100644 examples/situational_awareness/__init__.py rename examples/{situational-awareness => situational_awareness}/attribute_treemap.py (100%) rename examples/{situational-awareness => situational_awareness}/bokeh_tools.py (100%) rename examples/{situational-awareness => situational_awareness}/date_tools.py (100%) rename examples/{situational-awareness => situational_awareness}/pygal_tools.py (100%) rename examples/{situational-awareness => situational_awareness}/style.css (100%) rename examples/{situational-awareness => situational_awareness}/style2.css (100%) rename examples/{situational-awareness => situational_awareness}/tag_scatter.py (100%) rename examples/{situational-awareness => situational_awareness}/tag_search.py (100%) rename examples/{situational-awareness => situational_awareness}/tags_count.py (100%) rename examples/{situational-awareness => situational_awareness}/tags_to_graphs.py (100%) rename examples/{situational-awareness => situational_awareness}/test_attribute_treemap.html (100%) rename examples/{situational-awareness => situational_awareness}/tools.py (100%) delete mode 100644 mypy.ini diff --git a/.gitignore b/.gitignore index 7b530cb..63594a8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ examples/cudeso.py examples/feed-generator/output/*\.json examples/feed-generator/output/hashes\.csv examples/feed-generator/settings\.py +examples/feed_generator/output/*\.json +examples/feed_generator/output/hashes\.csv +examples/feed_generator/settings\.py tests/reportlab_testoutputs/*\.pdf build/* dist/* diff --git a/examples/feed-generator/README.md b/examples/feed_generator/README.md similarity index 100% rename from examples/feed-generator/README.md rename to examples/feed_generator/README.md diff --git a/examples/feed-generator/generate.py b/examples/feed_generator/generate.py similarity index 100% rename from examples/feed-generator/generate.py rename to examples/feed_generator/generate.py diff --git a/examples/feed-generator/output/empty b/examples/feed_generator/output/empty similarity index 100% rename from examples/feed-generator/output/empty rename to examples/feed_generator/output/empty diff --git a/examples/feed-generator/settings.default.py b/examples/feed_generator/settings.default.py similarity index 100% rename from examples/feed-generator/settings.default.py rename to examples/feed_generator/settings.default.py diff --git a/examples/feed-generator-from-redis/MISPItemToRedis.py b/examples/feed_generator_from_redis/MISPItemToRedis.py similarity index 100% rename from examples/feed-generator-from-redis/MISPItemToRedis.py rename to examples/feed_generator_from_redis/MISPItemToRedis.py diff --git a/examples/feed-generator-from-redis/ObjectConstructor/CowrieMISPObject.py b/examples/feed_generator_from_redis/ObjectConstructor/CowrieMISPObject.py similarity index 100% rename from examples/feed-generator-from-redis/ObjectConstructor/CowrieMISPObject.py rename to examples/feed_generator_from_redis/ObjectConstructor/CowrieMISPObject.py diff --git a/examples/feed-generator-from-redis/README.md b/examples/feed_generator_from_redis/README.md similarity index 100% rename from examples/feed-generator-from-redis/README.md rename to examples/feed_generator_from_redis/README.md diff --git a/examples/feed-generator-from-redis/fromredis.py b/examples/feed_generator_from_redis/fromredis.py similarity index 100% rename from examples/feed-generator-from-redis/fromredis.py rename to examples/feed_generator_from_redis/fromredis.py diff --git a/examples/feed-generator-from-redis/generator.py b/examples/feed_generator_from_redis/generator.py similarity index 100% rename from examples/feed-generator-from-redis/generator.py rename to examples/feed_generator_from_redis/generator.py diff --git a/examples/feed-generator-from-redis/install.sh b/examples/feed_generator_from_redis/install.sh similarity index 100% rename from examples/feed-generator-from-redis/install.sh rename to examples/feed_generator_from_redis/install.sh diff --git a/examples/feed-generator-from-redis/server.py b/examples/feed_generator_from_redis/server.py similarity index 100% rename from examples/feed-generator-from-redis/server.py rename to examples/feed_generator_from_redis/server.py diff --git a/examples/feed-generator-from-redis/settings.default.py b/examples/feed_generator_from_redis/settings.default.py similarity index 100% rename from examples/feed-generator-from-redis/settings.default.py rename to examples/feed_generator_from_redis/settings.default.py diff --git a/examples/ioc-2-misp/README.md b/examples/ioc_2_misp/README.md similarity index 100% rename from examples/ioc-2-misp/README.md rename to examples/ioc_2_misp/README.md diff --git a/examples/ioc-2-misp/ioc2misp.py b/examples/ioc_2_misp/ioc2misp.py similarity index 100% rename from examples/ioc-2-misp/ioc2misp.py rename to examples/ioc_2_misp/ioc2misp.py diff --git a/examples/ioc-2-misp/keys.py.sample b/examples/ioc_2_misp/keys.py.sample similarity index 100% rename from examples/ioc-2-misp/keys.py.sample rename to examples/ioc_2_misp/keys.py.sample diff --git a/examples/ioc-2-misp/taxonomy.csv b/examples/ioc_2_misp/taxonomy.csv similarity index 100% rename from examples/ioc-2-misp/taxonomy.csv rename to examples/ioc_2_misp/taxonomy.csv diff --git a/examples/situational-awareness/README.md b/examples/situational_awareness/README.md similarity index 100% rename from examples/situational-awareness/README.md rename to examples/situational_awareness/README.md diff --git a/examples/situational_awareness/__init__.py b/examples/situational_awareness/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/examples/situational-awareness/attribute_treemap.py b/examples/situational_awareness/attribute_treemap.py similarity index 100% rename from examples/situational-awareness/attribute_treemap.py rename to examples/situational_awareness/attribute_treemap.py diff --git a/examples/situational-awareness/bokeh_tools.py b/examples/situational_awareness/bokeh_tools.py similarity index 100% rename from examples/situational-awareness/bokeh_tools.py rename to examples/situational_awareness/bokeh_tools.py diff --git a/examples/situational-awareness/date_tools.py b/examples/situational_awareness/date_tools.py similarity index 100% rename from examples/situational-awareness/date_tools.py rename to examples/situational_awareness/date_tools.py diff --git a/examples/situational-awareness/pygal_tools.py b/examples/situational_awareness/pygal_tools.py similarity index 100% rename from examples/situational-awareness/pygal_tools.py rename to examples/situational_awareness/pygal_tools.py diff --git a/examples/situational-awareness/style.css b/examples/situational_awareness/style.css similarity index 100% rename from examples/situational-awareness/style.css rename to examples/situational_awareness/style.css diff --git a/examples/situational-awareness/style2.css b/examples/situational_awareness/style2.css similarity index 100% rename from examples/situational-awareness/style2.css rename to examples/situational_awareness/style2.css diff --git a/examples/situational-awareness/tag_scatter.py b/examples/situational_awareness/tag_scatter.py similarity index 100% rename from examples/situational-awareness/tag_scatter.py rename to examples/situational_awareness/tag_scatter.py diff --git a/examples/situational-awareness/tag_search.py b/examples/situational_awareness/tag_search.py similarity index 100% rename from examples/situational-awareness/tag_search.py rename to examples/situational_awareness/tag_search.py diff --git a/examples/situational-awareness/tags_count.py b/examples/situational_awareness/tags_count.py similarity index 100% rename from examples/situational-awareness/tags_count.py rename to examples/situational_awareness/tags_count.py diff --git a/examples/situational-awareness/tags_to_graphs.py b/examples/situational_awareness/tags_to_graphs.py similarity index 100% rename from examples/situational-awareness/tags_to_graphs.py rename to examples/situational_awareness/tags_to_graphs.py diff --git a/examples/situational-awareness/test_attribute_treemap.html b/examples/situational_awareness/test_attribute_treemap.html similarity index 100% rename from examples/situational-awareness/test_attribute_treemap.html rename to examples/situational_awareness/test_attribute_treemap.html diff --git a/examples/situational-awareness/tools.py b/examples/situational_awareness/tools.py similarity index 100% rename from examples/situational-awareness/tools.py rename to examples/situational_awareness/tools.py diff --git a/mypy.ini b/mypy.ini deleted file mode 100644 index aeee4b7..0000000 --- a/mypy.ini +++ /dev/null @@ -1,6 +0,0 @@ -[mypy] -ignore_errors = False - -show_error_context = True -pretty = True -exclude = pymisp/data diff --git a/poetry.lock b/poetry.lock index 92f12a8..386fe90 100644 --- a/poetry.lock +++ b/poetry.lock @@ -630,7 +630,7 @@ olefile = ">=0.45" [[package]] name = "mypy" -version = "0.812" +version = "0.902" description = "Optional static typing for Python" category = "dev" optional = false @@ -638,11 +638,13 @@ python-versions = ">=3.5" [package.dependencies] mypy-extensions = ">=0.4.3,<0.5.0" -typed-ast = ">=1.4.0,<1.5.0" +toml = "*" +typed-ast = {version = ">=1.4.0,<1.5.0", markers = "python_version < \"3.8\""} typing-extensions = ">=3.7.4" [package.extras] dmypy = ["psutil (>=4.0)"] +python2 = ["typed-ast (>=1.4.0,<1.5.0)"] [[package]] name = "mypy-extensions" @@ -998,7 +1000,7 @@ python-versions = "*" [[package]] name = "pywinpty" -version = "1.1.1" +version = "1.1.2" description = "Pseudo terminal support for Windows from Python." category = "dev" optional = false @@ -1244,7 +1246,7 @@ test = ["pytest"] [[package]] name = "terminado" -version = "0.10.0" +version = "0.10.1" description = "Tornado websocket backend for the Xterm.js Javascript terminal emulator library." category = "dev" optional = false @@ -1269,6 +1271,14 @@ python-versions = ">= 3.5" [package.extras] test = ["pytest", "pathlib2"] +[[package]] +name = "toml" +version = "0.10.2" +description = "Python Library for Tom's Obvious, Minimal Language" +category = "dev" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" + [[package]] name = "tornado" version = "6.1" @@ -1301,6 +1311,78 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "types-click" +version = "7.1.2" +description = "Typing stubs for click" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "types-flask" +version = "1.1.1" +description = "Typing stubs for Flask" +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +types-click = "*" +types-Jinja2 = "*" +types-Werkzeug = "*" + +[[package]] +name = "types-jinja2" +version = "2.11.2" +description = "Typing stubs for Jinja2" +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +types-MarkupSafe = "*" + +[[package]] +name = "types-markupsafe" +version = "1.1.3" +description = "Typing stubs for MarkupSafe" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "types-python-dateutil" +version = "0.1.4" +description = "Typing stubs for python-dateutil" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "types-redis" +version = "3.5.4" +description = "Typing stubs for redis" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "types-requests" +version = "2.25.0" +description = "Typing stubs for requests" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "types-werkzeug" +version = "1.0.2" +description = "Typing stubs for Werkzeug" +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "typing-extensions" version = "3.10.0.0" @@ -1408,7 +1490,7 @@ virustotal = ["validators"] [metadata] lock-version = "1.1" python-versions = "^3.6" -content-hash = "d2c9a68576f9c03bd98d430bc4674b33a04782f964be058d9b1e68d1e32cb631" +content-hash = "4cc1c8ebc08e7367f8281313c8d6f2822fa605fb5306efadc6c0484ce7ebb254" [metadata.files] alabaster = [ @@ -1820,28 +1902,29 @@ msoffcrypto-tool = [ {file = "msoffcrypto_tool-4.12.0-py2.py3-none-any.whl", hash = "sha256:234f85ef59945fa1ebb618ca029f31f0cb43a637344dbda5c1bb8578b2d96a68"}, ] mypy = [ - {file = "mypy-0.812-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:a26f8ec704e5a7423c8824d425086705e381b4f1dfdef6e3a1edab7ba174ec49"}, - {file = "mypy-0.812-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:28fb5479c494b1bab244620685e2eb3c3f988d71fd5d64cc753195e8ed53df7c"}, - {file = "mypy-0.812-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:9743c91088d396c1a5a3c9978354b61b0382b4e3c440ce83cf77994a43e8c521"}, - {file = "mypy-0.812-cp35-cp35m-win_amd64.whl", hash = "sha256:d7da2e1d5f558c37d6e8c1246f1aec1e7349e4913d8fb3cb289a35de573fe2eb"}, - {file = "mypy-0.812-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:4eec37370483331d13514c3f55f446fc5248d6373e7029a29ecb7b7494851e7a"}, - {file = "mypy-0.812-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d65cc1df038ef55a99e617431f0553cd77763869eebdf9042403e16089fe746c"}, - {file = "mypy-0.812-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:61a3d5b97955422964be6b3baf05ff2ce7f26f52c85dd88db11d5e03e146a3a6"}, - {file = "mypy-0.812-cp36-cp36m-win_amd64.whl", hash = "sha256:25adde9b862f8f9aac9d2d11971f226bd4c8fbaa89fb76bdadb267ef22d10064"}, - {file = "mypy-0.812-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:552a815579aa1e995f39fd05dde6cd378e191b063f031f2acfe73ce9fb7f9e56"}, - {file = "mypy-0.812-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:499c798053cdebcaa916eef8cd733e5584b5909f789de856b482cd7d069bdad8"}, - {file = "mypy-0.812-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:5873888fff1c7cf5b71efbe80e0e73153fe9212fafdf8e44adfe4c20ec9f82d7"}, - {file = "mypy-0.812-cp37-cp37m-win_amd64.whl", hash = "sha256:9f94aac67a2045ec719ffe6111df543bac7874cee01f41928f6969756e030564"}, - {file = "mypy-0.812-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d23e0ea196702d918b60c8288561e722bf437d82cb7ef2edcd98cfa38905d506"}, - {file = "mypy-0.812-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:674e822aa665b9fd75130c6c5f5ed9564a38c6cea6a6432ce47eafb68ee578c5"}, - {file = "mypy-0.812-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:abf7e0c3cf117c44d9285cc6128856106183938c68fd4944763003decdcfeb66"}, - {file = "mypy-0.812-cp38-cp38-win_amd64.whl", hash = "sha256:0d0a87c0e7e3a9becdfbe936c981d32e5ee0ccda3e0f07e1ef2c3d1a817cf73e"}, - {file = "mypy-0.812-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7ce3175801d0ae5fdfa79b4f0cfed08807af4d075b402b7e294e6aa72af9aa2a"}, - {file = "mypy-0.812-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:b09669bcda124e83708f34a94606e01b614fa71931d356c1f1a5297ba11f110a"}, - {file = "mypy-0.812-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:33f159443db0829d16f0a8d83d94df3109bb6dd801975fe86bacb9bf71628e97"}, - {file = "mypy-0.812-cp39-cp39-win_amd64.whl", hash = "sha256:3f2aca7f68580dc2508289c729bd49ee929a436208d2b2b6aab15745a70a57df"}, - {file = "mypy-0.812-py3-none-any.whl", hash = "sha256:2f9b3407c58347a452fc0736861593e105139b905cca7d097e413453a1d650b4"}, - {file = "mypy-0.812.tar.gz", hash = "sha256:cd07039aa5df222037005b08fbbfd69b3ab0b0bd7a07d7906de75ae52c4e3119"}, + {file = "mypy-0.902-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:3f12705eabdd274b98f676e3e5a89f247ea86dc1af48a2d5a2b080abac4e1243"}, + {file = "mypy-0.902-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:2f9fedc1f186697fda191e634ac1d02f03d4c260212ccb018fabbb6d4b03eee8"}, + {file = "mypy-0.902-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:0756529da2dd4d53d26096b7969ce0a47997123261a5432b48cc6848a2cb0bd4"}, + {file = "mypy-0.902-cp35-cp35m-win_amd64.whl", hash = "sha256:68a098c104ae2b75e946b107ef69dd8398d54cb52ad57580dfb9fc78f7f997f0"}, + {file = "mypy-0.902-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:cd01c599cf9f897b6b6c6b5d8b182557fb7d99326bcdf5d449a0fbbb4ccee4b9"}, + {file = "mypy-0.902-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:e89880168c67cf4fde4506b80ee42f1537ad66ad366c101d388b3fd7d7ce2afd"}, + {file = "mypy-0.902-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:ebe2bc9cb638475f5d39068d2dbe8ae1d605bb8d8d3ff281c695df1670ab3987"}, + {file = "mypy-0.902-cp36-cp36m-win_amd64.whl", hash = "sha256:f89bfda7f0f66b789792ab64ce0978e4a991a0e4dd6197349d0767b0f1095b21"}, + {file = "mypy-0.902-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:746e0b0101b8efec34902810047f26a8c80e1efbb4fc554956d848c05ef85d76"}, + {file = "mypy-0.902-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:0190fb77e93ce971954c9e54ea61de2802065174e5e990c9d4c1d0f54fbeeca2"}, + {file = "mypy-0.902-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:b5dfcd22c6bab08dfeded8d5b44bdcb68c6f1ab261861e35c470b89074f78a70"}, + {file = "mypy-0.902-cp37-cp37m-win_amd64.whl", hash = "sha256:b5ba1f0d5f9087e03bf5958c28d421a03a4c1ad260bf81556195dffeccd979c4"}, + {file = "mypy-0.902-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9ef5355eaaf7a23ab157c21a44c614365238a7bdb3552ec3b80c393697d974e1"}, + {file = "mypy-0.902-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:517e7528d1be7e187a5db7f0a3e479747307c1b897d9706b1c662014faba3116"}, + {file = "mypy-0.902-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:fd634bc17b1e2d6ce716f0e43446d0d61cdadb1efcad5c56ca211c22b246ebc8"}, + {file = "mypy-0.902-cp38-cp38-win_amd64.whl", hash = "sha256:fc4d63da57ef0e8cd4ab45131f3fe5c286ce7dd7f032650d0fbc239c6190e167"}, + {file = "mypy-0.902-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:353aac2ce41ddeaf7599f1c73fed2b75750bef3b44b6ad12985a991bc002a0da"}, + {file = "mypy-0.902-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ae94c31bb556ddb2310e4f913b706696ccbd43c62d3331cd3511caef466871d2"}, + {file = "mypy-0.902-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:8be7bbd091886bde9fcafed8dd089a766fa76eb223135fe5c9e9798f78023a20"}, + {file = "mypy-0.902-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:4efc67b9b3e2fddbe395700f91d5b8deb5980bfaaccb77b306310bd0b9e002eb"}, + {file = "mypy-0.902-cp39-cp39-win_amd64.whl", hash = "sha256:9f1d74eeb3f58c7bd3f3f92b8f63cb1678466a55e2c4612bf36909105d0724ab"}, + {file = "mypy-0.902-py3-none-any.whl", hash = "sha256:a26d0e53e90815c765f91966442775cf03b8a7514a4e960de7b5320208b07269"}, + {file = "mypy-0.902.tar.gz", hash = "sha256:9236c21194fde5df1b4d8ebc2ef2c1f2a5dc7f18bcbea54274937cae2e20a01c"}, ] mypy-extensions = [ {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, @@ -2008,11 +2091,11 @@ pywin32 = [ {file = "pywin32-301-cp39-cp39-win_amd64.whl", hash = "sha256:87604a4087434cd814ad8973bd47d6524bd1fa9e971ce428e76b62a5e0860fdf"}, ] pywinpty = [ - {file = "pywinpty-1.1.1-cp36-none-win_amd64.whl", hash = "sha256:fa2a0af28eaaacc59227c6edbc0f1525704d68b2dfa3e5b47ae21c5aa25d6d78"}, - {file = "pywinpty-1.1.1-cp37-none-win_amd64.whl", hash = "sha256:0fe3f538860c6b06e6fbe63da0ee5dab5194746b0df1be7ed65b4fce5da21d21"}, - {file = "pywinpty-1.1.1-cp38-none-win_amd64.whl", hash = "sha256:12c89765b3102d2eea3d39d191d1b0baea68fb5e3bd094c67b2575b3c9ebfa12"}, - {file = "pywinpty-1.1.1-cp39-none-win_amd64.whl", hash = "sha256:50bce6f7d9857ffe9694847af7e8bf989b198d0ebc2bf30e26d54c4622cb5c50"}, - {file = "pywinpty-1.1.1.tar.gz", hash = "sha256:4a3ffa2444daf15c5f65a76b5b2864447cc915564e41e2876816b9e4fe849070"}, + {file = "pywinpty-1.1.2-cp36-none-win_amd64.whl", hash = "sha256:7bb1b8380bc71bf04a983e803746b1ea7b8a91765723a82e108df81538b258c1"}, + {file = "pywinpty-1.1.2-cp37-none-win_amd64.whl", hash = "sha256:951f1b988c2407e9bd0c5c9b199f588673769abf0c8cb4724a01bc0666b97b0a"}, + {file = "pywinpty-1.1.2-cp38-none-win_amd64.whl", hash = "sha256:b3a38a0afb63b639ca4f78f67f4f8caa78ca470bd71b146480ef37d86cc99823"}, + {file = "pywinpty-1.1.2-cp39-none-win_amd64.whl", hash = "sha256:eac78a3ff69ce443ad9f67620bc60469f6354b18388570c63af6fc643beae498"}, + {file = "pywinpty-1.1.2.tar.gz", hash = "sha256:f1718838e1c7c700e5f0b79d5d5e05243ff583313ff88e47bb94318ba303e565"}, ] pyzmq = [ {file = "pyzmq-22.1.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:4e9b9a2f6944acdaf57316436c1acdcb30b8df76726bcf570ad9342bc5001654"}, @@ -2144,13 +2227,17 @@ sphinxcontrib-serializinghtml = [ {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] terminado = [ - {file = "terminado-0.10.0-py3-none-any.whl", hash = "sha256:048ce7b271ad1f94c48130844af1de163e54913b919f8c268c89b36a6d468d7c"}, - {file = "terminado-0.10.0.tar.gz", hash = "sha256:46fd07c9dc7db7321922270d544a1f18eaa7a02fd6cd4438314f27a687cabbea"}, + {file = "terminado-0.10.1-py3-none-any.whl", hash = "sha256:c89ace5bffd0e7268bdcf22526830eb787fd146ff9d78691a0528386f92b9ae3"}, + {file = "terminado-0.10.1.tar.gz", hash = "sha256:89d5dac2f4e2b39758a0ff9a3b643707c95a020a6df36e70583b88297cd59cbe"}, ] testpath = [ {file = "testpath-0.5.0-py3-none-any.whl", hash = "sha256:8044f9a0bab6567fc644a3593164e872543bb44225b0e24846e2c89237937589"}, {file = "testpath-0.5.0.tar.gz", hash = "sha256:1acf7a0bcd3004ae8357409fc33751e16d37ccc650921da1094a86581ad1e417"}, ] +toml = [ + {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, + {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, +] tornado = [ {file = "tornado-6.1-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:d371e811d6b156d82aa5f9a4e08b58debf97c302a35714f6f45e35139c332e32"}, {file = "tornado-6.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:0d321a39c36e5f2c4ff12b4ed58d41390460f798422c4504e09eb5678e09998c"}, @@ -2230,6 +2317,38 @@ typed-ast = [ {file = "typed_ast-1.4.3-cp39-cp39-win_amd64.whl", hash = "sha256:9c6d1a54552b5330bc657b7ef0eae25d00ba7ffe85d9ea8ae6540d2197a3788c"}, {file = "typed_ast-1.4.3.tar.gz", hash = "sha256:fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65"}, ] +types-click = [ + {file = "types-click-7.1.2.tar.gz", hash = "sha256:040897284e4f9466825c3865f708a985a8e7ba4d8e22cb9198ffb7b522160850"}, + {file = "types_click-7.1.2-py2.py3-none-any.whl", hash = "sha256:4722746f1ec9fd3fc8b1d7fb8c840604dc22f9e32bcc7a31a36d6d85cc2bce24"}, +] +types-flask = [ + {file = "types-Flask-1.1.1.tar.gz", hash = "sha256:90afe8bd050cf8830cdc620bb9aa4471836b86af88e4d33fccc8789242a661e2"}, + {file = "types_Flask-1.1.1-py2.py3-none-any.whl", hash = "sha256:4885fd9c64756b0901d3de0a197d0ede60df114d0fbab500aa1bd73bb2c1651c"}, +] +types-jinja2 = [ + {file = "types-Jinja2-2.11.2.tar.gz", hash = "sha256:5b53d2b8bc6dd6dfbc0ae3e33e346fbe343cbeba1ed528858749e2a2ffe0e143"}, + {file = "types_Jinja2-2.11.2-py2.py3-none-any.whl", hash = "sha256:d27e112a8add449407de235f4533239149056327c8bddc6b0d6bf80cd7280c16"}, +] +types-markupsafe = [ + {file = "types-MarkupSafe-1.1.3.tar.gz", hash = "sha256:be8975ba91bd7e672f6f57753ca7ba2979ad9b6687a0e93dd2055926f8c71b0b"}, + {file = "types_MarkupSafe-1.1.3-py2.py3-none-any.whl", hash = "sha256:b1893d090c72204110c232d9b964d2612e15deff738bb75360030473a45cbc0e"}, +] +types-python-dateutil = [ + {file = "types-python-dateutil-0.1.4.tar.gz", hash = "sha256:e6486ca27b6dde73e0ec079a9e1b03e208766e6bc7f1e08964a7e9104a5c7d7a"}, + {file = "types_python_dateutil-0.1.4-py2.py3-none-any.whl", hash = "sha256:39bfe0bde61fc673b8fa28167bd78622d976210f791971b9f3e10877cbf119a4"}, +] +types-redis = [ + {file = "types-redis-3.5.4.tar.gz", hash = "sha256:936e98f9090c11610f4f5171d2ca8fa5c5eab842422b3cc2f9355f57d01e1a6b"}, + {file = "types_redis-3.5.4-py3-none-any.whl", hash = "sha256:954feb1f573216b215c1d564c1b27091a7ce8b7fd3af9474d9e88d4081881aff"}, +] +types-requests = [ + {file = "types-requests-2.25.0.tar.gz", hash = "sha256:ee0d0c507210141b7d5b8639cc43eaa726084178775db2a5fb06fbf85c185808"}, + {file = "types_requests-2.25.0-py3-none-any.whl", hash = "sha256:fa5c1e5e832ff6193507d8da7e1159281383908ee193a2f4b37bc08140b51844"}, +] +types-werkzeug = [ + {file = "types-Werkzeug-1.0.2.tar.gz", hash = "sha256:7f6d4c8771a67d44e83134d56e59b482bf81ebd28e6557015fdfcc81e3d11b53"}, + {file = "types_Werkzeug-1.0.2-py2.py3-none-any.whl", hash = "sha256:1a4e551955e6fc608cf6b93a2749963b9cce5ff56cddfc90404af1c919afa937"}, +] typing-extensions = [ {file = "typing_extensions-3.10.0.0-py2-none-any.whl", hash = "sha256:0ac0f89795dd19de6b97debb0c6af1c70987fd80a2d62d1958f7e56fcc31b497"}, {file = "typing_extensions-3.10.0.0-py3-none-any.whl", hash = "sha256:779383f6086d90c99ae41cf0ff39aac8a7937a9283ce0a414e5dd782f4c94a84"}, diff --git a/pymisp/data/misp-objects b/pymisp/data/misp-objects index fca66dd..484a7b7 160000 --- a/pymisp/data/misp-objects +++ b/pymisp/data/misp-objects @@ -1 +1 @@ -Subproject commit fca66ddd7d955968a76b1bf485671084ff765658 +Subproject commit 484a7b7c278f01cf5a7061b9e07978c3b6f6fed9 diff --git a/pyproject.toml b/pyproject.toml index 335390c..ce63a7a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,11 +76,23 @@ nose = "^1.3.7" coveralls = "^3.0.1" codecov = "^2.1.11" requests-mock = "^1.8.0" -mypy = "^0.812" +mypy = "^0.902" flake8 = "^3.9.0" ipython = "^7.16.1" jupyterlab = "^2.3.1" +types-requests = "^2.25.0" +types-python-dateutil = "^0.1.4" +types-redis = "^3.5.4" +types-Flask = "^1.1.1" [build-system] requires = ["poetry_core>=1.0", "setuptools"] build-backend = "poetry.core.masonry.api" + +[tool.mypy] +show_error_context = true +pretty = true + +[[tool.mypy.overrides]] +module = ["pymisp.data", "pymisp.data.*", "docs.source.*", "examples", "examples.*.*"] +ignore_errors = true diff --git a/setup.py b/setup.py index 61f31f4..f8b77d8 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- from os import path -from setuptools import setup +from setuptools import setup # type: ignore import pymisp