Merge branch 'master' into stable_sort

Author: bmoscon

.travis.yml

@@ -2,8 +2,8 @@ sudo: false
 language: python
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
+  - "3.5"
 install:
   - pip install --upgrade pip
   - pip install python-dateutil --upgrade 

README.md

@@ -106,7 +106,7 @@ Arctic storage implementations are **pluggable**.  VersionStore is the default.
 
 Arctic currently works with:
 
- * Python 2.7, 3.3, 3.4
+ * Python 2.7, 3.4, 3.5
  * pymongo >= 3.0
  * Pandas
  * MongoDB >= 2.4.x

tests/integration/store/test_pandas_store.py

@@ -9,6 +9,7 @@
 from pandas.tseries.offsets import DateOffset
 from pandas.util.testing import assert_frame_equal, assert_series_equal
 import pytest
+import pandas as pd
 
 from arctic._compression import decompress
 from arctic.date import DateRange, mktz
@@ -524,6 +525,7 @@ def panel(i1, i2, i3):
                  list(rrule(DAILY, count=i3, dtstart=dt(1970, 1, 1), interval=1)))
 
 
+@pytest.mark.skipif(pd.__version__ == '0.18.0', reason="issue #115")
 @pytest.mark.parametrize("df_size", list(itertools.combinations_with_replacement([1, 2, 4], r=3)))
 def test_panel_save_read(library, df_size):
     '''Note - empties are not tested here as they don't work!'''