terraingenpy 0.2.0.dev114__tar.gz → 0.2.0.dev115__tar.gz

{terraingenpy-0.2.0.dev114 → terraingenpy-0.2.0.dev115}/.github/workflows/ci.yml

@@ -265,6 +265,10 @@ jobs:
           python -m pip install wheel/*.whl -r docs/requirements.txt
       - name: Build
         run: make -C docs build
+      - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.cache/terraingen/assets
+          key: gallery-assets-${{ hashFiles('docs/gallery/assets.py') }}
       - name: Gallery scripts run
         run: make -C docs gallery-check
       - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2

{terraingenpy-0.2.0.dev114 → terraingenpy-0.2.0.dev115}/CMakeLists.txt

@@ -10,7 +10,7 @@ endif()
 
 # The release being worked toward, such as 0.1.0, or for a development build a PEP 440 pre-release of
 # it, such as 0.1.0.dev42, which only the Python package carries.
-set(TERRAINGEN_FULL_VERSION "0.2.0.dev114")
+set(TERRAINGEN_FULL_VERSION "0.2.0.dev115")
 string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" TERRAINGEN_VERSION "${TERRAINGEN_FULL_VERSION}")
 
 project(

{terraingenpy-0.2.0.dev114 → terraingenpy-0.2.0.dev115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: terraingenpy
-Version: 0.2.0.dev114
+Version: 0.2.0.dev115
 Summary: Scientific terrain generation for planetary surfaces
 Keywords: terrain,moon,mars,craters,planetary science,simulation
 Author: Alex Maietta

{terraingenpy-0.2.0.dev114 → terraingenpy-0.2.0.dev115}/docs/gallery/assets.py

@@ -15,6 +15,8 @@ import hashlib
 import os
 import pathlib
 import sys
+import time
+import urllib.error
 import urllib.request
 from dataclasses import dataclass
 
@@ -82,6 +84,22 @@ def digest(path):
     return hasher.hexdigest()
 
 
+def download(url, path, attempts=4):
+    """Writes the file at `url` to `path`, retrying with backoff; raises RuntimeError naming the
+    URL when every attempt fails."""
+    request = urllib.request.Request(url, headers={"User-Agent": "terraingen-docs"})
+    for attempt in range(attempts):
+        try:
+            with urllib.request.urlopen(request, timeout=60) as response, open(path, "wb") as file:
+                for block in iter(lambda: response.read(1 << 20), b""):
+                    file.write(block)
+            return
+        except (urllib.error.URLError, TimeoutError) as error:
+            if attempt + 1 == attempts:
+                raise RuntimeError(f"{url}: {error}") from None
+            time.sleep(5 * 2**attempt)
+
+
 def fetch(asset):
     """The path of `asset`, downloading it into the cache first when missing. The download goes
     to a .part file of this process, so gallery workers fetching the same asset at once do not
@@ -95,10 +113,7 @@ def fetch(asset):
     path.parent.mkdir(parents=True, exist_ok=True)
     partial = path.with_name(f"{path.name}.{os.getpid()}.part")
     print(f"downloading {asset.url} ({asset.size / 1e6:.1f} MB) to {path}", file=sys.stderr)
-    request = urllib.request.Request(asset.url, headers={"User-Agent": "terraingen-docs"})
-    with urllib.request.urlopen(request, timeout=60) as response, open(partial, "wb") as file:
-        for block in iter(lambda: response.read(1 << 20), b""):
-            file.write(block)
+    download(asset.url, partial)
     size = partial.stat().st_size
     if size != asset.size:
         partial.unlink()

{terraingenpy-0.2.0.dev114 → terraingenpy-0.2.0.dev115}/docs/gallery/gallery.py

@@ -336,6 +336,14 @@ def downloads_needed(path):
     return any(assets.cached(asset) is None for asset in getattr(load(path), "ASSETS", []))
 
 
+def fetch_assets(paths):
+    """Downloads the data files the scripts at `paths` read, once each, before any renders."""
+    import assets
+
+    for asset in {asset for path in paths for asset in getattr(load(path), "ASSETS", [])}:
+        assets.fetch(asset)
+
+
 def render(path, quick=False):
     """The figure the script at `path` makes."""
     module = load(path)
@@ -376,6 +384,7 @@ def main(argv=None):
             print("skipped", name, "(its data files are not downloaded; run docs/gallery/assets.py)")
             continue
         todo.append((path, image_path(name, args.output_dir), args.quick))
+    fetch_assets(path for path, _, _ in todo)
     if args.jobs == 1 or len(todo) <= 1:
         return [save(*job) for job in todo]
     context = multiprocessing.get_context("spawn")