Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: switch to current Mesh 2.17 master build #539

Merged
merged 1 commit into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/install_dev_env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
- name: Installing poetry
uses: abatilo/actions-poetry@v2.0.0
with:
poetry-version: '1.7.1'
poetry-version: "1.7.1"

- name: Poetry install
run: poetry install
Expand All @@ -41,4 +41,4 @@ runs:
id: download-mesh-server
with:
GITHUB_TOKEN: ${{ inputs.token }}
MESH_SERVICE_TAG: 'v2.15.0.5'
MESH_SERVICE_TAG: "v2.17.0.2283"
10 changes: 5 additions & 5 deletions .github/workflows/usage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Usage

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]

workflow_dispatch:

Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:
id: download-mesh-server
with:
GITHUB_TOKEN: ${{ secrets.OAUTH_TOKEN }}
MESH_SERVICE_TAG: 'v2.15.0.5'
MESH_SERVICE_TAG: "v2.17.0.2283"

# run one example before installing pytest packages and pandas
# to check if all dependencies are installed together with Mesh Python SDK pip package
Expand All @@ -55,8 +55,8 @@ jobs:
uses: Vampire/setup-wsl@v1
with:
distribution: Ubuntu-22.04
set-as-default: 'true'
update: 'false'
set-as-default: "true"
update: "false"

# run one example before installing pytest packages and pandas
# to check if all dependencies are installed together with Mesh Python SDK pip package
Expand Down
9 changes: 8 additions & 1 deletion src/volue/mesh/tests/test_timeseries.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ def verify_physical_timeseries(reply_timeseries: Timeseries):
Verify if all time series properties and data have expected values.
"Model/SimpleThermalTestModel/ThermalComponent/SomePowerPlant1/SomePowerPlantChimney2.TsRawAtt"
"""
assert reply_timeseries.timskey == 3
assert reply_timeseries.resolution == Timeseries.Resolution.HOUR

assert type(reply_timeseries) is Timeseries
Expand Down Expand Up @@ -310,6 +309,13 @@ def test_read_physical_timeseries_points(session):
)
verify_physical_timeseries(reply_timeseries)

# If we are reading physical time series by time series attribute
# (path, ID or object) then no time series key is returned (meaning 0).
# If we are reading physical time series directly via time series key,
# then the key should be returned.
expected_timeseries_key = target if isinstance(target, int) else 0
assert reply_timeseries.timskey == expected_timeseries_key


@pytest.mark.database
def test_read_calculation_timeseries_points(session):
Expand Down Expand Up @@ -368,6 +374,7 @@ def test_read_timeseries_points_with_different_datetime_timezones(
TIME_SERIES_ATTRIBUTE_WITH_PHYSICAL_TIME_SERIES_PATH, start_time, end_time
)
verify_physical_timeseries(reply_timeseries)
assert reply_timeseries.timskey == 0


@pytest.mark.database
Expand Down
Loading