Merge branch 'update-cast-to-nanosecond' of https://github.com/spencerkclark/xarray into update-cast-to-nanosecond

Author: spencerkclark

.github/workflows/benchmarks.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up conda environment
-        uses: mamba-org/provision-with-micromamba@v12
+        uses: mamba-org/provision-with-micromamba@v14
         with:
           environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests

.github/workflows/ci-additional.yaml

@@ -53,12 +53,13 @@ jobs:
           echo "TODAY=$(date  +'%Y-%m-%d')" >> $GITHUB_ENV
 
       - name: Setup micromamba
-        uses: mamba-org/provision-with-micromamba@34071ca7df4983ccd272ed0d3625818b27b70dcc
+        uses: mamba-org/provision-with-micromamba@v14
         with:
           environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests
           extra-specs: |
             python=${{env.PYTHON_VERSION}}
+            conda
           cache-env: true
           cache-env-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
 
@@ -99,12 +100,13 @@ jobs:
         run: |
           echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
       - name: Setup micromamba
-        uses: mamba-org/provision-with-micromamba@34071ca7df4983ccd272ed0d3625818b27b70dcc
+        uses: mamba-org/provision-with-micromamba@v14
         with:
           environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests
           extra-specs: |
             python=${{env.PYTHON_VERSION}}
+            conda
           cache-env: true
           cache-env-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
       - name: Install xarray
@@ -152,7 +154,7 @@ jobs:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
       - name: Setup micromamba
-        uses: mamba-org/provision-with-micromamba@34071ca7df4983ccd272ed0d3625818b27b70dcc
+        uses: mamba-org/provision-with-micromamba@v14
         with:
           environment-name: xarray-tests
           environment-file: false

.github/workflows/ci.yaml

@@ -86,12 +86,15 @@ jobs:
           echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
 
       - name: Setup micromamba
-        uses: mamba-org/provision-with-micromamba@34071ca7df4983ccd272ed0d3625818b27b70dcc
+        uses: mamba-org/provision-with-micromamba@v14
         with:
           environment-file: ${{ env.CONDA_ENV_FILE }}
           environment-name: xarray-tests
           cache-env: true
           cache-env-key: "${{runner.os}}-${{runner.arch}}-py${{matrix.python-version}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
+          extra-specs: |
+            python=${{matrix.python-version}}
+            conda
 
       # We only want to install this on one run, because otherwise we'll have
       # duplicate annotations.

.github/workflows/upstream-dev-ci.yaml

@@ -54,13 +54,14 @@ jobs:
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
       - name: Set up conda environment
-        uses: mamba-org/provision-with-micromamba@34071ca7df4983ccd272ed0d3625818b27b70dcc
+        uses: mamba-org/provision-with-micromamba@v14
         with:
           environment-file: ci/requirements/environment.yml
           environment-name: xarray-tests
           extra-specs: |
             python=${{ matrix.python-version }}
             pytest-reportlog
+            conda
       - name: Install upstream versions
         run: |
           bash ci/install-upstream-wheels.sh
@@ -87,6 +88,6 @@ jobs:
           && steps.status.outcome == 'failure'
           && github.event_name == 'schedule'
           && github.repository_owner == 'pydata'
-        uses: xarray-contrib/issue-from-pytest-log@v0.1
+        uses: xarray-contrib/issue-from-pytest-log@v1.1
         with:
           log-path: output-${{ matrix.python-version }}-log.jsonl

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.1.0
+    rev: v3.2.0
     hooks:
       - id: pyupgrade
         args:

asv_bench/benchmarks/merge.py

@@ -1,3 +1,5 @@
+import numpy as np
+
 import xarray as xr
 
 
@@ -13,6 +15,63 @@ def setup(self, existing_elements):
             d[f"var{i}"] = i
         self.dataset = xr.merge([d])
 
+        d = {f"set_2_{i}": i for i in range(existing_elements)}
+        self.dataset2 = xr.merge([d])
+
     def time_variable_insertion(self, existing_elements):
         dataset = self.dataset
         dataset["new_var"] = 0
+
+    def time_merge_two_datasets(self, existing_elements):
+        xr.merge([self.dataset, self.dataset2])
+
+
+class DatasetCreation:
+    # The idea here is to time how long it takes to go from numpy
+    # and python data types, to a full dataset
+    # See discussion
+    # https://github.com/pydata/xarray/issues/7224#issuecomment-1292216344
+    param_names = ["strategy", "count"]
+    params = [
+        ["dict_of_DataArrays", "dict_of_Variables", "dict_of_Tuples"],
+        [0, 1, 10, 100, 1000],
+    ]
+
+    def setup(self, strategy, count):
+        data = np.array(["0", "b"], dtype=str)
+        self.dataset_coords = dict(time=np.array([0, 1]))
+        self.dataset_attrs = dict(description="Test data")
+        attrs = dict(units="Celcius")
+        if strategy == "dict_of_DataArrays":
+
+            def create_data_vars():
+                return {
+                    f"long_variable_name_{i}": xr.DataArray(
+                        data=data, dims=("time"), attrs=attrs
+                    )
+                    for i in range(count)
+                }
+
+        elif strategy == "dict_of_Variables":
+
+            def create_data_vars():
+                return {
+                    f"long_variable_name_{i}": xr.Variable("time", data, attrs=attrs)
+                    for i in range(count)
+                }
+
+        elif strategy == "dict_of_Tuples":
+
+            def create_data_vars():
+                return {
+                    f"long_variable_name_{i}": ("time", data, attrs)
+                    for i in range(count)
+                }
+
+        self.create_data_vars = create_data_vars
+
+    def time_dataset_creation(self, strategy, count):
+        data_vars = self.create_data_vars()
+        xr.Dataset(
+            data_vars=data_vars, coords=self.dataset_coords, attrs=self.dataset_attrs
+        )

doc/whats-new.rst

@@ -81,6 +81,8 @@ Documentation
   By `Jimmy Westling <https://github.com/illviljan>`_.
 - Add documentation of specific BackendEntrypoints (:pull:`7200`).
   By `Michael Niklas <https://github.com/headtr1ck>`_.
+- Add examples to docstring for :py:meth:`DataArray.drop_vars`, :py:meth:`DataArray.reindex_like`, :py:meth:`DataArray.interp_like`. (:issue:`6793`, :pull:`7123`)
+  By `Daniel Goman <https://github.com/DanielGoman>`_.
 
 Internal Changes
 ~~~~~~~~~~~~~~~~

xarray/backends/api.py

@@ -916,7 +916,7 @@ def open_mfdataset(
     >>> lon_bnds, lat_bnds = (-110, -105), (40, 45)
     >>> partial_func = partial(_preprocess, lon_bnds=lon_bnds, lat_bnds=lat_bnds)
     >>> ds = xr.open_mfdataset(
-    ...     "file_*.nc", concat_dim="time", preprocess=_preprocess
+    ...     "file_*.nc", concat_dim="time", preprocess=partial_func
     ... )  # doctest: +SKIP
 
     References