Skip to content

Commit 4ff25a2

Browse files
Merge branch 'main' into df/#164-psdm-em-changes
2 parents b98c372 + 7861b43 commit 4ff25a2

File tree

5 files changed

+57
-56
lines changed

5 files changed

+57
-56
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ updates:
88
open-pull-requests-limit: 10
99
target-branch: main
1010
labels:
11-
- "dependency"
11+
- "dependencies"

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v3
1717
- uses: actions/setup-python@v4
1818
with:
19-
python-version: '3.11'
19+
python-version: '3.12'
2020
#----------------------------------------------
2121
# load pip cache if cache exists
2222
#----------------------------------------------
@@ -40,7 +40,7 @@ jobs:
4040
fail-fast: true
4141
matrix:
4242
os: [ "ubuntu-latest", "windows-latest" ]
43-
python-version: [ "3.11"]
43+
python-version: [ "3.12"]
4444
runs-on: ${{ matrix.os }}
4545
defaults:
4646
run:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file.
2222
### Fixed
2323
- Fixed node identifier for plot of voltage over a branch [#240](https://github.com/ie3-institute/pypsdm/issue/240)
2424
- Fixed slack node identification if slack is not directly connected to a transformer [#238](https://github.com/ie3-institute/pypsdm/issue/238)
25+
- Fixed dependabot tag [#261](https://github.com/ie3-institute/pypsdm/issues/261)
2526

2627
## [0.0.3]
2728

poetry.lock

Lines changed: 52 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ loguru = "^0.7.2"
2525
sqlmodel = "^0.0.22"
2626
pyhocon = "^0.3.60"
2727
psycopg2 = "^2.9.9"
28-
numba = "^0.59.1"
28+
numba = "^0.61.0"
2929

3030
[tool.poetry.group.dev.dependencies]
3131
pytest = "^8.3.4"

0 commit comments

Comments
 (0)