Merge branch 'master' into enhancement/more-explicit-type-check-in-as_compatible_data

Author: dcherian

.codecov.yml

@@ -0,0 +1,16 @@
+codecov:
+  ci:
+    # by default, codecov doesn't recognize azure as a CI provider
+    - dev.azure.com
+  require_ci_to_pass: yes
+
+coverage:
+  status:
+    project:
+      default:
+        # Require 1% coverage, i.e., always succeed
+        target: 1
+    patch: false
+    changes: false
+
+comment: off

.coveragerc

@@ -1,2 +1,8 @@
 [run]
-omit = xarray/test/*
+omit =
+    xarray/tests/*
+    xarray/core/dask_array_compat.py
+    xarray/core/npcompat.py
+    xarray/core/pdcompat.py
+    xarray/core/pycompat.py
+    xarray/_version.py

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,29 @@
+---
+name: Bug report / Feature request
+about: 'Post a problem or idea'
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+#### MCVE Code Sample
+<!-- In order for the maintainers to efficiently understand and prioritize issues, we ask you post a "Minimal, Complete and Verifiable Example" (MCVE): http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports -->
+
+```python
+# Your code here
+
+```
+
+#### Expected Output
+
+
+#### Problem Description
+<!-- this should explain why the current behavior is a problem and why the expected output is a better solution -->
+
+
+#### Output of ``xr.show_versions()``
+<details>
+# Paste the output here xr.show_versions() here
+
+</details>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,4 +2,5 @@
 
  - [ ] Closes #xxxx
  - [ ] Tests added
+ - [ ] Passes `black . && mypy . && flake8`
  - [ ] Fully documented, including `whats-new.rst` for all changes and `api.rst` for new API

.github/PULL_REQUEST_TEMPLATE.md

@@ -32,9 +32,11 @@ pip-log.txt
 
 # Unit test / coverage reports
 .coverage
+.coverage.*
 .tox
 nosetests.xml
 .cache
+.dmypy.json
 .mypy_cache
 .ropeproject/
 .tags*
@@ -64,6 +66,7 @@ dask-worker-space/
 doc/_build
 doc/generated
 xarray/version.py
+xarray/tests/data/*.grib.*.idx
 
 # Sync tools
 Icon*

.gitignore

@@ -1,16 +1,6 @@
-# File : .pep8speaks.yml
-
-# This should be kept in sync with the duplicate config in the [pycodestyle]
-# block of setup.cfg.
+# https://github.com/OrkoHunter/pep8speaks for more info
+# pep8speaks will use the flake8 configs in `setup.cfg`
 
 scanner:
-    diff_only: False  # If True, errors caused by only the patch are shown
-
-pycodestyle:
-    max-line-length: 79
-    ignore:  # Errors and warnings to ignore
-        - E402  # module level import not at top of file
-        - E731  # do not assign a lambda expression, use a def
-        - E741  # ambiguous variable name
-        - W503  # line break before binary operator
-        - W504  # line break after binary operator
+    diff_only: False
+    linter: flake8

.pep8speaks.yml

@@ -0,0 +1,29 @@
+# https://pre-commit.com/
+# https://github.com/python/black#version-control-integration
+repos:
+  - repo: https://github.com/python/black
+    rev: stable
+    hooks:
+      - id: black
+        language_version: python3.7
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.2.3
+    hooks:
+      - id: flake8
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.720  # Must match ci/requirements/*.yml
+    hooks:
+      - id: mypy
+  # 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

.pre-commit-config.yaml

@@ -5,8 +5,15 @@ Time required: about an hour.
  1. Ensure your master branch is synced to upstream:
        git pull upstream master
  2. Look over whats-new.rst and the docs. Make sure "What's New" is complete
-    (check the date!) and add a brief summary note describing the release at the
-    top.
+    (check the date!) and consider adding a brief summary note describing the
+    release at the top.
+    Things to watch out for:
+    - Important new features should be highlighted towards the top.
+    - Function/method references should include links to the API docs.
+    - Sometimes notes get added in the wrong section of whats-new, typically
+      due to a bad merge. Check for these before a release by using git diff,
+      e.g., ``git diff v0.X.Y whats-new.rst`` where 0.X.Y is the previous
+      release.
  3. If you have any doubts, run the full test suite one final time!
       py.test
  4. On the master branch, commit the release in git:

.travis.yml

@@ -1,18 +1,19 @@
 xarray: N-D labeled arrays and datasets
 =======================================
 
-.. image:: https://travis-ci.org/pydata/xarray.svg?branch=master
-   :target: https://travis-ci.org/pydata/xarray
-.. image:: https://ci.appveyor.com/api/projects/status/github/pydata/xarray?svg=true&passingText=passing&failingText=failing&pendingText=pending
-   :target: https://ci.appveyor.com/project/shoyer/xray
-.. image:: https://coveralls.io/repos/pydata/xarray/badge.svg
-   :target: https://coveralls.io/r/pydata/xarray
+.. image:: https://dev.azure.com/xarray/xarray/_apis/build/status/pydata.xarray?branchName=master
+   :target: https://dev.azure.com/xarray/xarray/_build/latest?definitionId=1&branchName=master
+.. image:: https://codecov.io/gh/pydata/xarray/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/pydata/xarray
 .. image:: https://readthedocs.org/projects/xray/badge/?version=latest
    :target: https://xarray.pydata.org/
 .. image:: https://img.shields.io/badge/benchmarked%20by-asv-green.svg?style=flat
   :target: https://pandas.pydata.org/speed/xarray/
 .. image:: https://img.shields.io/pypi/v/xarray.svg
    :target: https://pypi.python.org/pypi/xarray/
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+    :target: https://github.com/python/black
+
 
 **xarray** (formerly **xray**) is an open source project and Python package
 that makes working with labelled multi-dimensional arrays simple,

HOW_TO_RELEASE

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
 import itertools
 
 import numpy as np
@@ -13,6 +10,7 @@ def decorator(func):
         func.param_names = names
         func.params = params
         return func
+
     return decorator
 
 
@@ -29,6 +27,7 @@ def randn(shape, frac_nan=None, chunks=None, seed=0):
         x = rng.standard_normal(shape)
     else:
         import dask.array as da
+
         rng = da.random.RandomState(seed)
         x = rng.standard_normal(shape, chunks=chunks)
 

README.rst

@@ -0,0 +1,38 @@
+import numpy as np
+
+import xarray as xr
+
+
+class Combine:
+    """Benchmark concatenating and merging large datasets"""
+
+    def setup(self):
+        """Create 4 datasets with two different variables"""
+
+        t_size, x_size, y_size = 100, 900, 800
+        t = np.arange(t_size)
+        data = np.random.randn(t_size, x_size, y_size)
+
+        self.dsA0 = xr.Dataset(
+            {"A": xr.DataArray(data, coords={"T": t}, dims=("T", "X", "Y"))}
+        )
+        self.dsA1 = xr.Dataset(
+            {"A": xr.DataArray(data, coords={"T": t + t_size}, dims=("T", "X", "Y"))}
+        )
+        self.dsB0 = xr.Dataset(
+            {"B": xr.DataArray(data, coords={"T": t}, dims=("T", "X", "Y"))}
+        )
+        self.dsB1 = xr.Dataset(
+            {"B": xr.DataArray(data, coords={"T": t + t_size}, dims=("T", "X", "Y"))}
+        )
+
+    def time_combine_manual(self):
+        datasets = [[self.dsA0, self.dsA1], [self.dsB0, self.dsB1]]
+
+        xr.combine_manual(datasets, concat_dim=[None, "t"])
+
+    def time_auto_combine(self):
+        """Also has to load and arrange t coordinate"""
+        datasets = [self.dsA0, self.dsA1, self.dsB0, self.dsB1]
+
+        xr.combine_auto(datasets)