diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 824fb1416e6..50a4d556ab9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/devcontainers/base:jammy -ARG PIXI_VERSION=v0.59.0 +ARG PIXI_VERSION=v0.63.2 RUN curl -L -o /usr/local/bin/pixi -fsSL --compressed "https://github.com/prefix-dev/pixi/releases/download/${PIXI_VERSION}/pixi-$(uname -m)-unknown-linux-musl" \ && chmod +x /usr/local/bin/pixi \ diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index 3e90d0c3b2f..e4882599c7e 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -14,7 +14,6 @@ concurrency: env: FORCE_COLOR: 3 - PIXI_VERSION: "v0.63.2" jobs: detect-ci-trigger: @@ -48,8 +47,6 @@ jobs: - uses: actions/checkout@v6 - uses: Parcels-code/pixi-lock/create-and-cache@9a2866f8258b87a3c616d5ad7d51c6cd853df78b id: pixi-lock - with: - pixi-version: ${{env.PIXI_VERSION}} - uses: actions/upload-artifact@v6 with: name: pixi-lock diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8c37abf9144..816951c84ff 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,6 @@ concurrency: env: FORCE_COLOR: 3 - PIXI_VERSION: "v0.63.2" jobs: detect-ci-trigger: @@ -43,14 +42,11 @@ jobs: outputs: cache-key: ${{ steps.pixi-lock.outputs.cache-key }} - pixi-version: ${{ steps.pixi-lock.outputs.pixi-version }} steps: - uses: actions/checkout@v6 - uses: Parcels-code/pixi-lock/create-and-cache@9a2866f8258b87a3c616d5ad7d51c6cd853df78b id: pixi-lock - with: - pixi-version: ${{env.PIXI_VERSION}} - uses: actions/upload-artifact@v6 with: name: pixi-lock diff --git a/.github/workflows/hypothesis.yaml b/.github/workflows/hypothesis.yaml index 415cf12c768..a90a78e27ad 100644 --- a/.github/workflows/hypothesis.yaml +++ b/.github/workflows/hypothesis.yaml @@ -13,7 +13,6 @@ on: env: FORCE_COLOR: 3 - PIXI_VERSION: "v0.63.2" jobs: detect-ci-trigger: @@ -55,8 +54,6 @@ jobs: - uses: actions/checkout@v6 - uses: Parcels-code/pixi-lock/create-and-cache@9a2866f8258b87a3c616d5ad7d51c6cd853df78b id: pixi-lock - with: - pixi-version: ${{env.PIXI_VERSION}} - uses: actions/upload-artifact@v6 with: name: pixi-lock diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index ae5e19ff5ae..720b3f20ae1 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -17,7 +17,6 @@ concurrency: env: FORCE_COLOR: 3 - PIXI_VERSION: "v0.63.2" jobs: detect-ci-trigger: @@ -62,8 +61,6 @@ jobs: - uses: actions/checkout@v6 - uses: Parcels-code/pixi-lock/create-and-cache@9a2866f8258b87a3c616d5ad7d51c6cd853df78b id: pixi-lock - with: - pixi-version: ${{env.PIXI_VERSION}} - uses: actions/upload-artifact@v6 with: name: pixi-lock diff --git a/doc/contribute/contributing.rst b/doc/contribute/contributing.rst index 58eebf2b59d..72e4609a6f1 100644 --- a/doc/contribute/contributing.rst +++ b/doc/contribute/contributing.rst @@ -198,11 +198,8 @@ Xarray uses `Pixi `_ to manage development environments Before starting any development, you'll need to create an isolated xarray development environment: -- `Install Pixi `_ - preferably the same version as the one listed in our ``ci.yaml`` `file `_ - - - Some features in Pixi are in active development, and xarray depends on these features. - Using the same version results in the best dev experience. - - Instructions for installing specific versions of Pixi can be seen on the Pixi installation page. +- `Install Pixi `_ + - Xarray uses some Pixi features that are in active development. You might be prompted to upgrade your Pixi version to contribute to Xarray (this is controlled by the ``requires-pixi`` field in ``pixi.toml``) - Make sure that you have :ref:`cloned the repository ` - ``cd`` to the *xarray* source directory diff --git a/doc/whats-new.rst b/doc/whats-new.rst index d865c3d66b3..8108163e958 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -48,6 +48,7 @@ Documentation Internal Changes ~~~~~~~~~~~~~~~~ +- Fix a typo in ``xarray/core/variable.py`` (:pull:`11182`). - Fix a typo in ``xarray/backends/api.py`` (:pull:`11180`). By `Yaocheng Chen `_. diff --git a/pixi.toml b/pixi.toml index b756ae32e3f..1b87ef087ab 100644 --- a/pixi.toml +++ b/pixi.toml @@ -2,6 +2,7 @@ preview = ["pixi-build"] channels = ["conda-forge", "nodefaults"] platforms = ["win-64", "linux-64", "osx-arm64", "osx-64"] +requires-pixi = ">=0.63.2" [package] name = "xarray" diff --git a/xarray/core/variable.py b/xarray/core/variable.py index ab8b4be775b..2d3220faee8 100644 --- a/xarray/core/variable.py +++ b/xarray/core/variable.py @@ -773,7 +773,7 @@ def _broadcast_indexes_vectorized(self, key): if dim in variable_dims: # We only convert slice objects to variables if they share # a dimension with at least one other variable. Otherwise, - # we can equivalently leave them as slices aknd transpose + # we can equivalently leave them as slices and transpose # the result. This is significantly faster/more efficient # for most array backends. values = np.arange(*value.indices(self.sizes[dim])) @@ -1355,7 +1355,7 @@ def _roll_one_dim(self, dim, count): def roll(self, shifts=None, **shifts_kwargs): """ - Return a new Variable with rolld data. + Return a new Variable with rolled data. Parameters ----------