Updated for new flake8

Added retrying dev requirement and use in memcache tests.

.travis.yml

@@ -55,6 +55,7 @@ jobs:
       before_install: skip
       install: skip
       script: skip
+      after_success: skip
       deploy:
         provider: pypi
         on:
@@ -67,18 +68,15 @@ jobs:
         skip_upload_docs: true
       after_deploy:
         - docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" &&
-          cd docker &&
-          docker build --pull -t ikuosu/influxgraph:${TRAVIS_TAG} . &&
+          docker build --pull -t ikuosu/influxgraph:${TRAVIS_TAG} docker &&
           docker push influxgraph/influxgraph:${TRAVIS_TAG};
 before_install:
   - pip install -U pip setuptools wheel
   - wget https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_amd64.deb
   - sudo dpkg -i influxdb_${INFLUXDB_VERSION}_amd64.deb
   - sudo /etc/init.d/influxdb start
 install:
-  - pip install -r requirements.txt
-  - pip install coverage codecov flake8
-  - python setup.py build_ext --inplace
+  - pip install -r requirements_dev.txt
 script:
   - nosetests --with-coverage --cover-package=influxgraph
   - nosetests --with-coverage --cover-package=influxgraph tests/test_influxdb_integration.py
@@ -88,10 +86,9 @@ script:
   - flake8 influxgraph
 after_success:
   - codecov
+  - docker build --pull -t ikuosu/influxgraph:latest docker
   - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then
       docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" &&
-      cd docker &&
-      docker build --pull -t ikuosu/influxgraph:latest . &&
       docker push influxgraph/influxgraph:latest;
     fi
 

influxgraph/__init__.py

@@ -2,9 +2,8 @@
 
 from __future__ import absolute_import, print_function
 
-import logging
-from .classes.finder import InfluxDBFinder as InfluxDBFinder # flake8: noqa
-from .classes.reader import InfluxDBReader as InfluxDBReader # flake8: noqa
+from .classes.finder import InfluxDBFinder as InfluxDBFinder  # noqa
+from .classes.reader import InfluxDBReader as InfluxDBReader  # noqa
 
 from ._version import get_versions
 __version__ = get_versions()['version']

influxgraph/classes/finder.py

@@ -580,7 +580,8 @@ def build_index(self, data=None, separator=b'.'):
 
     def _save_index_file(self, file_h):
         """Dump tree contents to file handle"""
-        json.dump(self.index.to_array(), file_h)
+        if self.index:
+            json.dump(self.index.to_array(), file_h)
 
     def save_index(self):
         """Save index to file"""

requirements_dev.txt

@@ -1,4 +1,6 @@
 coverage
+codecov
 flake8
 nose
+retrying
 -e .

tests/test_influxdb_integration.py

@@ -10,6 +10,7 @@
 from random import randint
 import logging
 import fcntl
+from retrying import retry
 
 from influxdb import InfluxDBClient
 import influxdb.exceptions
@@ -319,6 +320,7 @@ def test_single_fetch_data(self):
                         msg="Expected %s datapoints - got %s" % (
                             self.num_datapoints, len(datapoints),))
 
+    @retry(wait_exponential_multiplier=1000, wait_exponential_max=10000)
     def test_single_fetch_memcache_integration(self):
         self.config['influxdb']['memcache'] = {'host': 'localhost'}
         del self.config['search_index']
@@ -514,8 +516,8 @@ def test_get_series_pagination(self):
                         msg="Did not get data for all series with page limit %s" % (
                             limit,))
 
+    @retry(wait_exponential_multiplier=1000, wait_exponential_max=10000)
     def test_memcache_integration(self):
-        del self.finder
         config = { 'influxdb' : { 'host' : 'localhost',
                                   'port' : 8086,
                                   'user' : 'root',
@@ -605,6 +607,7 @@ def test_memcache_integration(self):
         self.assertTrue(fake_nodes[0].path in data)
         self.assertFalse(finder.memcache.get(fake_nodes_memcache_key))
 
+    @retry(wait_exponential_multiplier=1000, wait_exponential_max=10000)
     def test_reader_memcache_integration(self):
         reader = influxgraph.InfluxDBReader(
             InfluxDBClient(database=self.db_name),