pyopenrivercam 0.9.0__tar.gz → 0.9.2__tar.gz

{pyopenrivercam-0.9.0 → pyopenrivercam-0.9.2}/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [0.9.2] = 2026-01-15
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+- fixed problems with sample data downloading (403 errors)
+
+
+## [0.9.1] = 2026-01-13
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+- fixed python<3.10 compatibility
+
 ## [0.9.0] = 2025-12-23
 ### Added
 ### Changed

{pyopenrivercam-0.9.0 → pyopenrivercam-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyopenrivercam
-Version: 0.9.0
+Version: 0.9.2
 Summary: pyorc: free and open-source image-based surface velocity and discharge.
 Author-email: Hessel Winsemius <winsemius@rainbowsensing.com>
 Requires-Python: >=3.9
@@ -28,9 +28,12 @@ Requires-Dist: geopandas
 Requires-Dist: matplotlib
 Requires-Dist: netCDF4
 Requires-Dist: numba>0.56
-Requires-Dist: numpy>2
+Requires-Dist: numpy==1.26.4; python_version == '3.9'
+Requires-Dist: numpy>=2; python_version >= '3.10'
 Requires-Dist: opencv-python
 Requires-Dist: packaging; platform_machine == 'armv7l'
+Requires-Dist: pillow==9.5.0; python_version == '3.9'
+Requires-Dist: pillow; python_version >= '3.10'
 Requires-Dist: pip
 Requires-Dist: pyproj
 Requires-Dist: pythran; platform_machine == 'armv7l'

{pyopenrivercam-0.9.0 → pyopenrivercam-0.9.2}/pyorc/__init__.py

@@ -1,6 +1,6 @@
 """pyorc: free and open-source image-based surface velocity and discharge."""
 
-__version__ = "0.9.0"
+__version__ = "0.9.2"
 
 from .api import CameraConfig, CrossSection, Frames, Transect, Velocimetry, Video, get_camera_config, load_camera_config  # noqa
 from .project import *  # noqa

pyopenrivercam-0.9.2/pyorc/sample_data.py

@@ -0,0 +1,97 @@
+"""Retrieval of sample dataset."""
+
+import os
+import time
+import zipfile
+
+import platformdirs
+import requests
+
+cache_dir = platformdirs.user_cache_dir("pyorc")
+
+
+def zenodo_pooch(record_id, cache_name):
+    """Retrieve files from Zenodo record."""
+    try:
+        import pooch
+    except ImportError:
+        raise ImportError("This function needs pooch. Install pyorc with pip install pyopenrivercam[extra]")
+    r = requests.get(
+        f"https://zenodo.org/api/records/{record_id}",
+        timeout=30,
+        # headers=headers
+    )
+    if r.status_code != 200:
+        raise RuntimeError(f"Failed to fetch metadata for record {record_id}. {r.status_code} {r.text}")
+    meta = r.json()
+    urls = {f["key"]: f["links"]["self"] for f in meta["files"]}
+
+    return pooch.create(
+        path=pooch.os_cache(cache_name),
+        base_url="",
+        urls=urls,
+        registry={name: None for name in urls},
+    )
+
+
+def get_hommerich_dataset():
+    """Retrieve and cache sample dataset of Sheaf river."""
+    # Define the DOI link
+    filename = "20241010_081717.mp4"
+    file_path = os.path.join(cache_dir, filename)
+    # Fetch the dataset
+    if not os.path.exists(file_path):
+        for attempt in range(5):
+            registry = zenodo_pooch(
+                record_id=15002591,
+                cache_name="pyorc",
+            )
+            try:
+                file_path = registry.fetch(filename, progressbar=True)
+                break
+            except Exception as e:
+                if attempt == 4:
+                    raise f"Download failed with error: {e}."
+                else:
+                    print(f"Download failed with error: {e}. Retrying...")
+                    time.sleep(1)
+        print(f"Hommerich video is available in {file_path}")
+    return file_path
+
+
+def get_hommerich_pyorc_zip():
+    """Retrieve and cache sample dataset of Sheaf river."""
+    #
+    # # Define the DOI link
+    filename = "hommerich_20241010_081717_pyorc_data.zip.zip"
+    file_path = os.path.join(cache_dir, filename)
+    # Fetch the dataset
+    if not os.path.exists(file_path):
+        for attempt in range(5):
+            registry = zenodo_pooch(
+                record_id=15002591,
+                cache_name="pyorc",
+            )
+            try:
+                file_path = registry.fetch(filename, progressbar=True)
+                break
+            except Exception as e:
+                if attempt == 4:
+                    raise f"Download failed with error: {e}."
+                else:
+                    print(f"Download failed with error: {e}. Retrying...")
+                    time.sleep(1)
+        print(f"Hommerich video is available in {file_path}")
+    return file_path
+
+
+def get_hommerich_pyorc_files():
+    """Unzip hommerich pyorc files and return file list."""
+    zip_file = get_hommerich_pyorc_zip()
+    trg_dir = os.path.split(zip_file)[0]
+    if not os.path.exists(os.path.join(trg_dir, "hommerich.yml")):
+        # apparently the pyorc files are not yet preset. Unzip the record.
+        print("Unzipping sample data...")
+        with zipfile.ZipFile(zip_file, "r") as f:
+            f.extractall(trg_dir)
+    return trg_dir

{pyopenrivercam-0.9.0 → pyopenrivercam-0.9.2}/pyproject.toml

@@ -23,9 +23,12 @@ dependencies = [
     "matplotlib",
     "netCDF4",
     "numba>0.56",
-    "numpy>2",
+    "numpy==1.26.4; python_version == '3.9'",
+    "numpy>=2; python_version >= '3.10'",
     "opencv-python",
     "packaging; platform_machine == 'armv7l'",
+    "pillow==9.5.0; python_version == '3.9'",
+    "pillow; python_version >= '3.10'",
     "pip",
     "pyproj",
     "pythran; platform_machine == 'armv7l'",

pyopenrivercam-0.9.0/pyorc/sample_data.py

@@ -1,91 +0,0 @@
-"""Retrieval of sample dataset."""
-
-import os
-import time
-import zipfile
-
-
-def get_hommerich_dataset():
-    """Retrieve and cache sample dataset of Sheaf river."""
-    try:
-        import pooch
-    except ImportError:
-        raise ImportError("This function needs pooch. Install pyorc with pip install pyopenrivercam[extra]")
-
-    # Define the DOI link
-    filename = "20241010_081717.mp4"
-    base_url = "https://zenodo.org/records/15002591/files"
-    url = base_url + "/" + filename
-    print(f"Retrieving or providing cached version of dataset from {url}")
-    # Create a Pooch registry to manage downloads
-    registry = pooch.create(
-        # Define the cache directory
-        path=pooch.os_cache("pyorc"),
-        # Define the base URL for fetching data
-        base_url=base_url,
-        # Define the registry with the file we're expecting to download
-        registry={filename: None},
-    )
-    # Fetch the dataset
-    for attempt in range(5):
-        try:
-            file_path = registry.fetch(filename, progressbar=True)
-            break
-        except Exception as e:
-            if attempt == 4:
-                raise f"Download failed with error: {e}."
-            else:
-                print(f"Download failed with error: {e}. Retrying...")
-                time.sleep(1)
-    print(f"Hommerich video is available in {file_path}")
-    return file_path
-
-
-def get_hommerich_pyorc_zip():
-    """Retrieve and cache sample dataset of Sheaf river."""
-    try:
-        import pooch
-    except ImportError:
-        raise ImportError("This function needs pooch. Install pyorc with pip install pyopenrivercam[extra]")
-
-    # Define the DOI link
-    filename = "hommerich_20241010_081717_pyorc_data.zip.zip"
-    base_url = "https://zenodo.org/records/15002591/files"
-    url = base_url + "/" + filename
-    print(f"Retrieving or providing cached version of dataset from {url}")
-    # Create a Pooch registry to manage downloads
-    registry = pooch.create(
-        # Define the cache directory
-        path=pooch.os_cache("pyorc"),
-        # Define the base URL for fetching data
-        base_url=base_url,
-        # Define the registry with the file we're expecting to download
-        registry={filename: None},
-    )
-    # Fetch the dataset
-    file_path = registry.fetch(filename, progressbar=True)
-    # Fetch the dataset
-    for attempt in range(5):
-        try:
-            file_path = registry.fetch(filename, progressbar=True)
-            break
-        except Exception as e:
-            if attempt == 4:
-                raise f"Download failed with error: {e}."
-            else:
-                print(f"Download failed with error: {e}. Retrying...")
-                time.sleep(1)
-    print(f"Hommerich video is available in {file_path}")
-    return file_path
-
-
-def get_hommerich_pyorc_files():
-    """Unzip hommerich pyorc files and return file list."""
-    zip_file = get_hommerich_pyorc_zip()
-    trg_dir = os.path.split(zip_file)[0]
-    if not os.path.exists(os.path.join(trg_dir, "hommerich.yml")):
-        # apparently the pyorc files are not yet preset. Unzip the record.
-        print("Unzipping sample data...")
-        with zipfile.ZipFile(zip_file, "r") as f:
-            f.extractall(trg_dir)
-    return trg_dir