From 9cfce4f974788b822a23074bfa30701a15b277b4 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Thu, 7 Oct 2021 20:48:54 +0200 Subject: [PATCH 01/10] Add python 3.10 to CI --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e774803dda7..3c2457543c4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] # Bookend python versions - python-version: ["3.7", "3.9"] + python-version: ["3.7", "3.10"] steps: - uses: actions/checkout@v2 with: From a9f878412a7c4fde9347e333011d0984fdcf0bef Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sat, 9 Oct 2021 14:48:53 +0200 Subject: [PATCH 02/10] test --- .github/workflows/ci.yaml | 2 +- setup.cfg | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3c2457543c4..c112051b650 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] # Bookend python versions - python-version: ["3.7", "3.10"] + python-version: ["3.7", "3.9", "3.10"] steps: - uses: actions/checkout@v2 with: diff --git a/setup.cfg b/setup.cfg index aa8ca8df0ff..cf4ce97a772 100644 --- a/setup.cfg +++ b/setup.cfg @@ -75,10 +75,10 @@ packages = find: zip_safe = False # https://mypy.readthedocs.io/en/latest/installed_packages.html include_package_data = True python_requires = >=3.7 -install_requires = - numpy >= 1.17 - pandas >= 1.0 - setuptools >= 40.4 # For pkg_resources +# install_requires = +# numpy >= 1.17 +# pandas >= 1.0 +# setuptools >= 40.4 # For pkg_resources [options.extras_require] io = From 11782a1a47ee374ba9d8558157c3a74cc80b77d2 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sat, 9 Oct 2021 15:04:40 +0200 Subject: [PATCH 03/10] test --- .github/workflows/ci.yaml | 2 +- setup.cfg | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c112051b650..b5690aff58b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -72,7 +72,7 @@ jobs: - name: Install conda dependencies run: | - mamba env update -f $CONDA_ENV_FILE + conda env update -f $CONDA_ENV_FILE - name: Install xarray run: | diff --git a/setup.cfg b/setup.cfg index cf4ce97a772..aa8ca8df0ff 100644 --- a/setup.cfg +++ b/setup.cfg @@ -75,10 +75,10 @@ packages = find: zip_safe = False # https://mypy.readthedocs.io/en/latest/installed_packages.html include_package_data = True python_requires = >=3.7 -# install_requires = -# numpy >= 1.17 -# pandas >= 1.0 -# setuptools >= 40.4 # For pkg_resources +install_requires = + numpy >= 1.17 + pandas >= 1.0 + setuptools >= 40.4 # For pkg_resources [options.extras_require] io = From 7058db9eba12a886b9d441156da744356690c5ca Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sat, 9 Oct 2021 15:12:10 +0200 Subject: [PATCH 04/10] [test-upstream] test --- .github/workflows/ci.yaml | 2 +- .github/workflows/upstream-dev-ci.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b5690aff58b..c112051b650 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -72,7 +72,7 @@ jobs: - name: Install conda dependencies run: | - conda env update -f $CONDA_ENV_FILE + mamba env update -f $CONDA_ENV_FILE - name: Install xarray run: | diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml index 15ff3f7bda6..a63d83117b3 100644 --- a/.github/workflows/upstream-dev-ci.yaml +++ b/.github/workflows/upstream-dev-ci.yaml @@ -44,7 +44,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.9"] + python-version: ["3.10"] outputs: artifacts_availability: ${{ steps.status.outputs.ARTIFACTS_AVAILABLE }} steps: From 53fcdeda36c8a9a22bbcb20d90cbe3d559a90db0 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Sat, 9 Oct 2021 15:45:19 +0200 Subject: [PATCH 05/10] [test-upstream] test without numbaagg --- ci/requirements/environment-windows.yml | 4 ++-- ci/requirements/environment.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index 78ead40d5a2..83c4372917f 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -40,5 +40,5 @@ dependencies: - sparse - toolz - zarr - - pip: - - numbagg + # - pip: + # - numbagg diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index f64ca3677cc..cfd2f918ca7 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -44,5 +44,5 @@ dependencies: - sparse - toolz - zarr - - pip: - - numbagg + # - pip: + # - numbagg From a13381bde0752ece437538353af3e86607930769 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Thu, 11 Nov 2021 22:35:53 +0100 Subject: [PATCH 06/10] test without rasterio --- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index 9062b7a6659..a089d8191e3 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -33,7 +33,7 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist - - rasterio + # - rasterio - scipy - seaborn - setuptools diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 6b60738ab24..88096f70913 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -37,7 +37,7 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist - - rasterio + # - rasterio - scipy - seaborn - setuptools From dd403a8979bfec78b180e981892ed1ade23deb96 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Fri, 12 Nov 2021 21:34:21 +0100 Subject: [PATCH 07/10] remove setuptools --- ci/requirements/environment-windows.yml | 1 - ci/requirements/environment.yml | 1 - ci/requirements/py38-all-but-dask.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index a089d8191e3..589c06c6196 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -36,7 +36,6 @@ dependencies: # - rasterio - scipy - seaborn - - setuptools - sparse - toolz - typing_extensions diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 88096f70913..d9a89ea1113 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -40,7 +40,6 @@ dependencies: # - rasterio - scipy - seaborn - - setuptools - sparse - toolz - typing_extensions diff --git a/ci/requirements/py38-all-but-dask.yml b/ci/requirements/py38-all-but-dask.yml index 688dfb7a2bc..111cddc14f8 100644 --- a/ci/requirements/py38-all-but-dask.yml +++ b/ci/requirements/py38-all-but-dask.yml @@ -36,7 +36,6 @@ dependencies: - rasterio - scipy - seaborn - - setuptools - sparse - toolz - typing_extensions From 0652db68c1db2a3a25de593dd92931864b8675c2 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Wed, 19 Jan 2022 21:13:50 +0100 Subject: [PATCH 08/10] Update environment.yml --- ci/requirements/environment.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index cdf479959df..25a3e6b2fb6 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -22,7 +22,9 @@ dependencies: - matplotlib-base - nc-time-axis - netcdf4 - - numba + # Numba isn't yet built with Python 3.10 on conda-forge + # see https://github.com/conda-forge/numba-feedstock/pull/86 + # - numba - numexpr - numpy - pandas From 25687e4b35430c3edc2600fbda32d074d32fee10 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Wed, 19 Jan 2022 21:34:04 +0100 Subject: [PATCH 09/10] pydap errors --- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index 1170589f958..ad46464c03d 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -27,7 +27,7 @@ dependencies: - pip - pre-commit - pseudonetcdf - - pydap + # - pydap # https://github.com/pydap/pydap/pull/210 # - pynio # Not available on Windows - pytest - pytest-cov diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 219b88671b9..e9021cc6a27 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -22,9 +22,7 @@ dependencies: - matplotlib-base - nc-time-axis - netcdf4 - # Numba isn't yet built with Python 3.10 on conda-forge - # see https://github.com/conda-forge/numba-feedstock/pull/86 - # - numba + - numba - numexpr - numpy - pandas @@ -33,7 +31,7 @@ dependencies: - pooch - pre-commit - pseudonetcdf - - pydap + # - pydap # https://github.com/pydap/pydap/pull/210 # - pynio: not compatible with netCDF4>1.5.3; only tested in py37-bare-minimum - pytest - pytest-cov From a4f32ed728765145eedf727c98a9e7aef26049c0 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Wed, 19 Jan 2022 21:57:34 +0100 Subject: [PATCH 10/10] test rasterio --- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index ad46464c03d..05fa5fecba0 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -33,7 +33,7 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist - # - rasterio + - rasterio - scipy - seaborn - sparse diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index e9021cc6a27..46371247c4d 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -37,7 +37,7 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist - # - rasterio + - rasterio - scipy - seaborn - sparse