~pythonian/tshistory_refinery commit

4 files changed, 5 insertions(+), 5 deletions(-)

M test/data/goodformula.csv
M test/test_api.py
M test/test_cache.py
M tshistory_refinery/cache.py

M test/data/goodformula.csv +1 -1

@@ 1,4 1,4 @@ 
 name,text
 prio1,(priority (series "crude-a") (series "crude-b") (series "crude-c"))
-arith1,(add (* 10 (series "gas-a")) (series "gas-b") (naive (constant 42.0 (date "2010-1-1") (today) "D" (date "1900-1-1")) "CET"))
+arith1,(add (* 10 (series "gas-a")) (series "gas-b") (naive (constant 42.0 (date "2010-1-1") (now) "D" (date "1900-1-1")) "CET"))
 arith2,(add (series "gas-c") (series "prio1") (naive (constant 42.5 (date "1900-1-1") (date "2039-12-31") "D" (date "1900-1-1")) "CET"))

M test/test_api.py +2 -2

@@ 668,7 668,7 @@ 2010-01-20    forecasted
 def test_today_vs_revision_date(tsx):
     tsx.register_formula(
         'constant-1',
-        '(constant 1. (date "2020-1-1") (today) "D" (date "2020-2-1"))'
+        '(constant 1. (date "2020-1-1") (now) "D" (date "2020-2-1"))'
     )
 
     ts, _, _ = tsx.values_markers_origins(

          
@@ 690,7 690,7 @@ def test_find_bypolicy(tsx):
     )
     tsx.register_formula(
         'find.constant',
-        '(constant 1. (date "2020-1-1") (today) "D" (date "2020-2-1"))'
+        '(constant 1. (date "2020-1-1") (now) "D" (date "2020-2-1"))'
     )
     tsx.register_formula(
         'find.add',

M test/test_cache.py +1 -1

@@ 2015,7 2015,7 @@ def test_cache_slice(tsa):
     formula_name = 'sliced-forecast'
     tsa.register_formula(
         formula_name,
-        f'(slice (series "{series_name}") #:todate (today))',
+        f'(slice (series "{series_name}") #:todate (now))',
     )
     # Define cache policy
     policy_name = 'daily-cached'

M tshistory_refinery/cache.py +1 -1

@@ 436,7 436,7 @@ def has_today(formula):
 
     def _findtoday(tree):
         if isinstance(tree, list):
-            if tree[0] == 'today':
+            if tree[0] == 'now':
                 return True
 
             for item in tree[1:]: