Merge branch 'master' of https://github.com/pandas-dev/pandas

Author: sushobhit27

.travis.yml

@@ -56,7 +56,7 @@ matrix:
     # In allow_failures
     - dist: trusty
       env:
-        - JOB="2.7_SLOW" SLOW=true
+        - JOB="3.6_SLOW" SLOW=true
     # In allow_failures
     - dist: trusty
       env:
@@ -72,7 +72,7 @@ matrix:
     allow_failures:
       - dist: trusty
         env:
-          - JOB="2.7_SLOW" SLOW=true
+          - JOB="3.6_SLOW" SLOW=true
       - dist: trusty
         env:
           - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"

asv_bench/benchmarks/frame_ctor.py

@@ -16,11 +16,11 @@ class FromDicts(object):
 
     def setup(self):
         N, K = 5000, 50
-        index = tm.makeStringIndex(N)
-        columns = tm.makeStringIndex(K)
-        frame = DataFrame(np.random.randn(N, K), index=index, columns=columns)
+        self.index = tm.makeStringIndex(N)
+        self.columns = tm.makeStringIndex(K)
+        frame = DataFrame(np.random.randn(N, K), index=self.index,
+                          columns=self.columns)
         self.data = frame.to_dict()
-        self.some_dict = list(self.data.values())[0]
         self.dict_list = frame.to_dict(orient='records')
         self.data2 = {i: {j: float(j) for j in range(100)}
                       for i in range(2000)}
@@ -31,8 +31,14 @@ def time_list_of_dict(self):
     def time_nested_dict(self):
         DataFrame(self.data)
 
-    def time_dict(self):
-        Series(self.some_dict)
+    def time_nested_dict_index(self):
+        DataFrame(self.data, index=self.index)
+
+    def time_nested_dict_columns(self):
+        DataFrame(self.data, columns=self.columns)
+
+    def time_nested_dict_index_columns(self):
+        DataFrame(self.data, index=self.index, columns=self.columns)
 
     def time_nested_dict_int64(self):
         # nested dict, integer indexes, regression described in #621

ci/build_docs.sh

@@ -24,6 +24,7 @@ if [ "$DOC" ]; then
     source activate pandas
 
     mv "$TRAVIS_BUILD_DIR"/doc /tmp
+    mv "$TRAVIS_BUILD_DIR/LICENSE" /tmp  # included in the docs.
     cd /tmp/doc
 
     echo ###############################

ci/lint.sh

@@ -165,6 +165,14 @@ if [ "$LINT" ]; then
         RET=1
     fi
     echo "Check for deprecated messages without sphinx directive DONE"
+
+    echo "Check for old-style classes"
+    grep -R --include="*.py" -E "class\s\S*[^)]:" pandas scripts
+
+    if [ $? = "0" ]; then
+        RET=1
+    fi
+    echo "Check for old-style classes DONE"
 
 else
     echo "NOT Linting"

ci/requirements-2.7_SLOW.build renamed to ci/requirements-3.6_SLOW.build

@@ -1,5 +1,5 @@
-python=2.7*
+python=3.6*
 python-dateutil
 pytz
-numpy=1.10*
+numpy
 cython

ci/requirements-2.7_SLOW.pip renamed to ci/requirements-3.6_SLOW.pip

@@ -1,7 +1,7 @@
 python-dateutil
 pytz
-numpy=1.10*
-matplotlib=1.4.3
+numpy
+matplotlib
 scipy
 patsy
 xlwt

ci/requirements-2.7_SLOW.run renamed to ci/requirements-3.6_SLOW.run

@@ -2557,6 +2557,8 @@ objects.
    generated/pandas.Index.asi8
    generated/pandas.Index.data
    generated/pandas.Index.flags
+   generated/pandas.Index.holds_integer
+   generated/pandas.Index.is_type_compatible
    generated/pandas.Index.nlevels
    generated/pandas.Index.sort
    generated/pandas.Panel.agg
@@ -2572,4 +2574,5 @@ objects.
    generated/pandas.Series.blocks
    generated/pandas.Series.from_array
    generated/pandas.Series.ix
-   generated/pandas.Timestamp.offset
+   generated/pandas.Series.imag
+   generated/pandas.Series.real

doc/source/_static/print_df_new.png

@@ -397,7 +397,7 @@ In Python, this list would be a list of tuples, so
    pd.DataFrame(a)
 
 For more details and examples see :ref:`the Into to Data Structures
-documentation <basics.dataframe.from_items>`.
+documentation <dsintro>`.
 
 |meltdf|_
 ~~~~~~~~~~~~~~~~