Skip to content

fix(chore): DeprecationWarning stdlib #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
utnapischtim wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix(chore): DeprecationWarning stdlib #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions invenio_drafts_resources/records/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#
# Copyright (C) 2020-2023 CERN.
# Copyright (C) 2021 Northwestern University.
# Copyright (C) 2025 Graz University of Technology.
#
# Invenio-Drafts-Resources is free software; you can redistribute it and/or
# modify it under the terms of the MIT License; see LICENSE file for more
Expand All @@ -22,7 +23,7 @@
"""

import uuid
from datetime import datetime, timedelta
from datetime import datetime, timedelta, timezone

from invenio_db import db
from invenio_pidstore.models import PIDStatus
Expand Down Expand Up @@ -269,7 +270,9 @@ def cleanup_drafts(cls, td, search_gc_deletes=60):
setting `index.gc_deletes` (see https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete.html#delete-versioning),
default to 60 seconds. Search cluster caches deleted documents for `index.gc_deletes` seconds.
"""
timestamp = datetime.utcnow() - td - timedelta(seconds=search_gc_deletes)
timestamp = (
datetime.now(timezone.utc) - td - timedelta(seconds=search_gc_deletes)
)
draft_model = cls.model_cls
models = draft_model.query.filter(
draft_model.is_deleted == True, # noqa
Expand Down
7 changes: 4 additions & 3 deletions invenio_drafts_resources/records/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2020 CERN.
# Copyright (C) 2025 Graz University of Technology.
#
# Invenio-Drafts-Resources is free software; you can redistribute it and/or
# modify it under the terms of the MIT License; see LICENSE file for more
# details.

"""Draft Models API."""

from datetime import datetime
from datetime import datetime, timezone

from invenio_db import db
from invenio_records.models import RecordMetadataBase
Expand Down Expand Up @@ -130,8 +131,8 @@ class DraftMetadataBase(RecordMetadataBase):
"""Version ID of the record."""

expires_at = db.Column(
db.DateTime().with_variant(mysql.DATETIME(fsp=6), "mysql"),
default=datetime.utcnow,
db.UTCDateTime(),
default=lambda: datetime.now(timezone.utc),
nullable=True,
)
"""Specifies when the draft expires. If `NULL` the draft doesn't expire."""
Loading