don't try to subtract dicts from each other (#51)

* don't try to subtract dicts from each other

mongo 3.6 has added some additional information in the form of dicts to the network stats that is causing new relic stats collection to fail

also upgrade to circleci 2

Author: fandrews

.circleci/config.yml

@@ -0,0 +1,56 @@
+version: 2
+jobs:
+  test:
+    docker:
+      - image: python:3.5
+    working_directory: ~/python-client
+    steps:
+      - checkout
+
+      - run:
+          command: pip install --upgrade pip tox
+      
+      - run:
+          command: | 
+            tox -e lint
+            tox -e py35
+  
+  pypi_upload:
+    docker:
+        - image: circleci/python:3.5
+    steps:
+      - run:
+          command: tox -e build_pypi
+
+  pypi_upload_rc:
+    docker:
+      - image: circleci/python:3.5
+    steps:
+      - run:
+          command: tox -e build_testpypi
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test
+  pypi_upload:
+    jobs:
+      - pypi_upload:
+          requires:
+            - test
+          filters:
+            tags:
+              only:
+                - /^[0-9]+.[0-9]+.[0-9]+$/
+
+      - pypi_upload_rc:
+          requires:
+            - test
+          filters:
+            tags:
+              only:
+                - /^[0-9]+.[0-9]+.[0-9]+-rc[0-9]+$/
+
+
+  

circle.yml

@@ -195,7 +195,7 @@ def _compile_new_relic_stats(self, stats_this_second, stats_next_second):
             first_doc = stats_this_second['aggregate_server_statistics'][subdoc]
             second_doc = stats_next_second['aggregate_server_statistics'][subdoc]
             keys = set(first_doc.keys()) | set(second_doc.keys())
-            server_statistics_per_second[subdoc] = {key: int(second_doc[key]) - int(first_doc[key]) for key in keys}
+            server_statistics_per_second[subdoc] = {key: int(second_doc[key]) - int(first_doc[key]) for key in keys if isinstance(first_doc[key], int)}
         for node1, node2 in zip(stats_this_second['opcounters_per_node'], stats_next_second['opcounters_per_node']):
             node_opcounters_per_second = {}
             for repl, members in node2.items():

objectrocket/instances/mongodb.py

@@ -4,7 +4,7 @@ flake8>=2.1.0
 mock>=1.0.1
 pytest>=2.5.2
 pytest-cov>=1.7.0
-setuptools>=2.1
+setuptools==40.2.0
 sphinx_rtd_theme
 tox>=2.1
 wheel>=0.22.0

requirements/dev.txt

@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-VERSION = ('0', '4', '9')
+VERSION = ('0', '4', '10')
 __version__ = '.'.join(VERSION)
 
 with open('README.md') as f: