Merge branch 'test_render_tz_fix' of vesc/news into master

requirements.txt

@@ -12,6 +12,7 @@ marshmallow==2.15.0
 psycopg2==2.7.3.2
 py==1.4.34
 pytest==3.2.3
+pytz==2017.3
 requests==2.18.4
 SQLAlchemy==1.1.15
 uritemplate==3.0.0

tests/test_renders.py

@@ -1,12 +1,13 @@
 import datetime as dt
-from decimal import Decimal
 import json
+from pytz import timezone
+from decimal import Decimal
 
 from news.renders import extended_encoder, JSONRenderer
 
 
 def test_extended_encoder_date_parsing():
-    test_date = dt.datetime(2017, 5, 10)
+    test_date = dt.datetime(2017, 5, 10, tzinfo=timezone('UTC'))
     assert test_date.timestamp() == extended_encoder(test_date)
 
 
@@ -18,6 +19,6 @@ def test_extended_encoder_decimal_casting():
 def test_render_with_extended_encoder():
     test_date = dt.datetime(2017, 5, 10)
     test_decimal = Decimal('0.1')
-    expected = dict(my_date=1494388800.0, my_float=0.1)
+    expected = dict(my_date=1494374400.0, my_float=0.1)
     test_response = dict(my_date=test_date, my_float=test_decimal)
     assert json.dumps(expected).encode('utf-8') == JSONRenderer().render(test_response)