mirror of
https://github.com/umap-project/umap.git
synced 2025-04-29 11:52:38 +02:00
chore: do not use datetime.UTC yet, which is py>=3.11 only
This commit is contained in:
parent
29d243b3c5
commit
cc457e9634
2 changed files with 5 additions and 5 deletions
|
@ -1,4 +1,4 @@
|
||||||
from datetime import UTC, datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
from django.core.management.base import BaseCommand
|
from django.core.management.base import BaseCommand
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ class Command(BaseCommand):
|
||||||
|
|
||||||
def handle(self, *args, **options):
|
def handle(self, *args, **options):
|
||||||
days = options["days"]
|
days = options["days"]
|
||||||
since = datetime.now(UTC) - timedelta(days=days)
|
since = datetime.utcnow() - timedelta(days=days)
|
||||||
print(f"Deleting map in trash since {since}")
|
print(f"Deleting map in trash since {since}")
|
||||||
maps = Map.objects.filter(share_status=Map.DELETED, modified_at__lt=since)
|
maps = Map.objects.filter(share_status=Map.DELETED, modified_at__lt=since)
|
||||||
for map in maps:
|
for map in maps:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
from datetime import UTC, datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
@ -11,13 +11,13 @@ from .base import MapFactory
|
||||||
pytestmark = pytest.mark.django_db
|
pytestmark = pytest.mark.django_db
|
||||||
|
|
||||||
|
|
||||||
def test_purge_purgatory(user):
|
def test_empty_trash(user):
|
||||||
recent = MapFactory(owner=user)
|
recent = MapFactory(owner=user)
|
||||||
recent_deleted = MapFactory(owner=user)
|
recent_deleted = MapFactory(owner=user)
|
||||||
recent_deleted.move_to_trash()
|
recent_deleted.move_to_trash()
|
||||||
recent_deleted.save()
|
recent_deleted.save()
|
||||||
with mock.patch("django.utils.timezone.now") as mocked:
|
with mock.patch("django.utils.timezone.now") as mocked:
|
||||||
mocked.return_value = datetime.now(UTC) - timedelta(days=8)
|
mocked.return_value = datetime.utcnow() - timedelta(days=8)
|
||||||
old_deleted = MapFactory(owner=user)
|
old_deleted = MapFactory(owner=user)
|
||||||
old_deleted.move_to_trash()
|
old_deleted.move_to_trash()
|
||||||
old_deleted.save()
|
old_deleted.save()
|
||||||
|
|
Loading…
Reference in a new issue