release 0.12.20: parseable metadata, grouped output layers, curated committed settings

Author: songololo

.claude/settings.json

@@ -1,34 +1,17 @@
 {
   "permissions": {
     "allow": [
-      "Bash(uv run ruff check *)",
-      "Bash(uv run poe typecheck)",
-      "Bash(uv run poe lint)",
-      "Bash(uv run ty check *)",
-      "Bash(uv run poe audit)",
-      "Bash(uv run coverage report *)",
+      "Bash(.venv/bin/ruff check *)",
+      "Bash(.venv/bin/python -m pytest *)",
+      "Bash(.venv/bin/python scripts/verify.py)",
+      "Bash(.venv/bin/python scripts/prose_lint.py *)",
       "Bash(.venv/bin/python scripts/render_scenario_gallery.py)",
-      "Bash(bash /Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin/temp/slope_batch.sh)",
-      "Bash(bash /Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin/temp/rerender_batch.sh)",
-      "Bash(bash /Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin/temp/dlbar_batch.sh)",
-      "Bash(bash /Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin/temp/wrap_batch.sh)",
-      "Bash(/Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin/.venv/bin/python /Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin/temp/wrap.py)",
-      "Bash(git -C /Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin log --oneline -15)",
-      "Bash(git -C /Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin tag)",
-      "Bash(gh api *)",
+      "Bash(.venv/bin/python website/scripts/diagrams.py)",
+      "Bash(.venv/bin/python website/scripts/demonstrators.py)",
       "Bash(cargo test *)",
-      "Bash(git -C /Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin log --oneline -S \"member_offset\" -- core)",
-      "Bash(unzip -l /Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin/website/public/scenarios/cambourne.zip)",
-      "Bash(curl -s \"https://api.github.com/repos/mitochevole/isobenefit-cities/git/trees/master?recursive=1\")",
-      "Bash(curl -s \"https://raw.githubusercontent.com/mitochevole/isobenefit-cities/master/src/land_map.py\" -o /private/tmp/claude-502/-Users-dev-repos-ucl-BSP-isobenefit-qgis-plugin/f25e95a8-8860-4c14-a856-d62e715444a1/scratchpad/land_map.py)",
-      "Bash(curl -s \"https://raw.githubusercontent.com/mitochevole/isobenefit-cities/master/src/simulation.py\" -o /private/tmp/claude-502/-Users-dev-repos-ucl-BSP-isobenefit-qgis-plugin/f25e95a8-8860-4c14-a856-d62e715444a1/scratchpad/simulation.py)",
-      "Bash(curl -s \"https://raw.githubusercontent.com/mitochevole/isobenefit-cities/master/README.md\" -o /private/tmp/claude-502/-Users-dev-repos-ucl-BSP-isobenefit-qgis-plugin/f25e95a8-8860-4c14-a856-d62e715444a1/scratchpad/orig_README.md)",
-      "Bash(.venv/bin/python -m pytest core/tests_py -q)",
-      "Read(//Users/dev/.local/share/uv/python/cpython-3.10.20-macos-aarch64-none/bin/**)",
-      "Bash(/Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin/.venv/bin/python -c \"import isobenefit; print\\(isobenefit.__version__\\)\")",
-      "Bash(git -C /Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin tag --sort=-creatordate)",
-      "Bash(/Users/dev/repos/ucl/BSP-isobenefit-qgis-plugin/.venv/bin/python /private/tmp/claude-502/-Users-dev-repos-ucl-BSP-isobenefit-qgis-plugin/f25e95a8-8860-4c14-a856-d62e715444a1/scratchpad/check_periphery.py)",
-      "WebFetch(domain:pubmed.ncbi.nlm.nih.gov)"
+      "Bash(cargo fmt *)",
+      "Bash(cargo clippy *)",
+      "Bash(npm run build)"
     ]
   },
   "hooks": {

.gitignore

@@ -140,3 +140,7 @@ _overpass_cache.xml
 
 # scenario data ZIPs are published site content, not build artefacts
 !website/public/scenarios/*.zip
+
+# Claude Code per-user grants and worktrees stay local
+.claude/settings.local.json
+.claude/worktrees/

core/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "isobenefit"
-version = "0.12.19"
+version = "0.12.20"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 description = "Rust simulation core for the Isobenefit Urbanism QGIS plugin"

core/Cargo.toml

@@ -3,7 +3,7 @@ name=Isobenefit Urbanism
 qgisMinimumVersion=4.0
 qgisMaximumVersion=4.99
 description=Sketch walkable urban growth scenarios on real-world data, after D'Acci's Isobenefit Urbanism: every new home within a walk of a mixed-use centre and of green space.
-version=0.12.19
+version=0.12.20
 author=Gareth Simons
 email=gareth.simons@ucl.ac.uk
 
@@ -22,13 +22,14 @@ deprecated=False
 server=False
 
 changelog=
+    0.12.20 Metadata made parseable by the plugin repository (a stray percent sign rejected the 0.12.19 upload); the release check now parses it the same way the repository does. A run's output layers load as one group named for the output folder and run, so successive runs stay organised in the layers pane.
     0.12.19 The run dialog, the message bar and the guide all point at the Isobenefit tab of the Log Messages panel, where a running simulation reports per-stage progress and warnings.
-    0.12.18 Post-processing candidates run about twice as fast again (component labelling joins the walk field in the engine; the placement stack caches its columns), and the progress bar now gives the selection stage the 40-99% band it actually occupies.
+    0.12.18 Post-processing candidates run about twice as fast again (component labelling joins the walk field in the engine; the placement stack caches its columns), and the progress bar now gives the selection stage the larger share of the bar it actually occupies.
     0.12.17 Post-processing is engine-accelerated and barrier-aware: the walk field is computed by the Rust engine (a large window post-processes in under a minute), and scoring walks now detour around water and carved corridors exactly as growth does (they previously crossed them). Requires engine 0.12.17; the plugin prompts for the upgrade.
     0.12.16 With an OSM download in the project, the run dialog pre-fills the output folder as a scenarios folder beside the downloaded data, numbered upward when earlier runs exist. A chosen folder is never overwritten.
     0.12.15 One distance model: bounded grid walks everywhere, in growth and in scoring. Street-network routing removed (a new settlement has no streets yet, so a network metric measured new and existing fabric on different terms); the streets layer stays as map context and the source of carved barrier corridors. Centre placement is settlement-local: a centre is positioned only by homes in its own contiguous settlement, so it cannot be dragged to a periphery cell facing a green gap. Scenario panels colour slope-excluded land tan, distinct from water and corridors. Plugin unload no longer errors after a finished run.
     0.12.14 Centre refinement caches walk fields by coordinate across the whole ensemble: post-processing a many-centre window drops from ~40 s to ~3 s per candidate with identical results. Selection progress logs every candidate.
-    0.12.13 The post-processing selection reports progress, honours Cancel, and runs in two phases when a street network is supplied (every run ranked by the grid walk, the leaders re-scored along the network), so large windows finish in minutes rather than sitting silent at 90%.
+    0.12.13 The post-processing selection reports progress, honours Cancel, and runs in two phases when a street network is supplied (every run ranked by the grid walk, the leaders re-scored along the network), so large windows finish in minutes rather than sitting silent near the end of the bar.
     0.12.12 Defaults grounded in practice: 800 m centre walk (a ten-minute walk) and 400 m green walk (the WHO/Natural England everyday-green reach); the minimum settlement is now a population (default 1,000 people) rather than an area; new development must earn its own mixed-use centres (a nearby existing centre no longer stands in, so growth cannot sprawl centre-free along existing fabric); scenario downloads fixed on the website; one consolidated Dnipro scenario; distances, barriers and station handling documented in the guide.
     0.12.11 Growth no longer stands off carved road, rail and river corridors: a green strip bounded by unbuildable land is exempt from the minimum-span rule, so development can build up to a barrier while green corridors between developments stay protected. Seeding diagrams and probability mechanics documented on the website; growth troubleshooting added to the guide.
     0.12.10 First public beta, for QGIS 4. Earlier development history is recorded in the repository.

isobenefit_qgis/metadata.txt

@@ -89,6 +89,9 @@ def __init__(
         self.pre_path = str(Path(out_dir_path) / f"{out_file_name}_pre.tif")  # raw CA, pre-processing
         self.existing_path = str(Path(out_dir_path) / f"{out_file_name}_existing.tif")  # pre-simulation fabric
         self.report_path = str(Path(out_dir_path) / f"{out_file_name}_report.txt")  # human-readable run record
+        # the output layers group under "<folder> - <run>", so successive runs (scenarios,
+        # scenarios_2, ...) stay organised by their folder in the layers pane
+        self.group_name = f"{Path(out_dir_path).name} \u2014 {out_file_name}"
         self.target_crs = target_crs
         # snapshot every input layer while still on the main thread (see _snapshot)
         self.extents_layer = _snapshot(extents_layer)
@@ -627,7 +630,7 @@ def finished(self, result: bool) -> None:
             return
         if self.is_ensemble:
             root = QgsProject.instance().layerTreeRoot()
-            group = root.insertGroup(0, f"{self.out_file_name} likelihood")
+            group = root.insertGroup(0, self.group_name)
             group.setExpanded(True)
             for band, label in [(1, "built"), (2, "green")]:
                 lyr = QgsRasterLayer(self.out_path, f"{self.out_file_name} — {label} likelihood", "gdal")
@@ -680,7 +683,11 @@ def finished(self, result: bool) -> None:
         tprops.setFixedRangePerBand(ranges)
         tprops.setIsActive(True)
 
-        QgsProject.instance().addMapLayer(layer)
+        root = QgsProject.instance().layerTreeRoot()
+        group = root.insertGroup(0, self.group_name)
+        group.setExpanded(True)
+        QgsProject.instance().addMapLayer(layer, addToLegend=False)
+        group.addLayer(layer)
         self._setup_temporal_controller(start, n)
         self._log(
             f"Loaded '{self.out_file_name}' with {n} temporal steps — press play in the Temporal Controller.",

isobenefit_qgis/sim_runner.py

@@ -1,6 +1,6 @@
 [project]
 name = "isobenefit-qgis-plugin"
-version = "0.12.19"
+version = "0.12.20"
 description = "QGIS plugin for Isobenefit Urbanism simulation (thin wrapper over the isobenefit engine)."
 authors = [{ name = "Gareth Simons", email = "gareth.simons@ucl.ac.uk" }]
 requires-python = ">=3.9"

pyproject.toml

@@ -23,6 +23,14 @@
     ("cargo test", ["cargo", "test", "--manifest-path", "core/Cargo.toml"], REPO),
     ("ruff", [RUFF, "check", "isobenefit_qgis", "tests", "scripts"], REPO),
     ("prose lint", [PY, "scripts/prose_lint.py", "--all"], REPO),
+    # plugins.qgis.org parses metadata.txt with configparser (interpolation ON), so a bare
+    # % in any value rejects the upload; parsing here catches that before a tag
+    ("metadata parse", [
+        PY, "-c",
+        "import configparser; c = configparser.ConfigParser(); "
+        "c.read('isobenefit_qgis/metadata.txt'); "
+        "[c.get('general', k) for k in c.options('general')]",
+    ], REPO),
     ("pytest", [PY, "-m", "pytest", "tests", "core/tests_py", "-q"], REPO),
     ("astro check", ["npx", "astro", "check"], WEB),
     ("astro build", ["npm", "run", "build"], WEB),