Skip to content

Commit 1311e53

Browse files
Merge branch 'main' into df/#341-diff-test
# Conflicts: # CHANGELOG.md # docs/nbs/result_models.ipynb
2 parents 9dc7e6b + eccc964 commit 1311e53

File tree

7 files changed

+3578
-3444
lines changed

7 files changed

+3578
-3444
lines changed

.pre-commit-config.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,16 @@ repos:
1010
- repo: https://github.com/PyCQA/isort
1111
rev: 6.0.1
1212
hooks:
13-
- id: isort
13+
- id: isort
14+
repo:
15+
- repo: https://github.com/srstevenson/nb-clean
16+
rev: 4.0.1
17+
hooks:
18+
- id: nb-clean
19+
args:
20+
- clean
21+
- --remove-empty-cells
22+
- --preserve-cell-outputs
23+
- --preserve-execution-count
24+
- --
25+
- docs/nbs/*

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ All notable changes to this project will be documented in this file.
99
- Adding congestion result handling [#198](https://github.com/ie3-institute/pypsdm/issues/198)
1010
- Add pre-commit hook for removing metadata from jupyter notebooks [#363](https://github.com/ie3-institute/pypsdm/issues/363)
1111
- Using `NBVAL` as validation for jupyter notebooks [#351](https://github.com/ie3-institute/pypsdm/issues/351)
12+
- Switch to `nb-clean` for removing metadata from jupyter notebooks [#365](https://github.com/ie3-institute/pypsdm/issues/365)
1213
- Add example for Line Results to documentation [#341](https://github.com/ie3-institute/pypsdm/issues/341)
1314

1415
### Changed
16+
- Move `NBVAL` to dev dependencies [#374](https://github.com/ie3-institute/pypsdm/issues/374)
1517

1618
### Removed
1719
- Removed duplicated code within `plots.grid` [#346](https://github.com/ie3-institute/pypsdm/issues/346)

0 commit comments

Comments
 (0)