chg: Bump deps

Author: Rafiot

.pre-commit-config.yaml

@@ -3,14 +3,14 @@
 exclude: "tests/data"
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: check-added-large-files
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.17.0
+    rev: v3.20.0
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]

poetry.lock

@@ -383,7 +383,7 @@ def __init__(self, **kwargs) -> None:  # type: ignore[no-untyped-def]
 
     def from_dict(self, **kwargs) -> None:  # type: ignore[no-untyped-def]
         if kwargs.get('Tag'):
-            kwargs = kwargs.get('Tag')  # type: ignore[assignment]
+            kwargs = kwargs.get('Tag')
         super().from_dict(**kwargs)
 
     def _set_default(self) -> None:

pymisp/abstract.py

@@ -129,10 +129,10 @@ def brotli_supported() -> bool:
     # urllib >= 1.25.1 includes brotli support
     version_splitted = version('urllib3').split('.')  # noqa: F811
     if len(version_splitted) == 2:
-        major, minor = version_splitted  # type: ignore
+        major, minor = version_splitted
         patch = 0
     else:
-        major, minor, patch = version_splitted  # type: ignore
+        major, minor, patch = version_splitted
     major, minor, patch = int(major), int(minor), int(patch)
     urllib3_with_brotli = (major == 1 and ((minor == 25 and patch >= 1) or (minor >= 26))) or major >= 2
 
@@ -1050,7 +1050,7 @@ def add_attribute(self, event: MISPEvent | int | str | UUID, attribute: MISPAttr
             # At this point, we assume the user tried to add an attribute on an event they don't own
             # Re-try with a proposal
             if isinstance(attribute, (MISPAttribute, dict)):
-                return self.add_attribute_proposal(event_id, attribute, pythonify)  # type: ignore
+                return self.add_attribute_proposal(event_id, attribute, pythonify)
         if not (self.global_pythonify or pythonify) or 'errors' in new_attribute:
             return new_attribute
         a = MISPAttribute()
@@ -1563,7 +1563,7 @@ def toggle_warninglist(self, warninglist_id: str | int | list[int] | None = None
             if isinstance(warninglist_id, list):
                 query['id'] = warninglist_id
             else:
-                query['id'] = [warninglist_id]  # type: ignore
+                query['id'] = [warninglist_id]
         if warninglist_name is not None:
             if isinstance(warninglist_name, list):
                 query['name'] = warninglist_name
@@ -3032,7 +3032,7 @@ def search(self, controller: str = 'events', return_format: str = 'json',  # typ
         if return_format == 'csv':
             normalized_response_text = self._check_response(response)
             if (self.global_pythonify or pythonify) and not headerless:
-                return self._csv_to_dict(normalized_response_text)  # type: ignore
+                return self._csv_to_dict(normalized_response_text)
             else:
                 return normalized_response_text
         elif return_format not in ['json', 'yara-json']:
@@ -3060,7 +3060,7 @@ def search(self, controller: str = 'events', return_format: str = 'json',  # typ
                     to_return.append(me)
             elif controller == 'attributes':
                 # FIXME: obvs, this is hurting my soul. We need something generic.
-                for a in normalized_response['Attribute']:  # type: ignore[call-overload]
+                for a in normalized_response['Attribute']:
                     ma = MISPAttribute()
                     ma.from_dict(**a)
                     if 'Event' in ma:

pymisp/api.py

@@ -126,7 +126,7 @@ def _make_datetime(value: int | float | str | datetime | date) -> datetime:
             # faster
             value = datetime.fromisoformat(value)
         except Exception:
-            value = parse(value)  # type: ignore[arg-type]
+            value = parse(value)
     elif isinstance(value, datetime):
         pass
     elif isinstance(value, date):  # NOTE: date has to be *after* datetime, or it will be overwritten
@@ -399,7 +399,7 @@ def _prepare_data(self, data: Path | str | bytes | BytesIO | None) -> None:
         if self.type == 'malware-sample':
             try:
                 # Ignore type, if data is None -> exception
-                with ZipFile(self.data) as f:  # type: ignore
+                with ZipFile(self.data) as f:
                     if not self.__is_misp_encrypted_file(f):
                         raise PyMISPError('Not an existing malware sample')
                     for name in f.namelist():
@@ -488,7 +488,7 @@ def malware_binary(self) -> BytesIO | None:
             return self._malware_binary
         elif hasattr(self, 'malware_filename'):
             # Have a binary, but didn't decrypt it yet
-            with ZipFile(self.data) as f:  # type: ignore
+            with ZipFile(self.data) as f:
                 for name in f.namelist():
                     if not name.endswith('.filename.txt'):
                         with f.open(name, pwd=b'infected') as unpacked:
@@ -1871,7 +1871,7 @@ def set_date(self, d: str | int | float | datetime | date | None = None, ignore_
         :param ignore_invalid: if True, assigns current date if d is not an expected type
         """
         if isinstance(d, (str, int, float, datetime, date)):
-            self.date = d  # type: ignore
+            self.date = d
         elif ignore_invalid:
             self.date = date.today()
         else:
@@ -1938,7 +1938,7 @@ def from_dict(self, **kwargs) -> None:  # type: ignore[no-untyped-def]
             for rel_event in kwargs.pop('RelatedEvent'):
                 sub_event = MISPEvent()
                 sub_event.load(rel_event)
-                self.RelatedEvent.append({'Event': sub_event})  # type: ignore[arg-type]
+                self.RelatedEvent.append({'Event': sub_event})
         if kwargs.get('Tag'):
             [self.add_tag(tag) for tag in kwargs.pop('Tag')]
         if kwargs.get('Object'):

pymisp/mispevent.py

@@ -10,7 +10,7 @@
 from email.message import EmailMessage
 from io import BytesIO
 from pathlib import Path
-from typing import cast, Any
+from typing import Any
 
 from extract_msg import openMsg
 from extract_msg.msg_classes import MessageBase
@@ -50,7 +50,6 @@ def parse_email(self) -> EmailMessage:
         eml = message_from_bytes(content_in_bytes,
                                  _class=EmailMessage,
                                  policy=policy.default)
-        eml = cast(EmailMessage, eml)  # Only needed to quiet mypy
         if len(eml) != 0:
             self.raw_emails['eml'] = self.__pseudofile
             return eml
@@ -73,7 +72,6 @@ def parse_email(self) -> EmailMessage:
                 eml_bytes = content_in_bytes.decode("utf_8_sig").encode("utf-8")
                 eml = email.message_from_bytes(eml_bytes,
                                                policy=policy.default)
-                eml = cast(EmailMessage, eml)  # Only needed to quiet mypy
                 if len(eml) != 0:
                     self.raw_emails['eml'] = BytesIO(eml_bytes)
                     return eml
@@ -99,15 +97,15 @@ def create_pseudofile(filepath: Path | str | None = None,
     def _msg_to_eml(self, msg_bytes: bytes) -> EmailMessage:
         """Converts a msg into an eml."""
         # NOTE: openMsg returns a MessageBase, not a MSGFile
-        msg_obj: MessageBase = openMsg(msg_bytes)  # type: ignore
+        msg_obj: MessageBase = openMsg(msg_bytes)
         # msg obj stores the original raw header here
         message, body, attachments = self._extract_msg_objects(msg_obj)
         eml = self._build_eml(message, body, attachments)
         return eml
 
     def _extract_msg_objects(self, msg_obj: MessageBase) -> tuple[EmailMessage, dict[str, Any], list[AttachmentBase] | list[SignedAttachment]]:
         """Extracts email objects needed to construct an eml from a msg."""
-        message: EmailMessage = email.message_from_string(msg_obj.header.as_string(), policy=policy.default)  # type: ignore
+        message: EmailMessage = email.message_from_string(msg_obj.header.as_string(), policy=policy.default)
         body = {}
         if msg_obj.body is not None:
             body['text'] = {"obj": msg_obj.body,

pymisp/tools/emailobject.py

@@ -202,7 +202,7 @@ def generate_attributes(self) -> None:
         self.add_attribute('digest_algorithm', value=str(self.__signer.digest_algorithm))
         self.add_attribute('encryption_algorithm', value=str(self.__signer.encryption_algorithm))
         self.add_attribute('digest-base64', value=b64encode(self.__signer.encrypted_digest))
-        info: lief.PE.SpcSpOpusInfo = self.__signer.get_attribute(lief.PE.Attribute.TYPE.SPC_SP_OPUS_INFO)  # type: ignore[assignment]
+        info: lief.PE.SpcSpOpusInfo = self.__signer.get_attribute(lief.PE.Attribute.TYPE.SPC_SP_OPUS_INFO)
         if info:
             self.add_attribute('program-name', value=info.program_name)
             self.add_attribute('url', value=info.more_info)

pymisp/tools/peobject.py

@@ -12,7 +12,7 @@ requires-python = ">=3.9.2,<4.0"
 dynamic = [ "classifiers" ]
 
 dependencies = [
-    "requests (>=2.32.3)",
+    "requests (>=2.32.4)",
     "python-dateutil (>=2.9.0.post0)",
     "deprecated (>=1.2.18)"
 ]
@@ -27,7 +27,7 @@ documentation = "https://pymisp.readthedocs.io"
 fileobjects = [
     "python-magic (>=0.4.27)",
     "pydeep2 (>=0.5.1)",
-    "lief (>=0.16.5)"
+    "lief (>=0.16.6)"
 ]
 
 openioc = [ "beautifulsoup4 (>=4.13.4)" ]
@@ -41,7 +41,7 @@ docs = [
     "myst-parser (>=4.0.1) ; python_version >= \"3.11\""
 ]
 
-pdfexport = [ "reportlab (>=4.4.0)" ]
+pdfexport = [ "reportlab (>=4.4.1)" ]
 
 url = [ "pyfaup (>=1.2)" ]
 
@@ -80,9 +80,9 @@ include = [
 
 [tool.poetry.group.dev.dependencies]
 requests-mock = "^1.12.1"
-mypy = "^1.15.0"
-types-requests = "^2.32.0.20250328"
-types-python-dateutil = "^2.9.0.20241206"
+mypy = "^1.16.0"
+types-requests = "^2.32.0.20250602"
+types-python-dateutil = "^2.9.0.20250516"
 types-redis = "^4.6.0.20241004"
 types-Flask = "^1.1.6"
 pytest-cov = "^6.1.1"

pyproject.toml

@@ -80,9 +80,9 @@ def test_event_galaxy(self) -> None:
 
     def test_attribute(self) -> None:
         self.init_event()
-        a: MISPAttribute = self.mispevent.add_attribute('filename', 'bar.exe')  # type: ignore[assignment]
+        a: MISPAttribute = self.mispevent.add_attribute('filename', 'bar.exe')
         del a.uuid
-        a = self.mispevent.add_attribute_tag('osint', 'bar.exe')  # type: ignore[assignment]
+        a = self.mispevent.add_attribute_tag('osint', 'bar.exe')
         attr_tags = self.mispevent.get_attribute_tag('bar.exe')
         self.assertEqual(self.mispevent.attributes[0].tags[0].name, 'osint')
         self.assertEqual(attr_tags[0].name, 'osint')
@@ -123,17 +123,17 @@ def test_to_dict_json_format(self) -> None:
 
     def test_object_tag(self) -> None:
         self.mispevent.add_object(name='file', strict=True)
-        a: MISPAttribute = self.mispevent.objects[0].add_attribute('filename', value='')  # type: ignore[assignment]
+        a: MISPAttribute = self.mispevent.objects[0].add_attribute('filename', value='')
         self.assertEqual(a, None)
-        a = self.mispevent.objects[0].add_attribute('filename', value=None)  # type: ignore[assignment]
+        a = self.mispevent.objects[0].add_attribute('filename', value=None)
         self.assertEqual(a, None)
-        a = self.mispevent.objects[0].add_attribute('filename', value='bar', Tag=[{'name': 'blah'}])  # type: ignore[assignment]
+        a = self.mispevent.objects[0].add_attribute('filename', value='bar', Tag=[{'name': 'blah'}])
         del a.uuid
         self.assertEqual(self.mispevent.objects[0].attributes[0].tags[0].name, 'blah')
         self.assertTrue(self.mispevent.objects[0].has_attributes_by_relation(['filename']))
         self.assertEqual(len(self.mispevent.objects[0].get_attributes_by_relation('filename')), 1)
         self.mispevent.add_object(name='url', strict=True)
-        a = self.mispevent.objects[1].add_attribute('url', value='https://www.circl.lu')  # type: ignore[assignment]
+        a = self.mispevent.objects[1].add_attribute('url', value='https://www.circl.lu')
         del a.uuid
         self.mispevent.objects[0].uuid = 'a'
         self.mispevent.objects[1].uuid = 'b'
@@ -175,7 +175,7 @@ def test_malware(self) -> None:
         with open('tests/mispevent_testfiles/simple.json', 'rb') as f:
             pseudofile = BytesIO(f.read())
         self.init_event()
-        a: MISPAttribute = self.mispevent.add_attribute('malware-sample', 'bar.exe', data=pseudofile)  # type: ignore[assignment]
+        a: MISPAttribute = self.mispevent.add_attribute('malware-sample', 'bar.exe', data=pseudofile)
         del a.uuid
         attribute = self.mispevent.attributes[0]
         self.assertEqual(attribute.malware_binary, pseudofile)
@@ -217,7 +217,7 @@ def test_shadow_attributes(self) -> None:
         self.init_event()
         p = self.mispevent.add_proposal(type='filename', value='baz.jpg')
         del p.uuid
-        a: MISPAttribute = self.mispevent.add_attribute('filename', 'bar.exe')  # type: ignore[assignment]
+        a: MISPAttribute = self.mispevent.add_attribute('filename', 'bar.exe')
         del a.uuid
         p = self.mispevent.attributes[0].add_proposal(type='filename', value='bar.pdf')
         del p.uuid
@@ -227,13 +227,13 @@ def test_shadow_attributes(self) -> None:
 
     def test_default_attributes(self) -> None:
         self.mispevent.add_object(name='file', strict=True)
-        a: MISPAttribute = self.mispevent.objects[0].add_attribute('filename', value='bar', Tag=[{'name': 'blah'}])  # type: ignore[assignment]
+        a: MISPAttribute = self.mispevent.objects[0].add_attribute('filename', value='bar', Tag=[{'name': 'blah'}])
         del a.uuid
-        a = self.mispevent.objects[0].add_attribute('pattern-in-file', value='baz')  # type: ignore[assignment]
+        a = self.mispevent.objects[0].add_attribute('pattern-in-file', value='baz')
         self.assertEqual(a.category, 'Artifacts dropped')
         del a.uuid
         self.mispevent.add_object(name='file', strict=False, default_attributes_parameters=self.mispevent.objects[0].attributes[0])
-        a = self.mispevent.objects[1].add_attribute('filename', value='baz')  # type: ignore[assignment]
+        a = self.mispevent.objects[1].add_attribute('filename', value='baz')
         del a.uuid
         self.mispevent.objects[0].uuid = 'a'
         self.mispevent.objects[1].uuid = 'b'
@@ -245,13 +245,13 @@ def test_default_attributes(self) -> None:
     def test_obj_default_values(self) -> None:
         self.init_event()
         self.mispevent.add_object(name='whois', strict=True)
-        a: MISPAttribute = self.mispevent.objects[0].add_attribute('registrar', value='registar.example.com')  # type: ignore[assignment]
+        a: MISPAttribute = self.mispevent.objects[0].add_attribute('registrar', value='registar.example.com')
         del a.uuid
-        a = self.mispevent.objects[0].add_attribute('domain', value='domain.example.com')  # type: ignore[assignment]
+        a = self.mispevent.objects[0].add_attribute('domain', value='domain.example.com')
         del a.uuid
-        a = self.mispevent.objects[0].add_attribute('nameserver', value='ns1.example.com')  # type: ignore[assignment]
+        a = self.mispevent.objects[0].add_attribute('nameserver', value='ns1.example.com')
         del a.uuid
-        a = self.mispevent.objects[0].add_attribute('nameserver', value='ns2.example.com', disable_correlation=False, to_ids=True, category='External analysis')  # type: ignore[assignment]
+        a = self.mispevent.objects[0].add_attribute('nameserver', value='ns2.example.com', disable_correlation=False, to_ids=True, category='External analysis')
         del a.uuid
         self.mispevent.objects[0].uuid = 'a'
         with open('tests/mispevent_testfiles/def_param.json') as f:
@@ -353,16 +353,16 @@ def test_userdefined_object_custom_template(self) -> None:
             self.mispevent.to_json(sort_keys=True, indent=2)
         self.assertEqual(e.exception.message, '{\'member3\'} are required.')
 
-        a: MISPAttribute = self.mispevent.objects[0].add_attribute('member3', value='foo')  # type: ignore[assignment]
+        a: MISPAttribute = self.mispevent.objects[0].add_attribute('member3', value='foo')
         del a.uuid
         with self.assertRaises(InvalidMISPObject) as e:
             # Fail on requiredOneOf
             self.mispevent.to_json(sort_keys=True, indent=2)
         self.assertEqual(e.exception.message, 'At least one of the following attributes is required: member1, member2')
 
-        a = self.mispevent.objects[0].add_attribute('member1', value='bar')  # type: ignore[assignment]
+        a = self.mispevent.objects[0].add_attribute('member1', value='bar')
         del a.uuid
-        a = self.mispevent.objects[0].add_attribute('member1', value='baz')  # type: ignore[assignment]
+        a = self.mispevent.objects[0].add_attribute('member1', value='baz')
         del a.uuid
         with self.assertRaises(InvalidMISPObject) as e:
             # member1 is not a multiple
@@ -384,16 +384,16 @@ def test_userdefined_object_custom_dir(self) -> None:
             self.mispevent.to_json(sort_keys=True, indent=2)
         self.assertEqual(e.exception.message, '{\'member3\'} are required.')
 
-        a: MISPAttribute = self.mispevent.objects[0].add_attribute('member3', value='foo')  # type: ignore[assignment]
+        a: MISPAttribute = self.mispevent.objects[0].add_attribute('member3', value='foo')
         del a.uuid
         with self.assertRaises(InvalidMISPObject) as e:
             # Fail on requiredOneOf
             self.mispevent.to_json(sort_keys=True, indent=2)
         self.assertEqual(e.exception.message, 'At least one of the following attributes is required: member1, member2')
 
-        a = self.mispevent.objects[0].add_attribute('member1', value='bar')  # type: ignore[assignment]
+        a = self.mispevent.objects[0].add_attribute('member1', value='bar')
         del a.uuid
-        a = self.mispevent.objects[0].add_attribute('member1', value='baz')  # type: ignore[assignment]
+        a = self.mispevent.objects[0].add_attribute('member1', value='baz')
         del a.uuid
         with self.assertRaises(InvalidMISPObject) as e:
             # member1 is not a multiple
@@ -410,15 +410,15 @@ def test_userdefined_object_custom_dir(self) -> None:
     def test_first_last_seen(self) -> None:
         me = MISPEvent()
         me.info = 'Test First and Last Seen'
-        me.date = '2020.01.12'  # type: ignore[assignment]
+        me.date = '2020.01.12'
         self.assertEqual(me.date.day, 12)
         me.add_attribute('ip-dst', '8.8.8.8', first_seen='06-21-1998', last_seen=1580213607.469571)
         self.assertEqual(me.attributes[0].first_seen.year, 1998)
         self.assertEqual(me.attributes[0].last_seen.year, 2020)
         now = datetime.now().astimezone()
         me.attributes[0].last_seen = now
         today = date.today()
-        me.attributes[0].first_seen = today  # type: ignore[assignment]
+        me.attributes[0].first_seen = today
         self.assertEqual(me.attributes[0].first_seen.year, today.year)
         self.assertEqual(me.attributes[0].last_seen, now)