Merge branch 'dev' into v2.1

Author: kzscisoft

.github/workflows/test_client_ubuntu.yml

@@ -18,9 +18,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  online_unit_tests:
+  object_retrieval:
     runs-on: ubuntu-latest
-    timeout-minutes: 40
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python 3.13
@@ -40,12 +40,12 @@ jobs:
         SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
         SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
       run: >-
-        python -m pytest tests/unit/ -x
-        -m online -c /dev/null -p no:warnings
+        python -m pytest -x
+        -m object_retrieval -c /dev/null -p no:warnings
         -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
-  offline_unit_tests:
+  object_removal:
     runs-on: ubuntu-latest
-    timeout-minutes: 40
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python 3.13
@@ -65,12 +65,12 @@ jobs:
         SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
         SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
       run: >-
-        python -m pytest tests/unit/ -x
-        -m offline -c /dev/null -p no:warnings
+        python -m pytest -x
+        -m object_removal -c /dev/null -p no:warnings
         -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
-  online_functional_tests:
+  dispatch_tests:
     runs-on: ubuntu-latest
-    timeout-minutes: 40
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python 3.13
@@ -82,20 +82,19 @@ jobs:
         python -m pip install poetry
         poetry self add poetry-plugin-export
         poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
-        python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
         python -m pip install -r requirements.txt
         python -m pip install .
     - name: Test with pytest
       env:
         SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
         SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
       run: >-
-        python -m pytest tests/functional/ -x
-        -m online -m "not eco" -c /dev/null -p no:warnings
+        python -m pytest -x
+        -m dispatch -c /dev/null -p no:warnings
         -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
-  offline_functional_tests:
+  run_tests_online:
     runs-on: ubuntu-latest
-    timeout-minutes: 40
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python 3.13
@@ -115,12 +114,12 @@ jobs:
         SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
         SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
       run: >-
-        python -m pytest tests/functional/ -x
-        -m offline -c /dev/null -p no:warnings
+        python -m pytest -x
+        -m run -m online -c /dev/null -p no:warnings
         -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
-  other_unit_tests:
+  run_tests_offline:
     runs-on: ubuntu-latest
-    timeout-minutes: 40
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python 3.13
@@ -140,13 +139,84 @@ jobs:
         SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
         SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
       run: >-
-        python -m pytest tests/unit/ -x
-        -m 'not offline' -m 'not online'
-        -m 'not scenario' -c /dev/null
-        -p no:warnings -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
-  other_functional_tests:
+        python -m pytest -x
+        -m run -m offline -c /dev/null -p no:warnings
+        -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
+  config_tests:
     runs-on: ubuntu-latest
-    timeout-minutes: 40
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.13"
+    - name: Install dependencies
+      run: |
+        python -m pip install poetry
+        poetry self add poetry-plugin-export
+        poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
+        python -m pip install -r requirements.txt
+        python -m pip install .
+    - name: Test with pytest
+      env:
+        SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
+        SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
+      run: >-
+        python -m pytest -x
+        -m config -c /dev/null -p no:warnings
+        -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
+  executor_tests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.13"
+    - name: Install dependencies
+      run: |
+        python -m pip install poetry
+        poetry self add poetry-plugin-export
+        poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
+        python -m pip install -r requirements.txt
+        python -m pip install .
+    - name: Test with pytest
+      env:
+        SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
+        SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
+      run: >-
+        python -m pytest -x
+        -m executor -c /dev/null -p no:warnings
+        -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
+  api_tests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.13"
+    - name: Install dependencies
+      run: |
+        python -m pip install poetry
+        poetry self add poetry-plugin-export
+        poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
+        python -m pip install -r requirements.txt
+        python -m pip install .
+    - name: Test with pytest
+      env:
+        SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
+        SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
+      run: >-
+        python -m pytest -x
+        -m api -c /dev/null -p no:warnings
+        -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
+  local_tests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python 3.13
@@ -158,15 +228,13 @@ jobs:
         python -m pip install poetry
         poetry self add poetry-plugin-export
         poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
-        python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
         python -m pip install -r requirements.txt
         python -m pip install .
     - name: Test with pytest
       env:
         SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
         SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
       run: >-
-        python -m pytest tests/functional/ -x
-        -m 'not offline' -m 'not online'
-        -m 'not scenario' -c /dev/null
-        -p no:warnings -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
+        python -m pytest -x
+        -m local -c /dev/null -p no:warnings
+        -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache

.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
         args: [--branch, main, --branch, dev]
       - id: check-added-large-files
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.13
+    rev: v0.12.0
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix, "--ignore=C901" ]
@@ -35,7 +35,7 @@ repos:
         pass_filenames: false
 
   - repo: https://github.com/PyCQA/bandit.git
-    rev: 1.8.4
+    rev: 1.8.5
     hooks:
     -   id: bandit
         args: [-lll, --recursive, clumper]

CHANGELOG.md

@@ -1,9 +1,12 @@
 # Change log
-## Unreleased
+## [v2.1.2](https://github.com/simvue-io/client/releases/tag/v2.1.2) - 2025-06-25
 * Fixed issue in downloading files from tenant runs.
 * Fixed bug in pagination whereby the count value specified by the user is ignored.
 * Fixed bug where uploading larger files timed out leading to file of size 0B.
 * Fixed bug where if the range or threshold of an alert is zero the alert type validation fails.
+* Fixed bug in `Folder.ids` where `kwargs` were not being passed to `GET`.
+* Ensured all threads have `daemon=True` to prevent hanging on termination.
+* Added error when `close()` method is called within the `simvue.Run` context manager.
 ## [v2.1.1](https://github.com/simvue-io/client/releases/tag/v2.1.1) - 2025-04-25
 * Changed from CO2 Signal to ElectricityMaps
 * Fixed a number of bugs in how offline mode is handled with emissions

CITATION.cff

@@ -42,6 +42,6 @@ keywords:
   - alerting
   - simulation
 license: Apache-2.0
-commit: f1bde5646b33f01ec15ef72a0c5843c1fe181ac1
-version: 2.1.1
-date-released: '2025-04-25'
+commit: b334b61dba33a76acef1e9fa9df0f0d394beb4de
+version: 2.1.2
+date-released: '2025-06-25'