Skip to content

Commit

Permalink
Merge pull request #564 from BDonnot/bd_dev
Browse files Browse the repository at this point in the history 
Bd dev
  • Loading branch information
@BDonnot
BDonnot authored Dec 1, 2023
2 parents 8bb7132 + 8cb71a0 commit 40ece87
Show file tree
Hide file tree
Showing 12 changed files with 202 additions and 308 deletions.
236 changes: 118 additions & 118 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ version: 2.1
executors:
grid2op-executor:
docker:
- image: python:3.10-buster
- image: python:3.10
working_directory: /Grid2Op

python37:
docker:
- image: python:3.7-buster
- image: python:3.7
python38:
docker:
- image: python:3.8-buster
- image: python:3.8
python39:
docker:
- image: python:3.9-buster
- image: python:3.9
python310:
docker:
- image: python:3.10-buster
- image: python:3.10
python311:
docker:
- image: python:3.11-buster
- image: python:3.11
python312:
docker:
- image: cimg/python:3.12.0
- image: cimg/python:3.12

jobs:
test:
Expand Down Expand Up @@ -140,27 +140,27 @@ jobs:
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.21,<1.22"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.22,<1.23"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.23,<1.24"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.21,<1.22"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.22,<1.23"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.23,<1.24"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
Expand All @@ -187,53 +187,53 @@ jobs:
python -m pip install -U pip setuptools wheel
python -m pip install chronix2grid>="1.1.0.post1"
python -m pip uninstall -y grid2op
- run:
command: |
source venv_test/bin/activate
python -m pip install -U numba
python -m pip install -U .[test]
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.20,<1.21"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.21,<1.22"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.22,<1.23"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.23,<1.24"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.24,<1.25"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.25,<1.26"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U numba
# python -m pip install -U .[test]
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.20,<1.21"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.21,<1.22"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.22,<1.23"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.23,<1.24"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.24,<1.25"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.25,<1.26"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
Expand Down Expand Up @@ -265,34 +265,34 @@ jobs:
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.22,<1.23"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.23,<1.24"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.24,<1.25"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.25,<1.26"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.22,<1.23"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.23,<1.24"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.24,<1.25"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.25,<1.26"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
Expand Down Expand Up @@ -324,20 +324,20 @@ jobs:
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.24,<1.25"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.25,<1.26"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.24,<1.25"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
# - run:
# command: |
# source venv_test/bin/activate
# python -m pip install -U "numpy>=1.25,<1.26"
# python -m pip install -U .[test]
# export _GRID2OP_FORCE_TEST=1
# grid2op.testinstall
- run:
command: |
source venv_test/bin/activate
Expand Down Expand Up @@ -380,4 +380,4 @@ workflows:
- install39
- install310
- install311
# - install312 # failing because of dependencies of numba, torch etc. Tired of it so ignoring it !
- install312 # failing because of dependencies of numba, torch etc. Tired of it so ignoring it !
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,8 @@ grid2op/tests/test_failing_simulator.txt
old_pyproject.toml
pp_bug_gen_alone.py
test_dunder.py
grid2op/tests/test_fail_ci.txt
saved_multiepisode_agent_36bus_DN_4/

# profiling files
**.prof
8 changes: 8 additions & 0 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ Change Log
- [???] properly model interconnecting powerlines


[1.9.8] - 20xx-yy-zz
----------------------
- [IMPROVED] the CI speed: by not testing every possible numpy version but only most ancient and most recent
- [IMPROVED] Runner now test grid2op version 1.9.6 and 1.9.7
- [IMPROVED] refacto `gridobj_cls._clear_class_attribute` and `gridobj_cls._clear_grid_dependant_class_attributes`
- [IMPROVED] the bahviour of the generic class `MakeBackend` used for the test suite.
- [IMPROVED] re introducing python 12 testing

[1.9.7] - 2023-12-01
----------------------
- [BREAKING] removal of the `grid2op/Exceptions/PowerflowExceptions.py` file and move the
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = 'Benjamin Donnot'

# The full version, including alpha/beta/rc tags
release = '1.9.7'
release = '1.9.8.dev0'
version = '1.9'


Expand Down
Loading

0 comments on commit 40ece87

Please sign in to comment.