Merge remote-tracking branch 'upstream/master' into join-override

dcherian · dcherian · commit 316c432f08e7 · 2019-08-09T16:08:57.000-06:00
* upstream/master: Ignore example.grib.0112.idx file (pydata#3198) small updates to the contributing.rst (it could use more) (pydata#3193) Remove future statements (pydata#3194) update instructions (pydata#3195)
diff --git a/.gitignore b/.gitignore
@@ -66,6 +66,7 @@ dask-worker-space/
 doc/_build
 doc/generated
 xarray/version.py
+xarray/tests/data/*.grib.*.idx
 
 # Sync tools
 Icon*
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,3 +10,16 @@ repos:
     rev: v2.2.3
     hooks:
       - id: flake8
+  # run these occasionally, ref discussion https://github.com/pydata/xarray/pull/3194
+  # - repo: https://github.com/asottile/pyupgrade
+  #   rev: v1.22.1
+  #   hooks:
+  #     - id: pyupgrade
+  #       args:
+  #         - "--py3-only"
+  #         # remove on f-strings in Py3.7
+  #         - "--keep-percent-format"
+  # - repo: https://github.com/timothycrosley/isort
+  #   rev: 4.3.21-2
+  #   hooks:
+  #     - id: isort
diff --git a/asv_bench/benchmarks/__init__.py b/asv_bench/benchmarks/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import itertools
 
 import numpy as np
diff --git a/asv_bench/benchmarks/dataarray_missing.py b/asv_bench/benchmarks/dataarray_missing.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import pandas as pd
 
 import xarray as xr
diff --git a/asv_bench/benchmarks/dataset_io.py b/asv_bench/benchmarks/dataset_io.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import os
 
 import numpy as np
diff --git a/asv_bench/benchmarks/indexing.py b/asv_bench/benchmarks/indexing.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import numpy as np
 import pandas as pd
 
diff --git a/asv_bench/benchmarks/interp.py b/asv_bench/benchmarks/interp.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import numpy as np
 import pandas as pd
 
diff --git a/asv_bench/benchmarks/reindexing.py b/asv_bench/benchmarks/reindexing.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import numpy as np
 
 import xarray as xr
diff --git a/asv_bench/benchmarks/rolling.py b/asv_bench/benchmarks/rolling.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import numpy as np
 import pandas as pd
 
diff --git a/asv_bench/benchmarks/unstacking.py b/asv_bench/benchmarks/unstacking.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import numpy as np
 
 import xarray as xr
diff --git a/doc/conf.py b/doc/conf.py
@@ -11,7 +11,7 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-from __future__ import absolute_import, division, print_function
+
 
 import datetime
 import os
@@ -262,11 +262,11 @@
 
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
+    # 'papersize': 'letterpaper',
     # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
+    # 'pointsize': '10pt',
     # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+    # 'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
diff --git a/doc/contributing.rst b/doc/contributing.rst
@@ -389,14 +389,14 @@ each time you commit changes. You can skip these checks with
   conflicts. Because they have had limited testing, please reach out to the core devs
   on your pull request if you face any issues, and we'll help with the merge:
 
-  - Merge the commit on master prior to the `black` commit into your branch 
-    `git merge f172c673`. Any conflicts are real conflicts and require resolving
-  - Apply `black .` to your branch and commit
-    # TODO: insert after the black commit is on master
-  - Merge master at the `black` commit, resolving in favor of 'our' changes: 
-    `git merge [master-at-black-commit] -X ours`. You shouldn't have any merge conflicts
-  - Merge current master `git merge master`; any conflicts here are real and 
-    again require resolving
+  - Merge the commit on master prior to the ``black`` commit into your branch
+    ``git merge f172c673``. If you have conflicts here, resolve and commit.
+  - Apply ``black .`` to your branch and commit ``git commit -am "black"``
+  - Apply a patch of other changes we made on that commit: ``curl https://gist.githubusercontent.com/max-sixty/3cceb8472ed4ea806353999ca43aed52/raw/03cbee4e386156bddb61acaa250c0bfc726f596d/xarray%2520black%2520diff | git apply -``
+  - Commit (``git commit -am "black2"``)
+  - Merge master at the ``black`` commit, resolving in favor of 'our' changes:
+    ``git merge d089df38 -X ours``. You shouldn't have any merge conflicts
+  - Merge current master ``git merge master``; resolve and commit any conflicts
 
 Backwards Compatibility
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -469,7 +469,7 @@ equivalent. The easiest way to verify that your code is correct is to
 explicitly construct the result you expect, then compare the actual result to
 the expected correct result::
 
-    def test_constructor_from_0d(self):
+    def test_constructor_from_0d():
         expected = Dataset({None: ([], 0)})[None]
         actual = DataArray(0)
         assert_identical(expected, actual)
@@ -508,8 +508,7 @@ features that we like to use.
 - to set a mark on a parameter, ``pytest.param(..., marks=...)`` syntax should be used
 - ``fixture``, code for object construction, on a per-test basis
 - using bare ``assert`` for scalars and truth-testing
-- ``tm.assert_series_equal`` (and its counter part ``tm.assert_frame_equal``), for xarray
-  object comparisons.
+- ``assert_equal`` and ``assert_identical`` from the ``xarray.testing`` module for xarray object comparisons.
 - the typical pattern of constructing an ``expected`` and comparing versus the ``result``
 
 We would name this file ``test_cool_feature.py`` and put in an appropriate place in the
@@ -744,18 +743,6 @@ Doing 'git status' again should give something like::
     #       modified:   /relative/path/to/file-you-added.py
     #
 
-Finally, commit your changes to your local repository with an explanatory message.
-*Xarray* uses a convention for commit message prefixes and layout.  Here are
-some common prefixes along with general guidelines for when to use them:
-
-    * ``ENH``: Enhancement, new functionality
-    * ``BUG``: Bug fix
-    * ``DOC``: Additions/updates to documentation
-    * ``TST``: Additions/updates to tests
-    * ``BLD``: Updates to the build process/scripts
-    * ``PERF``: Performance improvement
-    * ``CLN``: Code cleanup
-
 The following defines how a commit message should be structured:
 
     * A subject line with `< 72` chars.
diff --git a/doc/gallery/plot_cartopy_facetgrid.py b/doc/gallery/plot_cartopy_facetgrid.py
@@ -14,7 +14,6 @@
 .. _this discussion: https://github.com/pydata/xarray/issues/1397#issuecomment-299190567
 """  # noqa
 
-from __future__ import division
 
 import cartopy.crs as ccrs
 import matplotlib.pyplot as plt
diff --git a/setup.cfg b/setup.cfg
@@ -30,6 +30,8 @@ exclude=
     doc
 
 [isort]
+default_section=THIRDPARTY
+known_first_party=xarray
 multi_line_output=3
 include_trailing_comma=True
 force_grid_wrap=0
diff --git a/versioneer.py b/versioneer.py
@@ -277,7 +277,6 @@
 
 """
 
-from __future__ import print_function
 
 import errno
 import json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import absolute_import, division, print_function`
`2`		`-`
`3`	`1`	`import itertools`
`4`	`2`
`5`	`3`	`import numpy as np`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import absolute_import, division, print_function`
`2`		`-`
`3`	`1`	`import pandas as pd`
`4`	`2`
`5`	`3`	`import xarray as xr`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import absolute_import, division, print_function`
`2`		`-`
`3`	`1`	`import os`
`4`	`2`
`5`	`3`	`import numpy as np`