From 07d06b1d9ee6f015e335869baf3054843395d000 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Tue, 6 Aug 2024 18:24:34 +0200 Subject: [PATCH 1/5] Update ci-additional.yaml --- .github/workflows/ci-additional.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index 1fc58c4f0bf..153337e4724 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -93,7 +93,7 @@ jobs: shell: bash -l {0} env: CONDA_ENV_FILE: ci/requirements/environment.yml - PYTHON_VERSION: "3.11" + PYTHON_VERSION: "3.12" steps: - uses: actions/checkout@v4 From 287058a6a0891713a37421f6cd44a419f33ac2e8 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Tue, 6 Aug 2024 18:33:51 +0200 Subject: [PATCH 2/5] Update test_typed_ops.py --- xarray/tests/test_typed_ops.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xarray/tests/test_typed_ops.py b/xarray/tests/test_typed_ops.py index 1d4ef89ae29..f673818f086 100644 --- a/xarray/tests/test_typed_ops.py +++ b/xarray/tests/test_typed_ops.py @@ -136,8 +136,8 @@ def _test(ds: Dataset) -> None: _test(_int + ds) _test(_list + ds) _test(_ndarray + ds) - _test(_var + ds) - _test(_da + ds) + _test(_var + ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 + _test(_da + ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 # __eq__ as an example of cmp ops _test(ds == _int) @@ -148,8 +148,8 @@ def _test(ds: Dataset) -> None: _test(_int == ds) # type: ignore[arg-type] # typeshed problem _test(_list == ds) # type: ignore[arg-type] # typeshed problem _test(_ndarray == ds) - _test(_var == ds) - _test(_da == ds) + _test(_var == ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 + _test(_da == ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 # __lt__ as another example of cmp ops _test(ds < _int) @@ -160,8 +160,8 @@ def _test(ds: Dataset) -> None: _test(_int > ds) _test(_list > ds) _test(_ndarray > ds) # type: ignore[arg-type] # numpy problem - _test(_var > ds) - _test(_da > ds) + _test(_var > ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 + _test(_da > ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 # __iadd__ as an example of inplace binary ops ds += _int From 7d667572b0929cf5182f07d92775a7076ad59804 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Tue, 6 Aug 2024 19:43:43 +0200 Subject: [PATCH 3/5] Update test_typed_ops.py --- xarray/tests/test_typed_ops.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xarray/tests/test_typed_ops.py b/xarray/tests/test_typed_ops.py index f673818f086..0687c4cf2cf 100644 --- a/xarray/tests/test_typed_ops.py +++ b/xarray/tests/test_typed_ops.py @@ -136,7 +136,7 @@ def _test(ds: Dataset) -> None: _test(_int + ds) _test(_list + ds) _test(_ndarray + ds) - _test(_var + ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 + _test(_var + ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 test _test(_da + ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 # __eq__ as an example of cmp ops From 3ddaa323928f17a482ec4d9cf2b5a4f73c3003d2 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Tue, 6 Aug 2024 19:45:45 +0200 Subject: [PATCH 4/5] Revert "Update test_typed_ops.py" This reverts commit 7d667572b0929cf5182f07d92775a7076ad59804. --- xarray/tests/test_typed_ops.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xarray/tests/test_typed_ops.py b/xarray/tests/test_typed_ops.py index 0687c4cf2cf..f673818f086 100644 --- a/xarray/tests/test_typed_ops.py +++ b/xarray/tests/test_typed_ops.py @@ -136,7 +136,7 @@ def _test(ds: Dataset) -> None: _test(_int + ds) _test(_list + ds) _test(_ndarray + ds) - _test(_var + ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 test + _test(_var + ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 _test(_da + ds) # type: ignore[arg-type] # TODO: wrong in mypy 312 # __eq__ as an example of cmp ops From 8dabe08f899ac564bc17dbd07058dc91ef26bf7a Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Tue, 6 Aug 2024 22:25:33 +0200 Subject: [PATCH 5/5] test mypy 3.10 --- .github/workflows/ci-additional.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index 153337e4724..6450cdd8f6d 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -139,7 +139,7 @@ jobs: fail_ci_if_error: false mypy39: - name: Mypy 3.9 + name: Mypy 3.10 runs-on: "ubuntu-latest" needs: detect-ci-trigger defaults: @@ -147,7 +147,7 @@ jobs: shell: bash -l {0} env: CONDA_ENV_FILE: ci/requirements/environment.yml - PYTHON_VERSION: "3.9" + PYTHON_VERSION: "3.10" steps: - uses: actions/checkout@v4