sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fixing tests

Browse Source
This commit is contained in:
Sander Roosendaal
2024-05-26 14:51:21 +02:00
parent 09ee59a58e
commit ad372d8f92
8 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/models.py
View File

@@ -48,6 +48,7 @@ from sqlalchemy import create_engine
import sqlalchemy as sa
from sqlite3 import OperationalError
from django.utils import timezone
from datetime import timezone as dt_timezone
import pandas as pd
from dateutil import parser
import datetime
@@ -99,25 +100,25 @@ smoothingchoices = (
def half_year_from_now(ttz=None):
if ttz is None:
return (datetime.datetime.now(tz=timezone.utc)+timezone.timedelta(days=182)).date()
return (datetime.datetime.now(tz=dt_timezone.utc)+timezone.timedelta(days=182)).date()
return (datetime.datetime.utcnow()+timezone.timedelta(days=182)).astimezone(pytz.timezone(ttz)).date() # pragma: no cover
def a_week_from_now(ttz=None):
if ttz is None:
return (datetime.datetime.now(tz=timezone.utc)+timezone.timedelta(days=7)).date()
return (datetime.datetime.now(tz=dt_timezone.utc)+timezone.timedelta(days=7)).date()
return (datetime.datetime.utcnow()+timezone.timedelta(days=7)).astimezone(pytz.timezone(ttz)).date() # pragma: no cover
def current_day(ttz=None):
if ttz is None:
return (datetime.datetime.now(tz=timezone.utc)).date()
return (datetime.datetime.now(tz=dt_timezone.utc)).date()
return datetime.datetime.utcnow().astimezone(pytz.timezone(ttz)).date() # pragma: no cover
def current_time(ttz=None): # pragma: no cover
if ttz is None:
return datetime.datetime.now(tz=timezone.utc)
return datetime.datetime.now(tz=dt_timezone.utc)
return (datetime.datetime.utcnow()).astimezone(pytz.timezone(ttz)) # pragma: no cover