Merge branch 'release-v5.8.1'

Author: looselycoupled

btrdb/utils/general.py

@@ -58,7 +58,7 @@ def from_timedelta(cls, delta):
         specified duration. Because pointwidths are in powers of 2, be sure to check
         that the returned real duration is sufficient.
         """
-        return cls.from_nanoseconds(delta.total_seconds()*1e9)
+        return cls.from_nanoseconds(int(delta.total_seconds()*1e9))
 
     @classmethod
     def from_nanoseconds(cls, nsec):

btrdb/version.py

@@ -18,9 +18,9 @@
 __version_info__ = {
     'major': 5,
     'minor': 8,
-    'micro': 0,
+    'micro': 1,
     'releaselevel': 'final',
-    'serial': 13,
+    'serial': 14,
 }
 
 ##########################################################################

requirements.txt

@@ -1,6 +1,6 @@
 # GRPC / Protobuff related
-grpcio==1.16.1
-grpcio-tools==1.16.1
+grpcio>=1.16.1
+grpcio-tools>=1.16.1
 
 # Time related utils
 pytz

tests/btrdb/test_base.py

@@ -26,7 +26,7 @@
 ## Test Constants
 ##########################################################################
 
-EXPECTED_VERSION = "5.8"
+EXPECTED_VERSION = "5.8.1"
 
 
 ##########################################################################

tests/btrdb/utils/test_general.py

@@ -25,15 +25,16 @@ class TestPointwidth(object):
         (timedelta(days=30), 51),
         (timedelta(days=7), 49),
         (timedelta(days=1), 46),
-        (timedelta(hours=4), 45),
-        (timedelta(minutes=15), 40),
-        (timedelta(seconds=30), 29),
+        (timedelta(hours=4), 43),
+        (timedelta(minutes=15), 39),
+        (timedelta(seconds=30), 34),
     ])
-    def test_from_nanoseconds(self, delta, expected):
+
+    def test_from_timedelta(self, delta, expected):
         """
-        Test getting the closest point width from nanoseconds
+        Test getting the closest point width from a timedelta
         """
-        assert pointwidth.from_nanoseconds(nsec) == expected
+        assert pointwidth.from_timedelta(delta) == expected
 
     @pytest.mark.parametrize("nsec, expected", [
         (ns_delta(days=365), 54),
@@ -44,6 +45,7 @@ def test_from_nanoseconds(self, delta, expected):
         (ns_delta(minutes=30), 40),
         (ns_delta(seconds=1), 29),
     ])
+
     def test_from_nanoseconds(self, nsec, expected):
         """
         Test getting the closest point width from nanoseconds