Use pendulum for datetime operations when possible
Currently, we use both Python's built-in datetime library and Pendulum to do datetime operations. For the sake of consistency, we should try to stick to one library for datetimes. We could have used either, but Pendulum has a more ergonomic API, so I decided to go with it when possible. The places where were we didn't / couldn't replace datetime are: - checking instances of datetimes. Pendulum's objects are subclasses of python native datetime objects, so it's still useful to import datetime in those cases of using is_instance() - WTForms date validators expect datetime style string formats -- Pendulum has its own format for formatting/ parsing strings. As such, our custom validator DateRange needs to use datetime.stptime() to account for this format.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import datetime
|
||||
import pendulum
|
||||
import uuid
|
||||
from unittest.mock import Mock, patch
|
||||
|
||||
@@ -613,7 +613,7 @@ def test_filter_environment_roles():
|
||||
user = UserFactory.create()
|
||||
# need to set the time created to yesterday, otherwise the original invite and resent
|
||||
# invite have the same time_created and then we can't rely on time to order the invites
|
||||
yesterday = datetime.date.today() - datetime.timedelta(days=1)
|
||||
yesterday = pendulum.today().subtract(days=1)
|
||||
invite = ApplicationInvitationFactory.create(
|
||||
user=user, time_created=yesterday, email="original@example.com"
|
||||
)
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import datetime
|
||||
import pendulum
|
||||
from unittest.mock import Mock
|
||||
|
||||
from flask import url_for
|
||||
@@ -123,7 +123,7 @@ def test_user_accepts_expired_invite(client, user_session):
|
||||
user_id=user.id,
|
||||
role=ws_role,
|
||||
status=InvitationStatus.REJECTED_EXPIRED,
|
||||
expiration_time=datetime.datetime.now() - datetime.timedelta(seconds=1),
|
||||
expiration_time=pendulum.now(tz="utc").subtract(seconds=1),
|
||||
)
|
||||
user_session(user)
|
||||
response = client.get(
|
||||
@@ -143,7 +143,7 @@ def test_revoke_invitation(client, user_session):
|
||||
user_id=user.id,
|
||||
role=ws_role,
|
||||
status=InvitationStatus.REJECTED_EXPIRED,
|
||||
expiration_time=datetime.datetime.now() - datetime.timedelta(seconds=1),
|
||||
expiration_time=pendulum.now(tz="utc").subtract(seconds=1),
|
||||
)
|
||||
user_session(portfolio.owner)
|
||||
response = client.post(
|
||||
@@ -169,7 +169,7 @@ def test_user_can_only_revoke_invites_in_their_portfolio(client, user_session):
|
||||
user_id=user.id,
|
||||
role=portfolio_role,
|
||||
status=InvitationStatus.REJECTED_EXPIRED,
|
||||
expiration_time=datetime.datetime.now() - datetime.timedelta(seconds=1),
|
||||
expiration_time=pendulum.now(tz="utc").subtract(seconds=1),
|
||||
)
|
||||
user_session(portfolio.owner)
|
||||
response = client.post(
|
||||
@@ -199,7 +199,7 @@ def test_user_can_only_resend_invites_in_their_portfolio(
|
||||
user_id=user.id,
|
||||
role=portfolio_role,
|
||||
status=InvitationStatus.REJECTED_EXPIRED,
|
||||
expiration_time=datetime.datetime.now() - datetime.timedelta(seconds=1),
|
||||
expiration_time=pendulum.now(tz="utc").subtract(seconds=1),
|
||||
)
|
||||
user_session(portfolio.owner)
|
||||
response = client.post(
|
||||
|
@@ -1,7 +1,5 @@
|
||||
from datetime import date
|
||||
from flask import url_for
|
||||
import pytest
|
||||
from datetime import timedelta, date
|
||||
|
||||
from atst.domain.permission_sets import PermissionSets
|
||||
from atst.domain.task_orders import TaskOrders
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import pytest
|
||||
from flask import url_for, get_flashed_messages
|
||||
from datetime import timedelta, date
|
||||
import pendulum
|
||||
from uuid import uuid4
|
||||
|
||||
from atst.domain.task_orders import TaskOrders
|
||||
@@ -339,7 +339,7 @@ def test_task_orders_submit_task_order(client, user_session, task_order):
|
||||
)
|
||||
assert response.status_code == 302
|
||||
|
||||
active_start_date = date.today() - timedelta(days=1)
|
||||
active_start_date = pendulum.today().subtract(days=1)
|
||||
active_task_order = TaskOrderFactory(portfolio=task_order.portfolio)
|
||||
CLINFactory(task_order=active_task_order, start_date=active_start_date)
|
||||
assert active_task_order.status == TaskOrderStatus.UNSIGNED
|
||||
@@ -348,7 +348,7 @@ def test_task_orders_submit_task_order(client, user_session, task_order):
|
||||
)
|
||||
assert active_task_order.status == TaskOrderStatus.ACTIVE
|
||||
|
||||
upcoming_start_date = date.today() + timedelta(days=1)
|
||||
upcoming_start_date = pendulum.today().add(days=1)
|
||||
upcoming_task_order = TaskOrderFactory(portfolio=task_order.portfolio)
|
||||
CLINFactory(task_order=upcoming_task_order, start_date=upcoming_start_date)
|
||||
assert upcoming_task_order.status == TaskOrderStatus.UNSIGNED
|
||||
|
Reference in New Issue
Block a user