Merge branch 'release-v5.6'

Author: looselycoupled

Makefile

@@ -30,6 +30,7 @@ clean:
 	-rm -rf .eggs
 	-rm -rf site
 	-rm -rf docs/_build
+	-rm -rf platform-builds meta.yaml
 
 # Targets for testing
 test:

btrdb/stream.py

@@ -33,7 +33,7 @@
 ## Module Variables
 ##########################################################################
 
-INSERT_BATCH_SIZE = 5000
+INSERT_BATCH_SIZE = 50000
 MINIMUM_TIME = -(16 << 56)
 MAXIMUM_TIME = (48 << 56) - 1
 

btrdb/utils/timez.py

@@ -51,7 +51,7 @@ def currently_as_ns():
     Returns the current UTC time as nanoseconds since epoch
     """
     dt = datetime.utcnow()
-    return int(dt.timestamp() * 1e9)
+    return int(dt.replace(tzinfo=pytz.utc).timestamp() * 1e9)
 
 
 def ns_to_datetime(ns):

btrdb/version.py

@@ -17,10 +17,10 @@
 
 __version_info__ = {
     'major': 5,
-    'minor': 5,
-    'micro': 3,
+    'minor': 6,
+    'micro': 0,
     'releaselevel': 'final',
-    'serial': 11,
+    'serial': 12,
 }
 
 ##########################################################################

tests/btrdb/test_base.py

@@ -26,7 +26,7 @@
 ## Test Constants
 ##########################################################################
 
-EXPECTED_VERSION = "5.5.3"
+EXPECTED_VERSION = "5.6"
 
 
 ##########################################################################

tests/btrdb/test_stream.py

@@ -727,15 +727,16 @@ def test_insert(self):
         """
         uu = uuid.UUID('0d22a53b-e2ef-4e0a-ab89-b2d48fb2592a')
         endpoint = Mock(Endpoint)
-        endpoint.insert = Mock(side_effect=[1,2])
+        endpoint.insert = Mock(side_effect=[1,2,3])
         stream = Stream(btrdb=BTrDB(endpoint), uuid=uu)
 
-        data = list(zip(range(10000,16000), map(float, range(6000))))
+        data = list(zip(range(10000,120000), map(float, range(110000))))
         version = stream.insert(data)
 
         assert stream._btrdb.ep.insert.call_args_list[0][0][1] == data[:INSERT_BATCH_SIZE]
-        assert stream._btrdb.ep.insert.call_args_list[1][0][1] == data[INSERT_BATCH_SIZE:]
-        assert version == 2
+        assert stream._btrdb.ep.insert.call_args_list[1][0][1] == data[INSERT_BATCH_SIZE:2*INSERT_BATCH_SIZE]
+        assert stream._btrdb.ep.insert.call_args_list[2][0][1] == data[2*INSERT_BATCH_SIZE:]
+        assert version == 3
 
 
     def test_nearest(self):

tests/btrdb/utils/test_timez.py

@@ -35,7 +35,7 @@ def test_currently_as_ns(self):
         """
         Assert currently_as_ns returns correct value
         """
-        expected = int(datetime.datetime(2018,1,1,12).timestamp() * 1e9)
+        expected = 1514808000000000000
         with freeze_time("2018-01-01 12:00:00 -0000"):
             assert currently_as_ns() == expected
 
@@ -82,10 +82,10 @@ def test_ns_to_datetime_is_correct(self):
         """
         Assert ns_to_datetime returns correct datetime
         """
-        input = 1514808000000000000
+        val = 1514808000000000000
         expected = datetime.datetime(2018,1,1,12, tzinfo=pytz.UTC)
 
-        assert ns_to_datetime(input) == expected
+        assert ns_to_datetime(val) == expected
 
 
 class TestToNanoseconds(object):