From 0dc9834dbfe770eed7467908fa9bad18d0559ab6 Mon Sep 17 00:00:00 2001 From: Guillaume Maze Date: Wed, 25 Sep 2024 11:31:21 +0200 Subject: [PATCH 1/2] Add upstream tests with python 3.11 and 3.12 --- .github/workflows/pytests-upstream.yml | 4 +- ci/requirements/py3.11-all-free.yml | 61 ++++++++++++++++++++++++++ ci/requirements/py3.11-core-free.yml | 61 ++++++++++++++++++++++++++ ci/requirements/py3.12-all-free.yml | 61 ++++++++++++++++++++++++++ ci/requirements/py3.12-core-free.yml | 61 ++++++++++++++++++++++++++ 5 files changed, 246 insertions(+), 2 deletions(-) create mode 100644 ci/requirements/py3.11-all-free.yml create mode 100644 ci/requirements/py3.11-core-free.yml create mode 100644 ci/requirements/py3.12-all-free.yml create mode 100644 ci/requirements/py3.12-core-free.yml diff --git a/.github/workflows/pytests-upstream.yml b/.github/workflows/pytests-upstream.yml index 1abcbdfd..a94ff3d0 100644 --- a/.github/workflows/pytests-upstream.yml +++ b/.github/workflows/pytests-upstream.yml @@ -74,7 +74,7 @@ jobs: strategy: fail-fast: true matrix: - python-version: ["3.9", "3.10"] + python-version: ["3.9", "3.10", "3.11", "3.12"] os: ["ubuntu-latest", "macos-latest", "windows-latest"] steps: @@ -200,7 +200,7 @@ jobs: strategy: fail-fast: true matrix: - python-version: ["3.9", "3.10"] + python-version: ["3.9", "3.10", "3.11", "3.12"] os: ["ubuntu-latest", "macos-latest", "windows-latest"] steps: diff --git a/ci/requirements/py3.11-all-free.yml b/ci/requirements/py3.11-all-free.yml new file mode 100644 index 00000000..37847acd --- /dev/null +++ b/ci/requirements/py3.11-all-free.yml @@ -0,0 +1,61 @@ +name: argopy-tests +channels: + - conda-forge +dependencies: + - python = 3.11 + +# CORE: + - aiohttp + - decorator + - erddapy + - fsspec + - netCDF4 + - packaging + - requests + - scipy + - toolz + - xarray < 2024.3 # while https://github.com/pydata/xarray/issues/8909 is not solved + +# EXT.UTIL: + - boto3 + - gsw + - s3fs > 2023.12.12 + - tqdm + - zarr + +# EXT.PERF: + - dask + - distributed + - h5netcdf + - pyarrow + +# EXT.PLOT: + - IPython + - cartopy + - ipykernel + - ipywidgets + - matplotlib + - pyproj + - seaborn + +# DEV: + - aiofiles + - black + - bottleneck + - cfgrib + - cftime + - codespell + - flake8 + - numpy + - pandas + - pip + - pytest + - pytest-cov + - pytest-env + - pytest-localftpserver + - setuptools +# - sphinx + +# PIP: + - pip: + - pytest-reportlog diff --git a/ci/requirements/py3.11-core-free.yml b/ci/requirements/py3.11-core-free.yml new file mode 100644 index 00000000..c68b1a5f --- /dev/null +++ b/ci/requirements/py3.11-core-free.yml @@ -0,0 +1,61 @@ +name: argopy-tests +channels: + - conda-forge +dependencies: + - python = 3.11 + +# CORE: + - aiohttp + - decorator + - erddapy + - fsspec + - netCDF4 + - packaging + - requests + - scipy + - toolz + - xarray < 2024.3 # while https://github.com/pydata/xarray/issues/8909 is not solved + +# EXT.UTIL: +# - boto3 +# - gsw +# - s3fs +# - tqdm +# - zarr + +# EXT.PERF: +# - dask +# - distributed +# - h5netcdf +# - pyarrow + +# EXT.PLOT: +# - IPython +# - cartopy +# - ipykernel +# - ipywidgets +# - matplotlib +# - pyproj +# - seaborn + +# DEV: + - aiofiles + - black + - bottleneck + - cfgrib + - cftime + - codespell + - flake8 + - numpy + - pandas + - pip + - pytest + - pytest-cov + - pytest-env + - pytest-localftpserver + - setuptools +# - sphinx + +# PIP: + - pip: + - pytest-reportlog \ No newline at end of file diff --git a/ci/requirements/py3.12-all-free.yml b/ci/requirements/py3.12-all-free.yml new file mode 100644 index 00000000..3f07fb01 --- /dev/null +++ b/ci/requirements/py3.12-all-free.yml @@ -0,0 +1,61 @@ +name: argopy-tests +channels: + - conda-forge +dependencies: + - python = 3.12 + +# CORE: + - aiohttp + - decorator + - erddapy + - fsspec + - netCDF4 + - packaging + - requests + - scipy + - toolz + - xarray < 2024.3 # while https://github.com/pydata/xarray/issues/8909 is not solved + +# EXT.UTIL: + - boto3 + - gsw + - s3fs > 2023.12.12 + - tqdm + - zarr + +# EXT.PERF: + - dask + - distributed + - h5netcdf + - pyarrow + +# EXT.PLOT: + - IPython + - cartopy + - ipykernel + - ipywidgets + - matplotlib + - pyproj + - seaborn + +# DEV: + - aiofiles + - black + - bottleneck + - cfgrib + - cftime + - codespell + - flake8 + - numpy + - pandas + - pip + - pytest + - pytest-cov + - pytest-env + - pytest-localftpserver + - setuptools +# - sphinx + +# PIP: + - pip: + - pytest-reportlog diff --git a/ci/requirements/py3.12-core-free.yml b/ci/requirements/py3.12-core-free.yml new file mode 100644 index 00000000..d37ccf14 --- /dev/null +++ b/ci/requirements/py3.12-core-free.yml @@ -0,0 +1,61 @@ +name: argopy-tests +channels: + - conda-forge +dependencies: + - python = 3.12 + +# CORE: + - aiohttp + - decorator + - erddapy + - fsspec + - netCDF4 + - packaging + - requests + - scipy + - toolz + - xarray < 2024.3 # while https://github.com/pydata/xarray/issues/8909 is not solved + +# EXT.UTIL: +# - boto3 +# - gsw +# - s3fs +# - tqdm +# - zarr + +# EXT.PERF: +# - dask +# - distributed +# - h5netcdf +# - pyarrow + +# EXT.PLOT: +# - IPython +# - cartopy +# - ipykernel +# - ipywidgets +# - matplotlib +# - pyproj +# - seaborn + +# DEV: + - aiofiles + - black + - bottleneck + - cfgrib + - cftime + - codespell + - flake8 + - numpy + - pandas + - pip + - pytest + - pytest-cov + - pytest-env + - pytest-localftpserver + - setuptools +# - sphinx + +# PIP: + - pip: + - pytest-reportlog \ No newline at end of file From 919484e86ef57c8ed3a8009a1b9d6ed8e1104684 Mon Sep 17 00:00:00 2001 From: Guillaume Maze Date: Wed, 25 Sep 2024 11:37:21 +0200 Subject: [PATCH 2/2] Fix ci tests env MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix error libmamba Could not solve for environment specs The following packages are incompatible ├─ fsspec 2024.9.0* is requested and can be installed; └─ s3fs 2024.6.1* is not installable because it requires └─ fsspec 2024.6.1 , which conflicts with any installable versions previously reported. critical libmamba Could not solve for environment specs --- ci/requirements/py3.10-all-pinned.yml | 2 +- ci/requirements/py3.10-core-pinned.yml | 2 +- ci/requirements/py3.9-all-pinned.yml | 4 ++-- ci/requirements/py3.9-core-pinned.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/requirements/py3.10-all-pinned.yml b/ci/requirements/py3.10-all-pinned.yml index 6983f38b..e56eb62e 100644 --- a/ci/requirements/py3.10-all-pinned.yml +++ b/ci/requirements/py3.10-all-pinned.yml @@ -8,7 +8,7 @@ dependencies: - aiohttp = 3.10.5 - decorator = 5.1.1 - erddapy = 2.2.3 - - fsspec = 2024.9.0 + - fsspec = 2024.6.1 - netCDF4 = 1.7.1 - packaging = 24.1 - requests = 2.32.3 diff --git a/ci/requirements/py3.10-core-pinned.yml b/ci/requirements/py3.10-core-pinned.yml index 21d23f30..23c48caa 100644 --- a/ci/requirements/py3.10-core-pinned.yml +++ b/ci/requirements/py3.10-core-pinned.yml @@ -8,7 +8,7 @@ dependencies: - aiohttp = 3.10.5 - decorator = 5.1.1 - erddapy = 2.2.3 - - fsspec = 2024.9.0 + - fsspec = 2024.6.1 - netCDF4 = 1.7.1 - packaging = 24.1 - requests = 2.32.3 diff --git a/ci/requirements/py3.9-all-pinned.yml b/ci/requirements/py3.9-all-pinned.yml index 543790fa..f6153c70 100644 --- a/ci/requirements/py3.9-all-pinned.yml +++ b/ci/requirements/py3.9-all-pinned.yml @@ -8,7 +8,7 @@ dependencies: - aiohttp = 3.10.5 - decorator = 5.1.1 - erddapy = 2.2.0 - - fsspec = 2024.9.0 + - fsspec = 2024.6.1 - netCDF4 = 1.7.1 - packaging = 24.1 - requests = 2.32.3 @@ -19,7 +19,7 @@ dependencies: # EXT.UTIL: - boto3 = 1.35.22 - gsw = 3.6.19 - - s3fs = 0.4.2 + - s3fs > 2023.12.12 - tqdm = 4.66.5 - zarr = 2.18.2 diff --git a/ci/requirements/py3.9-core-pinned.yml b/ci/requirements/py3.9-core-pinned.yml index 7c235caa..ef069473 100644 --- a/ci/requirements/py3.9-core-pinned.yml +++ b/ci/requirements/py3.9-core-pinned.yml @@ -8,7 +8,7 @@ dependencies: - aiohttp = 3.10.5 - decorator = 5.1.1 - erddapy = 2.2.0 - - fsspec = 2024.9.0 + - fsspec = 2024.6.1 - netCDF4 = 1.7.1 - packaging = 24.1 - requests = 2.32.3 @@ -19,7 +19,7 @@ dependencies: # EXT.UTIL: # - boto3 = 1.35.22 # - gsw = 3.6.19 -# - s3fs = 0.4.2 +# - s3fs > 2023.12.12 # - tqdm = 4.66.5 # - zarr = 2.18.2