Skip to content

CDDSO-326 reset calendar singleton #163

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

Merged
piotr-florek-mohc merged 1 commit into from
Aug 4, 2023
Merged

CDDSO-326 reset calendar singleton #163

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
5 changes: 4 additions & 1 deletion cdds/cdds/qc/plugins/base/validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,12 @@ def date_validator(cls, template: str, calendar: str = '360_day') -> Callable[[A
"""
def validator_function(value):
try:
current_mode = Calendar.default().mode
Calendar.default().set_mode(calendar)
TimePointParser().strptime(value, template)
except ValueError:
raise ValidationError("'{}' is not a valid date in a form of {}".format(value, template))

finally:
# revert to the cached mode
Calendar.default().set_mode(current_mode)
return validator_function
10 changes: 10 additions & 0 deletions cdds/cdds/tests/test_qc/plugins/base/test_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import unittest
import numpy as np
from metomi.isodatetime.data import Calendar
from cdds.qc.plugins.base.validators import ControlledVocabularyValidator
from cdds.qc.plugins.base.validators import ValidatorFactory, ValidationError
from cdds.tests.test_qc.plugins.constants import CV_REPO
Expand Down Expand Up @@ -74,3 +75,12 @@ def test_date_validator(self):
self.assertRaises(ValidationError, validator_gregorian, "2023-02-30T01:20:05Z")
self.assertRaises(ValidationError, validator_360day, "2023-07-31T01:20:05Z")
self.assertIsNone(validator_gregorian("2023-07-31T01:20:05Z"))

def test_date_validator_calendar_reset(self):
Calendar.default().set_mode("360_day")
validator_gregorian = ValidatorFactory.date_validator("%Y-%m-%dT%H:%M:%SZ", "gregorian")
self.assertIsNone(validator_gregorian("2023-07-31T01:20:05Z"))
self.assertEquals(Calendar.default().mode, "360_day")

self.assertRaises(ValidationError, validator_gregorian, "2023-02-30T01:20:05Z")
self.assertEquals(Calendar.default().mode, "360_day")