Skip to content

Commit

Permalink
Merge branch 'main' into perf/datetime-parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
Aleksander-Karlsson authored Mar 6, 2025
2 parents 3af7a2b + f6b2704 commit 0b68b83
Show file tree
Hide file tree
Showing 239 changed files with 1,775 additions and 4,700 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
/src/ @equinor/ecalc-core-library-team
/tests/ @equinor/ecalc-core-library-team

/src/libecalc/version.py @equinor/ecalc-ops-team
pyproject.toml @equinor/ecalc-ops-team @equinor/ecalc-core-library-team

# Examples
/examples/ @equinor/ecalc-core-library-team

Expand Down
27 changes: 0 additions & 27 deletions .github/workflows/create-jira-release.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/lib-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
id: total
if: matrix.python-version == '3.11'
run: |
poetry run python -m coverage report --fail-under 45
poetry run python -m coverage report --fail-under 40
poetry run python -m coverage html -d build/
poetry run python -m coverage json -o build/coverage.json
echo '# Code Coverage Report\n See the index.html for a more detailed report.\n' >> build/README.md
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/on-push-any-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
tags-ignore:
- '**'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
pre-ci:
uses: ./.github/workflows/pre-ci.yml
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,3 @@ jobs:
secrets:
pypi_token: ${{ secrets.PYPI_TOKEN }}
if: ${{ needs.release-please.outputs.release_created }}

create-jira-release:
needs: release-please
if: ${{ needs.release-please.outputs.release_created }}
secrets:
jira_release_webhook: ${{ secrets.JIRA_RELEASE_WEBHOOK }}
uses: equinor/ecalc/.github/workflows/create-jira-release.yml@main
with:
tag: ${{ needs.release-please.outputs.tag_name }}
2 changes: 1 addition & 1 deletion docs/config/meta.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"current_index": -42}
{"current_index": -43}
28 changes: 28 additions & 0 deletions docs/docs/changelog/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
# Changelog

## [9.12.0](https://github.com/equinor/ecalc/compare/v9.11.0...v9.12.0) (2025-02-21)


### Features

* manually control java process for neqsim ([7b1ff3b](https://github.com/equinor/ecalc/commit/7b1ff3bf19328ed6307704e98550f19ac5d5c94a))
* re-introduce co2 intensity in results ([#788](https://github.com/equinor/ecalc/issues/788)) ([54bb7d8](https://github.com/equinor/ecalc/commit/54bb7d8e413a54e28469263a5dfe6b1041599e02))


### Documentation

* update changelog negative rates ([#799](https://github.com/equinor/ecalc/issues/799)) ([8a20828](https://github.com/equinor/ecalc/commit/8a208281cf418395093e8287285a4b6f8e69725c))


### Miscellaneous Chores

* invalidate negative fuel rates in direct consumer function ([#795](https://github.com/equinor/ecalc/issues/795)) ([6e5527a](https://github.com/equinor/ecalc/commit/6e5527af439d984c59780d9156ad18dacfe034a8))
* remove create-jira-release ([508a2f9](https://github.com/equinor/ecalc/commit/508a2f9801f6b73f0b2de25b2df057ee3ff05e4e))
* remove intensities from asset dto ([#798](https://github.com/equinor/ecalc/issues/798)) ([8a3fdba](https://github.com/equinor/ecalc/commit/8a3fdbae38e243c28a58ebb975cf66e5404c37ae))
* remove intensities from json results ([#796](https://github.com/equinor/ecalc/issues/796)) ([3f9cc78](https://github.com/equinor/ecalc/commit/3f9cc78db7987e3f4716bef0adfbeb3b4805551d))
* update code owners ([0e915a5](https://github.com/equinor/ecalc/commit/0e915a5cd50988aa60bb781bed15443edb4c2428))
* upgrade dependencies for week 08. Auto-generated by devCalc ([#797](https://github.com/equinor/ecalc/issues/797)) ([bb48332](https://github.com/equinor/ecalc/commit/bb48332213fdfca75d31386ae22c6954d2bec4a8))


### Tests

* test example cases validity ([2c5110d](https://github.com/equinor/ecalc/commit/2c5110d90965f574b1f123dc0196d644cdc96883))

## [9.11.0](https://github.com/equinor/ecalc/compare/v9.10.0...v9.11.0) (2025-02-14)


Expand Down
18 changes: 18 additions & 0 deletions docs/docs/changelog/v9-12.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
slug: "v9.12-release"
title: "v9.12"
authors: ecalc-team
tags: [release, eCalc]
sidebar_position: -42
---

# eCalc v9.12

## Features

* Mark negative fuel rates for fuel consumers with DIRECT type energy usage models as invalid.
DIRECT type models with negative fuel rates (fuel consumers) are now marked as invalid. Negative load values (electrical consumers) are not marked as invalid since that might be valid in some cases.

## Bug Fixes

## Breaking changes
5 changes: 3 additions & 2 deletions docs/drafts/next.draft.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ slug: "{{ version_slug }}"
title: "{{ version_title }}"
authors: ecalc-team
tags: [release, eCalc]
sidebar_position: -42
sidebar_position: -43
---

# eCalc {{ version }}
Expand All @@ -17,4 +17,5 @@ sidebar_position: -42
* Creation of time series resources now validates the correctness of the date/datetime.
All dates within a file must follow either a dayfirst (dd.mm.yyyy hh:mm:ss) or ISO8601 format (yyyy.mm.dd hh:mm:ss).
Mixing of datetime formats is not allowed.
If any one line includes time, all lines must conform. I.e. it's either all or none lines with time.
If any one line includes time, all lines must conform. I.e. it's either all or none lines with time.

7 changes: 3 additions & 4 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0b68b83

Please sign in to comment.