Merge pull request influxdata#457 from sebito91/fix_py27

aviau · web-flow · commit 46734055e55a · 2017-06-02T21:18:34.000-04:00
updating deps for py27, including pandas
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,7 @@ install:
     - pip install tox
     - pip install coveralls
     - mkdir influxdb_install
-    - wget https://dl.influxdata.com/influxdb/releases/influxdb_1.1.0_amd64.deb
+    - wget https://dl.influxdata.com/influxdb/releases/influxdb_1.2.4_amd64.deb
     - dpkg -x influxdb*.deb influxdb_install
 script:
     - export INFLUXDB_PYTHON_INFLUXD_PATH=$(pwd)/influxdb_install/usr/bin/influxd
diff --git a/influxdb/_dataframe_client.py b/influxdb/_dataframe_client.py
@@ -177,8 +177,8 @@ def _convert_dataframe_to_json(self,
         if not isinstance(dataframe, pd.DataFrame):
             raise TypeError('Must be DataFrame, but type was: {0}.'
                             .format(type(dataframe)))
-        if not (isinstance(dataframe.index, pd.tseries.period.PeriodIndex) or
-                isinstance(dataframe.index, pd.tseries.index.DatetimeIndex)):
+        if not (isinstance(dataframe.index, pd.PeriodIndex) or
+                isinstance(dataframe.index, pd.DatetimeIndex)):
             raise TypeError('Must be DataFrame with DatetimeIndex or \
                             PeriodIndex.')
 
@@ -234,8 +234,8 @@ def _convert_dataframe_to_lines(self,
         if not isinstance(dataframe, pd.DataFrame):
             raise TypeError('Must be DataFrame, but type was: {0}.'
                             .format(type(dataframe)))
-        if not (isinstance(dataframe.index, pd.tseries.period.PeriodIndex) or
-                isinstance(dataframe.index, pd.tseries.index.DatetimeIndex)):
+        if not (isinstance(dataframe.index, pd.PeriodIndex) or
+                isinstance(dataframe.index, pd.DatetimeIndex)):
             raise TypeError('Must be DataFrame with DatetimeIndex or \
                             PeriodIndex.')
 
@@ -279,7 +279,7 @@ def _convert_dataframe_to_lines(self,
         }.get(time_precision, 1)
 
         # Make array of timestamp ints
-        if isinstance(dataframe.index, pd.tseries.period.PeriodIndex):
+        if isinstance(dataframe.index, pd.PeriodIndex):
             time = ((dataframe.index.to_timestamp().values.astype(int) /
                      precision_factor).astype(int).astype(str))
         else:
diff --git a/influxdb/influxdb08/dataframe_client.py b/influxdb/influxdb08/dataframe_client.py
@@ -128,12 +128,12 @@ def _convert_dataframe_to_json(self, dataframe, name, time_precision='s'):
         if not isinstance(dataframe, pd.DataFrame):
             raise TypeError('Must be DataFrame, but type was: {0}.'
                             .format(type(dataframe)))
-        if not (isinstance(dataframe.index, pd.tseries.period.PeriodIndex) or
-                isinstance(dataframe.index, pd.tseries.index.DatetimeIndex)):
+        if not (isinstance(dataframe.index, pd.PeriodIndex) or
+                isinstance(dataframe.index, pd.DatetimeIndex)):
             raise TypeError('Must be DataFrame with DatetimeIndex or \
                             PeriodIndex.')
 
-        if isinstance(dataframe.index, pd.tseries.period.PeriodIndex):
+        if isinstance(dataframe.index, pd.PeriodIndex):
             dataframe.index = dataframe.index.to_timestamp()
         else:
             dataframe.index = pd.to_datetime(dataframe.index)
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-python-dateutil>=2.0.0
+python-dateutil>=2.6.0
 pytz
-requests>=1.0.3
-six>=1.9.0
+requests>=2.17.0
+six>=1.10.0
diff --git a/setup.py b/setup.py
@@ -49,7 +49,7 @@
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ),
