Skip to content

Commit ef31da8

Browse files
kzscisoftkzscisoft
committed
Merge branch 'v2.1'
2 parents 6e483c9 + 8f0251e commit ef31da8

29 files changed

+1498
-926
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
## Description of Bug
11+
A clear and concise description of what the bug is.
12+
13+
## Steps To Reproduce
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
## Expected behavior
21+
A clear and concise description of what you expected to happen.
22+
23+
## Actual Behaviour
24+
A clear and concise description of what you actually see happen.
25+
26+
## Screenshots
27+
If applicable, add screenshots to help explain your problem.
28+
29+
## Setup
30+
- OS: [e.g. Windows 11]
31+
- Python version [e.g. v3.13.3]
32+
33+
## Additional context
34+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest a new feature or enhancement to add to the Python API
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
## Problem Statement
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
## Solution
14+
A clear and concise description of what you want to happen.
15+
16+
## Alternatives Considered
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
## Additional Context
20+
Add any other context or screenshots about the feature request here.

‎.github/workflows/test_client_macos_nightlies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
env:
3636
SIMVUE_URL: ${{ secrets.SIMVUE_NIGHTLY_URL }}
3737
SIMVUE_TOKEN: ${{ secrets.SIMVUE_NIGHTLY_TOKEN }}
38-
run: python -m pytest tests/ -m 'not scenario'
38+
run: python -m pytest tests/ -m 'not scenario' -c /dev/null -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache

‎.github/workflows/test_client_ubuntu.yml

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ jobs:
3939
env:
4040
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
4141
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
42-
run: python -m pytest tests/unit/ -x -m online -c /dev/null -p no:warnings -n 0 -v
42+
run: >-
43+
python -m pytest tests/unit/ -x
44+
-m online -c /dev/null -p no:warnings
45+
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
4346
offline_unit_tests:
4447
runs-on: ubuntu-latest
4548
timeout-minutes: 40
@@ -61,7 +64,10 @@ jobs:
6164
env:
6265
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
6366
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
64-
run: python -m pytest tests/unit/ -x -m offline -c /dev/null -p no:warnings -n 0 -v
67+
run: >-
68+
python -m pytest tests/unit/ -x
69+
-m offline -c /dev/null -p no:warnings
70+
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
6571
online_functional_tests:
6672
runs-on: ubuntu-latest
6773
timeout-minutes: 40
@@ -83,7 +89,10 @@ jobs:
8389
env:
8490
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
8591
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
86-
run: python -m pytest tests/functional/ -x -m online -c /dev/null -p no:warnings -n 0 -v
92+
run: >-
93+
python -m pytest tests/functional/ -x
94+
-m online -m "not eco" -c /dev/null -p no:warnings
95+
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
8796
offline_functional_tests:
8897
runs-on: ubuntu-latest
8998
timeout-minutes: 40
@@ -105,7 +114,10 @@ jobs:
105114
env:
106115
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
107116
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
108-
run: python -m pytest tests/functional/ -x -m offline -c /dev/null -p no:warnings -n 0 -v
117+
run: >-
118+
python -m pytest tests/functional/ -x
119+
-m offline -c /dev/null -p no:warnings
120+
-n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
109121
other_unit_tests:
110122
runs-on: ubuntu-latest
111123
timeout-minutes: 40
@@ -127,7 +139,11 @@ jobs:
127139
env:
128140
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
129141
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
130-
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
142+
run: >-
143+
python -m pytest tests/unit/ -x
144+
-m 'not offline' -m 'not online'
145+
-m 'not scenario' -c /dev/null
146+
-p no:warnings -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache
131147
other_functional_tests:
132148
runs-on: ubuntu-latest
133149
timeout-minutes: 40
@@ -149,4 +165,8 @@ jobs:
149165
env:
150166
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
151167
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
152-
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
168+
run: >-
169+
python -m pytest tests/functional/ -x
170+
-m 'not offline' -m 'not online'
171+
-m 'not scenario' -c /dev/null
172+
-p no:warnings -n 0 -v -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache

‎.github/workflows/test_client_ubuntu_nightlies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ jobs:
3838
env:
3939
SIMVUE_URL: ${{ secrets.SIMVUE_NIGHTLY_URL }}
4040
SIMVUE_TOKEN: ${{ secrets.SIMVUE_NIGHTLY_TOKEN }}
41-
run: python -m pytest tests/ -m 'not scenario'
41+
run: python -m pytest tests/ -m 'not scenario' -c /dev/null -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache

‎.github/workflows/test_multiple_python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ jobs:
4040
env:
4141
SIMVUE_URL: ${{ secrets.SIMVUE_NIGHTLY_URL }}
4242
SIMVUE_TOKEN: ${{ secrets.SIMVUE_NIGHTLY_TOKEN }}
43-
run: python -m pytest tests/ -m 'not scenario'
43+
run: python -m pytest tests/ -m 'not scenario' -c /dev/null -o cache_dir=${GITHUB_WORKSPACE}/.pytest-cache

‎.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repos:
2323
args: [--branch, main, --branch, dev]
2424
- id: check-added-large-files
2525
- repo: https://github.com/astral-sh/ruff-pre-commit
26-
rev: v0.11.4
26+
rev: v0.11.13
2727
hooks:
2828
- id: ruff
2929
args: [ --fix, --exit-non-zero-on-fix, "--ignore=C901" ]
@@ -35,7 +35,7 @@ repos:
3535
pass_filenames: false
3636

3737
- repo: https://github.com/PyCQA/bandit.git
38-
rev: 1.8.3
38+
rev: 1.8.4
3939
hooks:
4040
- id: bandit
4141
args: [-lll, --recursive, clumper]

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# Change log
2+
## Unreleased
3+
* Fixed issue in downloading files from tenant runs.
4+
* Fixed bug in pagination whereby the count value specified by the user is ignored.
5+
* Fixed bug where uploading larger files timed out leading to file of size 0B.
6+
* Fixed bug where if the range or threshold of an alert is zero the alert type validation fails.
27
## [v2.1.1](https://github.com/simvue-io/client/releases/tag/v2.1.1) - 2025-04-25
38
* Changed from CO2 Signal to ElectricityMaps
49
* Fixed a number of bugs in how offline mode is handled with emissions

0 commit comments

Comments
 (0)