From 02d35ded25d0d944110da33973b3704fa3e7dfe7 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Mon, 30 Mar 2020 10:59:16 +0200 Subject: [PATCH] Switch back from pendulum to arrow to fix broken build ;) --- api/funkwhale_api/music/metadata.py | 6 +++--- api/funkwhale_api/music/models.py | 4 ++-- api/requirements/base.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py index 481f9a7e2..105bb6fe6 100644 --- a/api/funkwhale_api/music/metadata.py +++ b/api/funkwhale_api/music/metadata.py @@ -2,7 +2,7 @@ import base64 from collections.abc import Mapping import datetime import logging -import pendulum +import arrow import mutagen._util import mutagen.oggtheora @@ -575,9 +575,9 @@ class PermissiveDateField(serializers.CharField): return datetime.date(parsed.year, parsed.month, parsed.day) try: - parsed = pendulum.parse(str(value)) + parsed = arrow.get(str(value)) return datetime.date(parsed.year, parsed.month, parsed.day) - except (pendulum.exceptions.ParserError, ValueError): + except (arrow.parser.ParserError, ValueError): pass return None diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py index cdfb819b7..ecb616b41 100644 --- a/api/funkwhale_api/music/models.py +++ b/api/funkwhale_api/music/models.py @@ -6,7 +6,7 @@ import tempfile import urllib.parse import uuid -import pendulum +import arrow import pydub from django.conf import settings from django.contrib.contenttypes.fields import GenericRelation @@ -286,7 +286,7 @@ def import_artist(v): def parse_date(v): - d = pendulum.parse(v).date() + d = arrow.get(v).date() return d diff --git a/api/requirements/base.txt b/api/requirements/base.txt index e2a21df29..55b495596 100644 --- a/api/requirements/base.txt +++ b/api/requirements/base.txt @@ -32,7 +32,7 @@ django-cors-headers>=3.2,<3.3 musicbrainzngs==0.6 djangorestframework>=3.11,<3.12 djangorestframework-jwt>=1.11,<1.12 -pendulum>=2,<3 +arrow>=0.15.5,<0.16 persisting-theory>=0.2,<0.3 django-versatileimagefield>=2.0,<2.1 django-filter>=2.1,<2.2