From 980033c8018ad59d722c61eba3e080c569f2c6bc Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 4 Dec 2022 12:11:45 +0100 Subject: [PATCH 01/18] Add python 3.11 to CI --- .github/workflows/ci-additional.yaml | 6 +++--- .github/workflows/ci.yaml | 8 ++++---- .github/workflows/upstream-dev-ci.yaml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml index bdae56ae6db..6350236aa0f 100644 --- a/.github/workflows/ci-additional.yaml +++ b/.github/workflows/ci-additional.yaml @@ -41,7 +41,7 @@ jobs: env: CONDA_ENV_FILE: ci/requirements/environment.yml - PYTHON_VERSION: "3.10" + PYTHON_VERSION: "3.11" steps: - uses: actions/checkout@v3 @@ -89,7 +89,7 @@ jobs: shell: bash -l {0} env: CONDA_ENV_FILE: ci/requirements/environment.yml - PYTHON_VERSION: "3.10" + PYTHON_VERSION: "3.11" steps: - uses: actions/checkout@v3 @@ -217,7 +217,7 @@ jobs: environment-name: xarray-tests environment-file: false extra-specs: | - python=3.10 + python=3.11 pyyaml conda python-dateutil diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 64aae44e56c..8f0fa3b5bf8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,7 +42,7 @@ jobs: matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] # Bookend python versions - python-version: ["3.8", "3.10"] + python-version: ["3.8", "3.10", "3.11"] env: [""] include: # Minimum python version: @@ -54,10 +54,10 @@ jobs: os: ubuntu-latest # Latest python version: - env: "all-but-dask" - python-version: "3.10" + python-version: "3.11" os: ubuntu-latest - env: "flaky" - python-version: "3.10" + python-version: "3.11" os: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -99,7 +99,7 @@ jobs: # We only want to install this on one run, because otherwise we'll have # duplicate annotations. - name: Install error reporter - if: ${{ matrix.os }} == 'ubuntu-latest' and ${{ matrix.python-version }} == '3.10' + if: ${{ matrix.os }} == 'ubuntu-latest' and ${{ matrix.python-version }} == '3.11' run: | python -m pip install pytest-github-actions-annotate-failures diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index 68bd0c15067..f9cbe28af52 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -48,7 +48,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10"] + python-version: ["3.11"] steps: - uses: actions/checkout@v3 with: From d421f6e8672e84b73bd4579fc0dc05e96f874c8b Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 4 Dec 2022 12:19:50 +0100 Subject: [PATCH 02/18] comment out numba --- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index d30c94348d0..268b8e67299 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -22,7 +22,7 @@ dependencies: - matplotlib-base - nc-time-axis - netcdf4 - - numba + # - numba # TODO: Waiting on python 3.11 support. - numpy - packaging - pandas diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index 22bfa3543d3..6cdebecaeb7 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -21,7 +21,7 @@ dependencies: - matplotlib-base - nc-time-axis - netcdf4 - - numba + # - numba # TODO: Waiting on python 3.11 support. - numpy - packaging - pandas diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index d6bc8466c76..d62e6f81b2c 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -23,7 +23,7 @@ dependencies: - matplotlib-base - nc-time-axis - netcdf4 - - numba + # - numba # TODO: Waiting on python 3.11 support. - numexpr - numpy - packaging From e6d5f872e045a4d00afc5bfadd89bca703411b7e Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 4 Dec 2022 12:24:59 +0100 Subject: [PATCH 03/18] Comment out zarr --- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- ci/requirements/min-all-deps.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index 268b8e67299..ca44a78022c 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -40,6 +40,6 @@ dependencies: - sparse - toolz - typing_extensions - - zarr + # - zarr # TODO: Waiting on python 3.11 support. - pip: - numbagg diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index 6cdebecaeb7..5386f9c277f 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -40,6 +40,6 @@ dependencies: - sparse - toolz - typing_extensions - - zarr + # - zarr # TODO: Waiting on python 3.11 support. - pip: - numbagg diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index d62e6f81b2c..fa2822a3c60 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -44,6 +44,6 @@ dependencies: - sparse - toolz - typing_extensions - - zarr + # - zarr # TODO: Waiting on python 3.11 support. - pip: - numbagg diff --git a/ci/requirements/min-all-deps.yml b/ci/requirements/min-all-deps.yml index c7e157992f0..ab4d1b192ea 100644 --- a/ci/requirements/min-all-deps.yml +++ b/ci/requirements/min-all-deps.yml @@ -50,6 +50,6 @@ dependencies: - sparse=0.13 - toolz=0.11 - typing_extensions=4.0 - - zarr=2.10 + # - zarr=2.10 # TODO: Waiting on python 3.11 support. - pip: - numbagg==0.1 From 63c4605c056f345b6b1b2ebd7cdc5ea6b1960bdd Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 4 Dec 2022 12:35:44 +0100 Subject: [PATCH 04/18] Comment out netcdf4 --- ci/requirements/all-but-dask.yml | 4 ++-- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- ci/requirements/min-all-deps.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index ca44a78022c..c98844a6d66 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -3,7 +3,7 @@ channels: - conda-forge - nodefaults dependencies: - - python=3.10 + - python=3.11 - black - aiobotocore - boto3 @@ -21,7 +21,7 @@ dependencies: - lxml # Optional dep of pydap - matplotlib-base - nc-time-axis - - netcdf4 + # - netcdf4 # TODO: Waiting on python 3.11 support. # - numba # TODO: Waiting on python 3.11 support. - numpy - packaging diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index 5386f9c277f..65e311edca9 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -20,7 +20,7 @@ dependencies: - lxml # Optional dep of pydap - matplotlib-base - nc-time-axis - - netcdf4 + # - netcdf4 # TODO: Waiting on python 3.11 support. # - numba # TODO: Waiting on python 3.11 support. - numpy - packaging diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index fa2822a3c60..c793d6b8eef 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -22,7 +22,7 @@ dependencies: - lxml # Optional dep of pydap - matplotlib-base - nc-time-axis - - netcdf4 + # - netcdf4 # TODO: Waiting on python 3.11 support. # - numba # TODO: Waiting on python 3.11 support. - numexpr - numpy diff --git a/ci/requirements/min-all-deps.yml b/ci/requirements/min-all-deps.yml index ab4d1b192ea..c7e157992f0 100644 --- a/ci/requirements/min-all-deps.yml +++ b/ci/requirements/min-all-deps.yml @@ -50,6 +50,6 @@ dependencies: - sparse=0.13 - toolz=0.11 - typing_extensions=4.0 - # - zarr=2.10 # TODO: Waiting on python 3.11 support. + - zarr=2.10 - pip: - numbagg==0.1 From f62d1c0250cb9aa610284637fc74ac1c14654051 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 4 Dec 2022 12:51:47 +0100 Subject: [PATCH 05/18] comment out h5netcdf --- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index c98844a6d66..dcf4c05a765 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -14,7 +14,7 @@ dependencies: - cftime - coveralls - flox - - h5netcdf + # - h5netcdf # TODO: Waiting on python 3.11 support. - h5py - hdf5 - hypothesis diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index 65e311edca9..d336403960c 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -12,7 +12,7 @@ dependencies: - distributed - flox - fsspec!=2021.7.0 - - h5netcdf + # - h5netcdf # TODO: Waiting on python 3.11 support. - h5py - hdf5 - hypothesis diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index c793d6b8eef..d383b26dea6 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -14,7 +14,7 @@ dependencies: - distributed - flox - fsspec!=2021.7.0 - - h5netcdf + # - h5netcdf # TODO: Waiting on python 3.11 support. - h5py - hdf5 - hypothesis From 982dbcce72e1b3d1ba44973555e120d3f042791d Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 4 Dec 2022 12:55:17 +0100 Subject: [PATCH 06/18] comment out hdf5 --- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index dcf4c05a765..cb282600696 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -16,7 +16,7 @@ dependencies: - flox # - h5netcdf # TODO: Waiting on python 3.11 support. - h5py - - hdf5 + # - hdf5 # TODO: Waiting on python 3.11 support. - hypothesis - lxml # Optional dep of pydap - matplotlib-base diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index d336403960c..c92f90d73d4 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -14,7 +14,7 @@ dependencies: - fsspec!=2021.7.0 # - h5netcdf # TODO: Waiting on python 3.11 support. - h5py - - hdf5 + # - hdf5 # TODO: Waiting on python 3.11 support. - hypothesis - iris - lxml # Optional dep of pydap diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index d383b26dea6..abc8b9b78e0 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -16,7 +16,7 @@ dependencies: - fsspec!=2021.7.0 # - h5netcdf # TODO: Waiting on python 3.11 support. - h5py - - hdf5 + # - hdf5 # TODO: Waiting on python 3.11 support. - hypothesis - iris - lxml # Optional dep of pydap From 0d21420baa017c693ea64b940bb74a8f7c48c215 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 4 Dec 2022 13:12:23 +0100 Subject: [PATCH 07/18] comment out h5py --- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index cb282600696..950fccd1538 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -15,7 +15,7 @@ dependencies: - coveralls - flox # - h5netcdf # TODO: Waiting on python 3.11 support. - - h5py + # - h5py # TODO: Waiting on python 3.11 support. # - hdf5 # TODO: Waiting on python 3.11 support. - hypothesis - lxml # Optional dep of pydap diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index c92f90d73d4..bf027b15224 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -13,7 +13,7 @@ dependencies: - flox - fsspec!=2021.7.0 # - h5netcdf # TODO: Waiting on python 3.11 support. - - h5py + # - h5py # TODO: Waiting on python 3.11 support. # - hdf5 # TODO: Waiting on python 3.11 support. - hypothesis - iris diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index abc8b9b78e0..afcd83ec57f 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -15,7 +15,7 @@ dependencies: - flox - fsspec!=2021.7.0 # - h5netcdf # TODO: Waiting on python 3.11 support. - - h5py + # - h5py # TODO: Waiting on python 3.11 support. # - hdf5 # TODO: Waiting on python 3.11 support. - hypothesis - iris From fb337c91c810dd8c0bc8a7ab216157d0a21b4588 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 4 Dec 2022 13:17:32 +0100 Subject: [PATCH 08/18] comment out cdms2 --- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index 950fccd1538..7d758d336bd 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -9,7 +9,7 @@ dependencies: - boto3 - bottleneck - cartopy - - cdms2 + # - cdms2 # TODO: Waiting on python 3.11 support. - cfgrib - cftime - coveralls diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index afcd83ec57f..722dd77c3fe 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -7,7 +7,7 @@ dependencies: - boto3 - bottleneck - cartopy - - cdms2 + # - cdms2 # TODO: Waiting on python 3.11 support. - cfgrib - cftime - dask-core From 31217a19607087feee55cbc52cbf91d1d589e9b8 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 4 Dec 2022 13:29:52 +0100 Subject: [PATCH 09/18] comment out psuedonetcdf --- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index 7d758d336bd..dd051d55e00 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -28,7 +28,7 @@ dependencies: - pandas - pint - pip - - pseudonetcdf + # - pseudonetcdf # TODO: Waiting on python 3.11 support. - pydap - pytest - pytest-cov diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index bf027b15224..b2cb5fd0849 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -28,7 +28,7 @@ dependencies: - pint - pip - pre-commit - - pseudonetcdf + # - pseudonetcdf # TODO: Waiting on python 3.11 support. - pydap - pytest - pytest-cov diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 722dd77c3fe..626bf8b1e95 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -32,7 +32,7 @@ dependencies: - pip - pooch - pre-commit - - pseudonetcdf + # - pseudonetcdf # TODO: Waiting on python 3.11 support. - pydap - pytest - pytest-cov From 42e2954cc08b62a8f8c60099feeebf4739a7775e Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 18 Dec 2022 12:32:44 +0100 Subject: [PATCH 10/18] comment out pydap --- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index dd051d55e00..2ec4d510287 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -29,7 +29,7 @@ dependencies: - pint - pip # - pseudonetcdf # TODO: Waiting on python 3.11 support. - - pydap + # - pydap # TODO: Waiting on python 3.11 support. - pytest - pytest-cov - pytest-env diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index b2cb5fd0849..6e3f98971a7 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -29,7 +29,7 @@ dependencies: - pip - pre-commit # - pseudonetcdf # TODO: Waiting on python 3.11 support. - - pydap + # - pydap # TODO: Waiting on python 3.11 support. - pytest - pytest-cov - pytest-env diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 626bf8b1e95..7cb9af2c9a2 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -33,7 +33,7 @@ dependencies: - pooch - pre-commit # - pseudonetcdf # TODO: Waiting on python 3.11 support. - - pydap + # - pydap # TODO: Waiting on python 3.11 support. - pytest - pytest-cov - pytest-env From 5a5339cd8b8a2d4b9a839ad802a22287a3a0807f Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 18 Dec 2022 12:40:52 +0100 Subject: [PATCH 11/18] comment out numbagg --- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index 2ec4d510287..b7c273378ce 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -42,4 +42,4 @@ dependencies: - typing_extensions # - zarr # TODO: Waiting on python 3.11 support. - pip: - - numbagg + # - numbagg # TODO: Waiting on python 3.11 support. diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index 6e3f98971a7..a0e02abe1c3 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -42,4 +42,4 @@ dependencies: - typing_extensions # - zarr # TODO: Waiting on python 3.11 support. - pip: - - numbagg + # - numbagg # TODO: Waiting on python 3.11 support. diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 7cb9af2c9a2..087f4f33dcb 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -46,4 +46,4 @@ dependencies: - typing_extensions # - zarr # TODO: Waiting on python 3.11 support. - pip: - - numbagg + # - numbagg # TODO: Waiting on python 3.11 support. From c5fe32048ad6ae65d0ee934e3626da71c63cedac Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 18 Dec 2022 12:45:11 +0100 Subject: [PATCH 12/18] comment out pip install --- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index b7c273378ce..9bce79e6ddf 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -41,5 +41,5 @@ dependencies: - toolz - typing_extensions # - zarr # TODO: Waiting on python 3.11 support. - - pip: + # - pip: # - numbagg # TODO: Waiting on python 3.11 support. diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index a0e02abe1c3..c7ed38b84ad 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -41,5 +41,5 @@ dependencies: - toolz - typing_extensions # - zarr # TODO: Waiting on python 3.11 support. - - pip: + # - pip: # - numbagg # TODO: Waiting on python 3.11 support. diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 087f4f33dcb..1a144785444 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -45,5 +45,5 @@ dependencies: - toolz - typing_extensions # - zarr # TODO: Waiting on python 3.11 support. - - pip: + # - pip: # - numbagg # TODO: Waiting on python 3.11 support. From 68e4b60077823c2ecac2724a47bacbf3cd5538e5 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sat, 24 Dec 2022 13:34:52 +0100 Subject: [PATCH 13/18] Update ci/requirements/environment.yml Co-authored-by: Justus Magin --- ci/requirements/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 1a144785444..6927808c076 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -44,6 +44,6 @@ dependencies: - sparse - toolz - typing_extensions - # - zarr # TODO: Waiting on python 3.11 support. + - zarr # - pip: # - numbagg # TODO: Waiting on python 3.11 support. From 0e8fe97452e3dd4e2b1fe81e1c01dc7ed7f12d5c Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sat, 24 Dec 2022 16:26:28 +0100 Subject: [PATCH 14/18] Update ci/requirements/environment.yml Co-authored-by: Justus Magin --- ci/requirements/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 6927808c076..db08bc246b6 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -22,7 +22,7 @@ dependencies: - lxml # Optional dep of pydap - matplotlib-base - nc-time-axis - # - netcdf4 # TODO: Waiting on python 3.11 support. + - netcdf4 # - numba # TODO: Waiting on python 3.11 support. - numexpr - numpy From 50dd570df9a7135d5de59a755e49029066acca2c Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sat, 24 Dec 2022 20:24:16 +0100 Subject: [PATCH 15/18] Update ci/requirements/environment.yml Co-authored-by: Justus Magin --- ci/requirements/environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index db08bc246b6..e2fb0100333 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -32,8 +32,8 @@ dependencies: - pip - pooch - pre-commit - # - pseudonetcdf # TODO: Waiting on python 3.11 support. - # - pydap # TODO: Waiting on python 3.11 support. + - pseudonetcdf + - pydap - pytest - pytest-cov - pytest-env From 836eb68c67ba8dd6c1f5ca5e962c2f5aab8d4e39 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sun, 25 Dec 2022 15:38:24 +0100 Subject: [PATCH 16/18] Update ci/requirements/environment.yml Co-authored-by: Justus Magin --- ci/requirements/environment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index e2fb0100333..03ce9dee55c 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -14,9 +14,9 @@ dependencies: - distributed - flox - fsspec!=2021.7.0 - # - h5netcdf # TODO: Waiting on python 3.11 support. - # - h5py # TODO: Waiting on python 3.11 support. - # - hdf5 # TODO: Waiting on python 3.11 support. + - h5netcdf + - h5py + - hdf5 - hypothesis - iris - lxml # Optional dep of pydap From dd17c0486609b474c95d75c4e6af7b62dae20528 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Fri, 20 Jan 2023 18:32:28 +0100 Subject: [PATCH 17/18] update rest of envs --- ci/requirements/all-but-dask.yml | 14 +++++++------- ci/requirements/environment-windows.yml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index 9bce79e6ddf..81fb375a037 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -14,22 +14,22 @@ dependencies: - cftime - coveralls - flox - # - h5netcdf # TODO: Waiting on python 3.11 support. - # - h5py # TODO: Waiting on python 3.11 support. - # - hdf5 # TODO: Waiting on python 3.11 support. + - h5netcdf + - h5py + - hdf5 - hypothesis - lxml # Optional dep of pydap - matplotlib-base - nc-time-axis - # - netcdf4 # TODO: Waiting on python 3.11 support. + - netcdf4 # - numba # TODO: Waiting on python 3.11 support. - numpy - packaging - pandas - pint - pip - # - pseudonetcdf # TODO: Waiting on python 3.11 support. - # - pydap # TODO: Waiting on python 3.11 support. + - pseudonetcdf + - pydap - pytest - pytest-cov - pytest-env @@ -40,6 +40,6 @@ dependencies: - sparse - toolz - typing_extensions - # - zarr # TODO: Waiting on python 3.11 support. + - zarr # - pip: # - numbagg # TODO: Waiting on python 3.11 support. diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index c7ed38b84ad..aab42f6470d 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -12,15 +12,15 @@ dependencies: - distributed - flox - fsspec!=2021.7.0 - # - h5netcdf # TODO: Waiting on python 3.11 support. - # - h5py # TODO: Waiting on python 3.11 support. - # - hdf5 # TODO: Waiting on python 3.11 support. + - h5netcdf + - h5py + - hdf5 - hypothesis - iris - lxml # Optional dep of pydap - matplotlib-base - nc-time-axis - # - netcdf4 # TODO: Waiting on python 3.11 support. + - netcdf4 # - numba # TODO: Waiting on python 3.11 support. - numpy - packaging @@ -28,8 +28,8 @@ dependencies: - pint - pip - pre-commit - # - pseudonetcdf # TODO: Waiting on python 3.11 support. - # - pydap # TODO: Waiting on python 3.11 support. + - pseudonetcdf + - pydap - pytest - pytest-cov - pytest-env @@ -40,6 +40,6 @@ dependencies: - sparse - toolz - typing_extensions - # - zarr # TODO: Waiting on python 3.11 support. + - zarr # - pip: # - numbagg # TODO: Waiting on python 3.11 support. From 87d689a21703940d505893947ea6c0f2572a45ca Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Fri, 20 Jan 2023 19:03:00 +0100 Subject: [PATCH 18/18] Let's see if we have any errors with this --- ci/requirements/environment.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 03ce9dee55c..34cc3275e31 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -7,7 +7,7 @@ dependencies: - boto3 - bottleneck - cartopy - # - cdms2 # TODO: Waiting on python 3.11 support. + - cdms2 # TODO: Waiting on python 3.11 support. - cfgrib - cftime - dask-core @@ -23,7 +23,7 @@ dependencies: - matplotlib-base - nc-time-axis - netcdf4 - # - numba # TODO: Waiting on python 3.11 support. + - numba # TODO: Waiting on python 3.11 support. - numexpr - numpy - packaging @@ -45,5 +45,5 @@ dependencies: - toolz - typing_extensions - zarr - # - pip: - # - numbagg # TODO: Waiting on python 3.11 support. + - pip: + - numbagg # TODO: Waiting on python 3.11 support.