Skip to content

Commit 062b5d8

Browse files
committed
fixing conflict with master [skip ci]
Signed-off-by: DONNOT Benjamin <[email protected]>
2 parents 0ed82aa + 1257eef commit 062b5d8

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
steps:
5353

5454
- name: Checkout sources
55-
uses: actions/checkout@v3
55+
uses: actions/checkout@v4
5656
with:
5757
submodules: true
5858

@@ -86,7 +86,7 @@ jobs:
8686
ls ./dist/*.whl
8787

8888
- name: Upload wheel
89-
uses: actions/upload-artifact@v3
89+
uses: actions/upload-artifact@v4
9090
with:
9191
name: grid2op-wheel-${{ matrix.config.name }}-${{ matrix.python.name }}
9292
path: dist/*.whl
@@ -134,7 +134,7 @@ jobs:
134134
steps:
135135

136136
- name: Checkout sources
137-
uses: actions/checkout@v3
137+
uses: actions/checkout@v4
138138
with:
139139
submodules: true
140140

@@ -212,7 +212,7 @@ jobs:
212212
steps:
213213

214214
- name: Checkout sources
215-
uses: actions/checkout@v3
215+
uses: actions/checkout@v4
216216
with:
217217
submodules: true
218218

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ Native multi agents support:
176176
that allows not to recompute it over and over again (this is internal API please do not change
177177
it... unless you know what you are doing)
178178

179+
[1.10.5] - 2025-03-07
180+
------------------------
181+
- [FIXED] force pandapower < 3 otherwise pandapower backend does not work and
182+
lots of tests are failing.
179183

180184
[1.10.4] - 2024-10-15
181185
-------------------------

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
author = 'Benjamin Donnot'
2323

2424
# The full version, including alpha/beta/rc tags
25-
release = '1.11.0.dev3'
25+
release = '1.11.0.dev4'
2626
version = '1.11'
2727

2828

grid2op/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Grid2Op a testbed platform to model sequential decision making in power systems.
1212
"""
1313

14-
__version__ = '1.11.0.dev3'
14+
__version__ = '1.11.0.dev4'
1515

1616
__all__ = [
1717
"Action",

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def my_test_suite():
2626
"numpy",
2727
"scipy>=1.4.1",
2828
"pandas>=1.0.3",
29-
"pandapower>=2.2.2",
29+
"pandapower>=2.2.2,<3",
3030
"tqdm>=4.45.0",
3131
"networkx>=2.4",
3232
"requests>=2.23.0",

0 commit comments

Comments
 (0)