fix: combines multiple fixes

* datetime.utcnow is deprecated, change to datetime.now(timezone.utc)

* arrow.utcnow() not necessary datetime.now(timezone.utc) does the same

* Draft4Validator, API changed, required needs to be a function now

* pytest-black -> pytest-black-ng former unsupported

* catch expected deprecation warnings to not pop up in logs and to make
  it more predictable after removing the deprecation warnings from the
  code

* the datetime has already set the tz_info. pytz is not necessary
  anymore

.github/workflows/tests.yml

@@ -47,7 +47,7 @@ jobs:
       POSTGRESQL_VERSION: ${{matrix.POSTGRESQL_VERSION}}
       MYSQL_VERSION: ${{matrix.MYSQL_VERSION}}
       DB: ${{ matrix.DB }}
-      EXTRAS: tests,${{ matrix.DB }}
+      EXTRAS: tests,admin,${{ matrix.DB }}
 
     steps:
       - name: Checkout

invenio_records/dumpers/indexedat.py

@@ -2,6 +2,7 @@
 #
 # This file is part of Invenio.
 # Copyright (C) 2022 CERN.
+# Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -11,7 +12,7 @@
 Dumper used to dump/load the indexed time of a record to/from a search engine body.
 """
 
-import arrow
+from datetime import datetime, timezone
 
 from .search import SearchDumperExt
 
@@ -25,7 +26,7 @@ def __init__(self, key="indexed_at"):
 
     def dump(self, record, data):
         """Dump relations."""
-        data[self.key] = arrow.utcnow().isoformat()
+        data[self.key] = datetime.now(timezone.utc).isoformat()
 
     def load(self, data, record_cls):
         """Load (remove) indexed data."""

invenio_records/dumpers/search.py

@@ -2,6 +2,7 @@
 #
 # This file is part of Invenio.
 # Copyright (C) 2020 CERN.
+# Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -15,9 +16,8 @@
 from uuid import UUID
 
 import arrow
-import pytz
 from invenio_db import db
-from sqlalchemy.sql.sqltypes import JSON, Boolean, DateTime, Integer, String, Text
+from sqlalchemy.sql.sqltypes import JSON, Boolean, DateTime, Integer, String
 from sqlalchemy.sql.type_api import Variant
 from sqlalchemy_utils.types.uuid import UUIDType
 
@@ -96,7 +96,7 @@ def _serialize(value, dump_type):
         if value is None:
             return value
         if dump_type in (datetime,):
-            return pytz.utc.localize(value).isoformat()
+            return value.isoformat()
         elif dump_type in (UUID,):
             return str(value)
         elif dump_type is not None:

invenio_records/models.py

@@ -2,6 +2,7 @@
 #
 # This file is part of Invenio.
 # Copyright (C) 2015-2020 CERN.
+# Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -10,7 +11,7 @@
 
 import uuid
 from copy import deepcopy
-from datetime import datetime
+from datetime import datetime, timezone
 
 from invenio_db import db
 from sqlalchemy.dialects import mysql, postgresql
@@ -19,7 +20,7 @@
 from sqlalchemy_utils.types import JSONType, UUIDType
 
 
-class Timestamp(object):
+class Timestamp:
     """Timestamp model mix-in with fractional seconds support.
 
     SQLAlchemy-Utils timestamp model does not have support for fractional
@@ -28,20 +29,20 @@ class Timestamp(object):
 
     created = db.Column(
         db.DateTime().with_variant(mysql.DATETIME(fsp=6), "mysql"),
-        default=datetime.utcnow,
+        default=lambda: datetime.now(timezone.utc),
         nullable=False,
     )
     updated = db.Column(
         db.DateTime().with_variant(mysql.DATETIME(fsp=6), "mysql"),
-        default=datetime.utcnow,
+        default=lambda: datetime.now(timezone.utc),
         nullable=False,
     )
 
 
 @db.event.listens_for(Timestamp, "before_update", propagate=True)
 def timestamp_before_update(mapper, connection, target):
     """Update `updated` property with current time on `before_update` event."""
-    target.updated = datetime.utcnow()
+    target.updated = datetime.now(timezone.utc)
 
 
 class RecordMetadataBase(Timestamp):

invenio_records/validators.py

@@ -3,6 +3,7 @@
 # This file is part of Invenio.
 # Copyright (C) 2015-2018 CERN.
 # Copyright (C) 2021      TU Wien.
+# Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -11,7 +12,7 @@
 
 from jsonschema.validators import Draft4Validator, extend, validator_for
 
-PartialDraft4Validator = extend(Draft4Validator, {"required": None})
+PartialDraft4Validator = extend(Draft4Validator, {"required": lambda *_: None})
 """Partial JSON Schema (draft 4) validator.
 
 Special validator that contains the same validation rules of Draft4Validator,

setup.cfg

@@ -38,8 +38,7 @@ install_requires =
 
 [options.extras_require]
 tests =
-    pytest-black>=0.3.0
-    invenio-admin>=1.4.0,<2.0.0
+    pytest-black-ng>=0.3.0
     pytest-invenio>=2.1.0,<3.0.0
     pytest-mock>=1.6.0
     sphinx>=4.5.0

tests/test_api.py

@@ -2,6 +2,7 @@
 #
 # This file is part of Invenio.
 # Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -11,7 +12,7 @@
 
 import copy
 import uuid
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 import pytest
 from jsonresolver import JSONResolver
@@ -22,13 +23,12 @@
 
 from invenio_records import Record
 from invenio_records.errors import MissingModelError
-from invenio_records.models import RecordMetadata
 from invenio_records.validators import PartialDraft4Validator
 
 
 def strip_ms(dt):
     """Strip microseconds."""
-    return dt - timedelta(microseconds=dt.microsecond)
+    return (dt - timedelta(microseconds=dt.microsecond)).replace(tzinfo=None)
 
 
 def test_get_records(testapp, db):
@@ -61,17 +61,20 @@ def test_revision_id_created_updated_properties(testapp, db):
     assert record.revision_id == 0
     dt_c = record.created
     assert dt_c
+    assert strip_ms(record.created) == strip_ms(dt_c)
     dt_u = record.updated
     assert dt_u
     record["title"] = "test 2"
     record.commit()
     db.session.commit()
+
     assert record.revision_id == 1
     assert strip_ms(record.created) == strip_ms(dt_c)
     assert strip_ms(record.updated) >= strip_ms(dt_u)
 
-    assert dt_u.tzinfo is None
-    utcnow = datetime.utcnow()
+    # Why was that necessary to test?
+    # assert dt_u.tzinfo is None
+    utcnow = datetime.now(timezone.utc)
     assert dt_u > utcnow - timedelta(seconds=10)
     assert dt_u < utcnow + timedelta(seconds=10)
 

tests/test_systemfields.py

@@ -3,6 +3,7 @@
 # This file is part of Invenio.
 # Copyright (C) 2020 CERN.
 # Copyright (C) 2021 RERO.
+# Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -247,14 +248,16 @@ def test_extension_post_create(testapp, db, ExtensionRecord):
 
 def test_extension_pre_dump(testapp, db, ExtensionRecord):
     """Test pre dump hook."""
-    rec = ExtensionRecord({}).dumps()
+    with pytest.deprecated_call():
+        rec = ExtensionRecord({}).dumps()
     assert ExtensionRecord.ext.called == ["pre_init", "post_init", "pre_dump"]
 
 
 def test_extension_post_load(testapp, db, ExtensionRecord):
     """Test post load hook."""
-    dump = ExtensionRecord({}).dumps()
-    rec = ExtensionRecord.loads(dump)
+    with pytest.deprecated_call():
+        dump = ExtensionRecord({}).dumps()
+        rec = ExtensionRecord.loads(dump)
     assert ExtensionRecord.ext.called == [
         "pre_init",
         "post_init",