Merge branch 'master' into retry_with_backoff

xginn8 · web-flow · commit e5096133145b · 2017-10-28T16:30:32.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,7 @@ matrix:
 
 install:
     - pip install tox
+    - pip install setuptools==20.6.6
     - pip install coveralls
     - mkdir influxdb_install
     - wget https://dl.influxdata.com/influxdb/releases/influxdb_1.2.4_amd64.deb
diff --git a/influxdb/_dataframe_client.py b/influxdb/_dataframe_client.py
@@ -86,7 +86,7 @@ def write_points(self,
 
                 if protocol == 'line':
                     points = self._convert_dataframe_to_lines(
-                        dataframe.ix[start_index:end_index].copy(),
+                        dataframe.iloc[start_index:end_index].copy(),
                         measurement=measurement,
                         global_tags=tags,
                         time_precision=time_precision,
@@ -95,7 +95,7 @@ def write_points(self,
                         numeric_precision=numeric_precision)
                 else:
                     points = self._convert_dataframe_to_json(
-                        dataframe.ix[start_index:end_index].copy(),
+                        dataframe.iloc[start_index:end_index].copy(),
                         measurement=measurement,
                         tags=tags,
                         time_precision=time_precision,
diff --git a/influxdb/influxdb08/dataframe_client.py b/influxdb/influxdb08/dataframe_client.py
@@ -59,7 +59,7 @@ def write_points(self, data, *args, **kwargs):
                         self._convert_dataframe_to_json(
                             name=key,
                             dataframe=data_frame
-                            .ix[start_index:end_index].copy(),
+                            .iloc[start_index:end_index].copy(),
                             time_precision=time_precision)]
                     InfluxDBClient.write_points(self, outdata, *args, **kwargs)
             return True
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,4 +1,4 @@
 nose
 nose-cov
 mock
-requests-mock
+requests-mock
