From a5869505c0b840a546d89c169763d36ef8414a4e Mon Sep 17 00:00:00 2001 From: Ben Letham Date: Mon, 11 Jun 2018 15:18:40 -0700 Subject: [PATCH] Fix unittest for Py3.6 ordered dicts --- python/fbprophet/tests/test_prophet.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python/fbprophet/tests/test_prophet.py b/python/fbprophet/tests/test_prophet.py index 2f9e204..8bd86ab 100644 --- a/python/fbprophet/tests/test_prophet.py +++ b/python/fbprophet/tests/test_prophet.py @@ -323,8 +323,9 @@ class TestProphet(TestCase): holidays2 = pd.concat((holidays, holidays2)) m = Prophet(holidays=holidays2) feats, priors, names = m.make_holiday_features(df['ds']) - self.assertEqual(priors, [8., 8., 5., 5.]) - self.assertEqual(set(names), {'xmas', 'seans-bday'}) + pn = zip(priors, [s.split('_delim_')[0] for s in feats.columns]) + for t in pn: + self.assertIn(t, [(8., 'seans-bday'), (5., 'xmas')]) holidays2 = pd.DataFrame({ 'ds': pd.to_datetime(['2012-06-06', '2013-06-06']), 'holiday': ['seans-bday'] * 2, @@ -335,7 +336,7 @@ class TestProphet(TestCase): feats, priors, names = Prophet( holidays=holidays2, holidays_prior_scale=4 ).make_holiday_features(df['ds']) - self.assertEqual(priors, [4., 4., 5., 5.]) + self.assertEqual(set(priors), {4., 5.}) # Check incompatible priors holidays = pd.DataFrame({ 'ds': pd.to_datetime(['2016-12-25', '2016-12-27']),