Merge pull request #773 from maresb/fix-ci

Fix new CI failures

Author: maresb

.github/workflows/integration-test.yml

@@ -55,7 +55,7 @@ jobs:
           pipx install -e .
       - name: run-test
         run: |
-          conda-lock --log-level=DEBUG --mamba -f tests/gdal/environment.yml -p $CONDA_PLATFORM
+          conda-lock --log-level=DEBUG --micromamba -f tests/gdal/environment.yml -p $CONDA_PLATFORM
           conda-lock render -p $CONDA_PLATFORM
           conda-lock render -p $CONDA_PLATFORM --kind=env
           cat conda-$CONDA_PLATFORM.lock

conda_lock/conda_solver.py

@@ -387,8 +387,8 @@ def print_proc(proc: subprocess.CompletedProcess) -> None:
     try:
         dryrun_install: DryRunInstall = json.loads(extract_json_object(proc.stdout))
         return _reconstruct_fetch_actions(conda, platform, dryrun_install)
-    except json.JSONDecodeError:
-        raise
+    except json.JSONDecodeError as e:
+        raise RuntimeError(f"Failed to parse json: '{proc.stdout}'") from e
 
 
 def update_specs_for_arch(

tests/durations/README.md

@@ -6,5 +6,8 @@ running from GitHub Actions.
 They should occasionally be replaced so that the split remains optimal.
 (Tests that are missing from this list will be assigned the average duration.)
 
+The JSON files are generated during the pytest runs on GitHub.
+They are aggregated in the "Aggregate test durations" job, and available for download as the `aggregated-test-durations` artifact.
+
 For more details, see the
 [pytest-split documentation](https://jerry-git.github.io/pytest-split/).