Merge remote-tracking branch 'upstream/master' into feature/fix_wom

Author: asdf8601

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,27 +1,3 @@
-Checklist for the pandas documentation sprint (ignore this if you are doing
-an unrelated PR):
-
-- [ ] PR title is "DOC: update the <your-function-or-method> docstring"
-- [ ] The validation script passes: `scripts/validate_docstrings.py <your-function-or-method>`
-- [ ] The PEP8 style check passes: `git diff upstream/master -u -- "*.py" | flake8 --diff`
-- [ ] The html version looks good: `python doc/make.py --single <your-function-or-method>`
-- [ ] It has been proofread on language by another sprint participant
-
-Please include the output of the validation script below between the "```" ticks:
-
-```
-# paste output of "scripts/validate_docstrings.py <your-function-or-method>" here
-# between the "```" (remove this comment, but keep the "```")
-
-```
-
-If the validation script still gives errors, but you think there is a good reason
-to deviate in this case (and there are certainly such cases), please state this
-explicitly.
-
-
-Checklist for other PRs (remove this part if you are doing a PR for the pandas documentation sprint):
-
 - [ ] closes #xxxx
 - [ ] tests added / passed
 - [ ] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`

.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/environment-dev.yaml

@@ -11,5 +11,5 @@ dependencies:
   - python-dateutil>=2.5.0
   - python=3
   - pytz
-  - setuptools>=3.3
+  - setuptools>=24.2.0
   - sphinx

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-3.6_DOC.run

@@ -5,7 +5,7 @@ sphinx
 nbconvert
 nbformat
 notebook
-matplotlib=2.1*
+matplotlib
 seaborn
 scipy
 lxml

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

@@ -7,5 +7,5 @@ moto
 pytest>=3.1
 python-dateutil>=2.5.0
 pytz
-setuptools>=3.3
-sphinx
+setuptools>=24.2.0
+sphinx