Skip to content

Commit bcf658b

Browse files
Merge branch 'main' into df/#360-vector-traces
# Conflicts: # CHANGELOG.md # docs/nbs/input_models.ipynb # docs/nbs/plotting_utilities.ipynb # docs/nbs/result_models.ipynb # poetry.lock
2 parents 53853db + f6726b0 commit bcf658b

File tree

10 files changed

+4108
-5123
lines changed

10 files changed

+4108
-5123
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ repos:
88
hooks:
99
- id: flake8
1010
- repo: https://github.com/PyCQA/isort
11-
rev: 5.10.1
11+
rev: 6.0.1
1212
hooks:
1313
- id: isort

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
77
### Added
88
- Add project-level `CLAUDE.md` file [#329](https://github.com/ie3-institute/pypsdm/issues/329)
99
- Adding congestion result handling [#198](https://github.com/ie3-institute/pypsdm/issues/198)
10+
- Add pre-commit hook for removing metadata from jupyter notebooks [#363](https://github.com/ie3-institute/pypsdm/issues/363)
1011
- Using `NBVAL` as validation for jupyter notebooks [#351](https://github.com/ie3-institute/pypsdm/issues/351)
1112
- Add colored Line Trace to plotting [#343](https://github.com/ie3-institute/pypsdm/issues/343)
1213
- Add functionality to plot line traces without mapbox as vector graphic [#360](https://github.com/ie3-institute/pypsdm/issues/360)
@@ -15,11 +16,13 @@ All notable changes to this project will be documented in this file.
1516

1617
### Removed
1718
- Removed duplicated code within `plots.grid` [#346](https://github.com/ie3-institute/pypsdm/issues/346)
19+
- Remove pre-commit hook for removing metadata from jupyter notebooks [#369](https://github.com/ie3-institute/pypsdm/issues/369)
1820

1921
### Fixed
2022
- Removed `q_characteristics` from `create_energy_management_systems_data` [#326](https://github.com/ie3-institute/pypsdm/issues/326)
2123
- Fix `emInput` from `parent_em` to `controlling_em` [#333](https://github.com/ie3-institute/pypsdm/issues/333)
2224
- Fix also from `em` to `controlling_em` for all `SystemParticipants` [#337](https://github.com/ie3-institute/pypsdm/issues/337)
25+
- Fix error in `filter_data_for_time_interval()` [#357](https://github.com/ie3-institute/pypsdm/issues/357)
2326

2427

2528
## 0.0.6

0 commit comments

Comments
 (0)