Skip to content

Commit

Permalink
Merge pull request #566 from BDonnot/dev-switches
Browse files Browse the repository at this point in the history 
synch with dev 1.9.8
  • Loading branch information
@BDonnot
BDonnot authored Dec 1, 2023
2 parents 6daf116 + 2e3d6d3 commit 29b5214
Show file tree
Hide file tree
Showing 324 changed files with 9,733 additions and 1,830 deletions.
234 changes: 142 additions & 92 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +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

jobs:
test:
Expand Down Expand Up @@ -137,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 @@ -184,53 +187,61 @@ 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 "numpy>=1.26,<1.27"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
install310:
executor: python310
resource_class: small
Expand All @@ -254,34 +265,42 @@ 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 "numpy>=1.26,<1.27"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
install311:
executor: python311
resource_class: small
Expand All @@ -305,17 +324,47 @@ 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 "numpy>=1.26,<1.27"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
install312:
executor: python312
resource_class: small
steps:
- checkout
- run:
command: |
sudo apt-get update
sudo apt-get install -y coinor-cbc
- run: python -m pip install virtualenv
- run: python -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
python -m pip install -U pip setuptools wheel
# python -m pip install -U numba # not on python 3.12 at the moment
- run:
command: |
source venv_test/bin/activate
python -m pip install -U "numpy>=1.25,<1.26"
python -m pip install -U "numpy>=1.26,<1.27"
python -m pip install -U .[test]
export _GRID2OP_FORCE_TEST=1
grid2op.testinstall
Expand All @@ -331,3 +380,4 @@ workflows:
- install39
- install310
- install311
- install312 # failing because of dependencies of numba, torch etc. Tired of it so ignoring it !
13 changes: 12 additions & 1 deletion .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ jobs:
abi: cp311,
version: '3.11',
}
- {
name: cp312,
abi: cp312,
version: '3.12',
}

steps:

Expand All @@ -50,6 +55,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade wheel
python -m pip install --upgrade setuptools
- name: Build wheel
run: |
Expand Down Expand Up @@ -102,6 +108,10 @@ jobs:
name: cp311,
version: '3.11',
}
- {
name: cp312,
version: '3.12',
}

steps:

Expand All @@ -119,6 +129,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade wheel
python -m pip install --upgrade setuptools
- name: Build wheel
run: python setup.py bdist_wheel
Expand All @@ -134,7 +145,7 @@ jobs:
python3 -c "from grid2op.Action._backendAction import _BackendAction"
- name: Build source archive
if: matrix.config.name == 'darwin' && matrix.python.name == 'cp39'
if: matrix.config.name == 'darwin' && matrix.python.name == 'cp310'
run: python setup.py sdist

- name: Upload wheel
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,13 @@ actspace_converter.py
grid2op/data_test/input_data_local/
test_sim2real_battery.py
grid2op/tests/list_test_debug
aux_test_make_backend_test_suite.py
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
Loading

0 comments on commit 29b5214

Please sign in to comment.