Skip to content

Commit

Permalink
Merge branch 'master' into other-major-breaking-refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
gmaze committed Sep 25, 2024
2 parents fa05fa7 + 919484e commit ce6fed9
Show file tree
Hide file tree
Showing 9 changed files with 250 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pytests-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/py3.10-all-pinned.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/py3.10-core-pinned.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
61 changes: 61 additions & 0 deletions ci/requirements/py3.11-all-free.yml
Original file line number Diff line number Diff line change
@@ -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
61 changes: 61 additions & 0 deletions ci/requirements/py3.11-core-free.yml
Original file line number Diff line number Diff line change
@@ -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
61 changes: 61 additions & 0 deletions ci/requirements/py3.12-all-free.yml
Original file line number Diff line number Diff line change
@@ -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
61 changes: 61 additions & 0 deletions ci/requirements/py3.12-core-free.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ci/requirements/py3.9-all-pinned.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/py3.9-core-pinned.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ce6fed9

Please sign in to comment.