From e28161a1780ac4445f29bd95d8907382a1bbf2eb Mon Sep 17 00:00:00 2001
From: Guillaume Maze <gmaze@ifremer.fr>
Date: Wed, 13 Apr 2022 09:02:50 +0200
Subject: [PATCH] Update dependencies

---
 argopy/utilities.py           |  1 +
 ci/requirements/py3.7-dev.yml |  2 +-
 ci/requirements/py3.7-min.yml |  3 ++-
 ci/requirements/py3.8-dev.yml | 35 ++++++++++++++++++++---------------
 ci/requirements/py3.8-min.yml |  3 ++-
 docs/requirements.txt         |  4 ++--
 requirements.txt              | 18 +++++++++---------
 7 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/argopy/utilities.py b/argopy/utilities.py
index 051d1770..a954a139 100644
--- a/argopy/utilities.py
+++ b/argopy/utilities.py
@@ -576,6 +576,7 @@ def show_versions(file=sys.stdout, conda=False):  # noqa: C901
             ("dask", lambda mod: mod.__version__),  # This could go away from requirements ?
             ("toolz", lambda mod: mod.__version__),
             ("gsw", lambda mod: mod.__version__),   # Used by xarray accessor to compute new variables
+            ("aiohttp", lambda mod: mod.__version__),
         ]),
         'ext.misc': sorted([
             ("pyarrow", lambda mod: mod.__version__),
diff --git a/ci/requirements/py3.7-dev.yml b/ci/requirements/py3.7-dev.yml
index 5865f474..abb7990b 100644
--- a/ci/requirements/py3.7-dev.yml
+++ b/ci/requirements/py3.7-dev.yml
@@ -22,7 +22,6 @@ dependencies:
   - numpy=1.21.5
   - pandas=1.3.5
   - packaging=21.3
-  - pip=22.0.3
   - pytest=7.0.1
   - seaborn=0.11.2
   - setuptools=59.8.0
@@ -32,6 +31,7 @@ dependencies:
   - ipywidgets=7.6.5
   - pyarrow=4.0.1
 # Not showing up with argopy.show_versions():
+  - pip=22.0.3
   - cfgrib=0.9.10
   - black=22.1.0
   - flake8=4.0.1
diff --git a/ci/requirements/py3.7-min.yml b/ci/requirements/py3.7-min.yml
index 083b5813..71b35ff8 100644
--- a/ci/requirements/py3.7-min.yml
+++ b/ci/requirements/py3.7-min.yml
@@ -32,4 +32,5 @@ dependencies:
   - ipywidgets=7.5
   - pandas=1.1
   - numpy=1.18
-  - scipy=1.5
\ No newline at end of file
+  - scipy=1.5
+  - packaging=20.4
\ No newline at end of file
diff --git a/ci/requirements/py3.8-dev.yml b/ci/requirements/py3.8-dev.yml
index 3a151761..292f3654 100644
--- a/ci/requirements/py3.8-dev.yml
+++ b/ci/requirements/py3.8-dev.yml
@@ -3,34 +3,39 @@ channels:
   - conda-forge
 dependencies:
   - python=3.8
-  - xarray=2022.3.0
-  - scipy=1.8.0
-  - scikit-learn=1.0.2
-  - netcdf4=1.5.8
+
+  - aiohttp=3.8.1
   - dask=2022.02.1
-  - toolz=0.11.2
   - erddapy=1.2.0
   - fsspec=2022.02.0
   - gsw=3.4.0
-  - aiohttp=3.8.1
-  - bottleneck=1.3.4
-  - cartopy=0.20.2
-  - cftime=1.5.2
+  - netcdf4=1.5.8
+  - packaging=21.3
+  - scipy=1.8.0
+  - scikit-learn=1.0.2
+  - toolz=0.11.2
+  - xarray=2022.3.0
+
   - distributed=2022.2.1
+  - pyarrow=4.0.1
+  - tqdm=4.63.0
+
   - ipython=8.0.1
+  - cartopy=0.20.2
+  - ipykernel=6.9.1
+  - ipywidgets=7.6.5
   - matplotlib=3.5.1
+  - seaborn=0.11.2
+
+  - bottleneck=1.3.4
+  - cftime=1.5.2
   - numpy=1.22.2
   - pandas=1.4.1
-  - packaging=21.3
   - pip=22.0.3
   - pytest=7.0.1
-  - seaborn=0.11.2
   - setuptools=59.8.0
   - zarr=2.11.0
-  - tqdm=4.63.0
-  - ipykernel=6.9.1
-  - ipywidgets=7.6.5
-  - pyarrow=4.0.1
+
 # Not showing up with argopy.show_versions():
   - cfgrib=0.9.10
   - black=22.1.0
diff --git a/ci/requirements/py3.8-min.yml b/ci/requirements/py3.8-min.yml
index 9dd06364..eac4e728 100644
--- a/ci/requirements/py3.8-min.yml
+++ b/ci/requirements/py3.8-min.yml
@@ -32,4 +32,5 @@ dependencies:
   - ipywidgets=7.5
   - pandas=1.1
   - numpy=1.18
-  - scipy=1.5
\ No newline at end of file
+  - scipy=1.5
+  - packaging=20.4
\ No newline at end of file
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 7a6831cc..6800cc27 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -16,7 +16,7 @@ sphinx-book-theme
 # sphinx-bootstrap-theme
 
 xarray>=0.16.1
-scipy>=1.1.0
+scipy>=1.5
 scikit-learn>=0.23.2
 dask>=2021.9.1
 distributed>=2.30.0
@@ -26,7 +26,7 @@ distributed>=2.30.0
 erddapy>=0.7.2
 gsw>=3.4.0
 
-fsspec>=0.7.4, <2022.3.1
+fsspec>=0.7.4 #, <2022.3.1
 aiohttp>=3.7.4
 
 #matplotlib>=3.3.2
diff --git a/requirements.txt b/requirements.txt
index 1abc20bc..c84b6a40 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
-xarray>=0.15.1
-scipy>=1.1.0
-scikit-learn<2.0   # Using 'preprocessing.LabelEncoder()' in xarray accessor, used by filters
-netCDF4<1.5.9
-dask>=2.9  # This could go away ?
+xarray>=0.16
+scipy>=1.5
+scikit-learn>=0.23 #<2.0   # Using 'preprocessing.LabelEncoder()' in xarray accessor, used by filters
+netCDF4>=1.5.3 #<1.5.9
+dask>=2.3  # This could go away ?
 toolz>=0.8.2
-erddapy>=0.6  # This could go away ?
-fsspec>=0.7.4
+erddapy>=0.7  # This could go away ?
+fsspec>=0.8
 gsw<=3.4.0  # Used by xarray accessor to compute new variables, so not necessary to core functionalities
-aiohttp>=3.6.2
-packaging>= 20.4  # Using 'version' to make API compatible with several fsspec releases
\ No newline at end of file
+aiohttp>=3.7
+packaging>=20.4  # Using 'version' to make API compatible with several fsspec releases
\ No newline at end of file