Merge branch 'AntSimi:master' into master

Author: alcoat

.readthedocs.yml

@@ -7,5 +7,5 @@ build:
     python: "mambaforge-latest"
 python:
   install:
-    - method: setuptools
+    - method: pip
       path: .

doc/environment.yml

@@ -1,11 +1,12 @@
 channels:
   - conda-forge
-  - defaults
 dependencies:
-  - python=3.10
+  - python>=3.10, <3.13
   - ffmpeg
   - pip
   - pip:
+    - -r ../requirements.txt
+    - git+https://github.com/AntSimi/py-eddy-tracker-sample-id.git
     - sphinx-gallery
     - sphinx_rtd_theme
     - sphinx>=3.1

environment.yml

@@ -1,9 +1,8 @@
 name: binder-pyeddytracker
 channels:
   - conda-forge
-  - defaults
 dependencies:
-  - python=3.10
+  - python>=3.10, <3.13
   - pip
   - ffmpeg
   - pip:

examples/02_eddy_identification/pet_eddy_detection_ACC.py

@@ -7,6 +7,7 @@
 Two detections are provided : with a filtered ADT and without filtering
 
 """
+
 from datetime import datetime
 
 from matplotlib import pyplot as plt, style
@@ -80,7 +81,7 @@ def set_fancy_labels(fig, ticklabelsize=14, labelsize=14, labelweight="semibold"
 # Identification
 # ^^^^^^^^^^^^^^
 # Run the identification step with slices of 2 mm
-date = datetime(2016, 5, 15)
+date = datetime(2019, 2, 23)
 kw_ident = dict(
     date=date, step=0.002, shape_error=70, sampling=30, uname="u", vname="v"
 )

requirements.txt

@@ -1,11 +1,11 @@
-matplotlib
+matplotlib < 3.8 # need an update of contour management
 opencv-python
 pint
 polygon3
 pyyaml
 requests
 scipy
-zarr
+zarr < 3.0
 netCDF4
 numpy
 numba

src/py_eddy_tracker/data/__init__.py

@@ -8,6 +8,7 @@
     20160515 adt None None longitude latitude . \
     --cut 800 --fil 1
 """
+
 import io
 import lzma
 from os import path
@@ -26,14 +27,20 @@ def get_remote_demo_sample(path):
         if path.endswith(".nc"):
             return io.BytesIO(content)
     else:
-        if path.endswith(".nc"):
+        try:
+            import py_eddy_tracker_sample_id
+            if path.endswith(".nc"):
+                return py_eddy_tracker_sample_id.get_remote_demo_sample(path)
+            content = open(py_eddy_tracker_sample_id.get_remote_demo_sample(f"{path}.tar.xz"), "rb").read()
+        except:
+            if path.endswith(".nc"):
+                content = requests.get(
+                    f"https://github.com/AntSimi/py-eddy-tracker-sample-id/raw/master/{path}"
+                ).content
+                return io.BytesIO(content)
             content = requests.get(
-                f"https://github.com/AntSimi/py-eddy-tracker-sample-id/raw/master/{path}"
+                f"https://github.com/AntSimi/py-eddy-tracker-sample-id/raw/master/{path}.tar.xz"
             ).content
-            return io.BytesIO(content)
-        content = requests.get(
-            f"https://github.com/AntSimi/py-eddy-tracker-sample-id/raw/master/{path}.tar.xz"
-        ).content
 
     # Tar module could manage lzma tar, but it will apply uncompress for each extractfile
     tar = tarfile.open(mode="r", fileobj=io.BytesIO(lzma.decompress(content)))