Merge pull request #716 from BDonnot/bd_dev

Bd dev

Author: BDonnot

.github/workflows/main.yml

@@ -43,11 +43,11 @@ jobs:
             abi: cp312,
             version: '3.12',
           }
-          # - {
-          #   name: cp313,   # issue with pandapower atm
-          #   abi: cp313,
-          #   version: '3.13',
-          # }
+          - {
+            name: cp313,   # issue with pandapower atm
+            abi: cp313,
+            version: '3.13',
+          }
 
     steps:
 
@@ -141,10 +141,10 @@ jobs:
             name: cp312,
             version: '3.12',
           }
-          # - {  # issue with pandapower atm
-          #   name: cp313,
-          #   version: '3.13',
-          # }
+          - {  # issue with pandapower atm
+            name: cp313,
+            version: '3.13',
+          }
 
     steps:
 
@@ -197,7 +197,7 @@ jobs:
           path: dist/*.tar.gz
 
   auto_class_in_file:
-    name: Test ${{ matrix.config.name }} OS can handle automatic class generation
+    name: Test ${{ matrix.config.name }} OS can handle automatic class generation for python ${{matrix.python.version}}
     runs-on: ${{ matrix.config.os }}
     strategy:
       matrix:
@@ -220,8 +220,8 @@ jobs:
             version: '3.9',
           }  
           - {
-            name: cp312,
-            version: '3.12',
+            name: cp313,
+            version: '3.13',
           }  
 
     steps:
@@ -238,10 +238,7 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade wheel
-          python -m pip install --upgrade setuptools
-          python -m pip install --upgrade gymnasium "numpy<2"
+          python -m pip install --upgrade pip wheel setuptools gymnasium
 
       - name: Build wheel
         run: python setup.py bdist_wheel
@@ -254,7 +251,7 @@ jobs:
 
       - name: Test the automatic generation of classes in the env folder
         run: |
-          python -m unittest grid2op/tests/automatic_classes.py -f
+          python -m unittest grid2op/tests/automatic_classes.py -v -f
   
   package:
     name: Test install

README.md

@@ -115,7 +115,7 @@ Its main features are:
 * can adopt any powergrid modeling, especially Alternating Current (AC) and Direct Current (DC) approximation to
   when performing the compitations
 * supports changes of powerflow solvers, actions, observations to better suit any need in performing power system operations modeling
-* has an RL-focused interface, compatible with [OpenAI-gym](https://gym.openai.com/): same interface for the
+* has an RL-focused interface, compatible with [gymnasium](https://gymnasium.farama.org/index.html): same interface for the
   Environment class.
 * parameters, game rules or type of actions are perfectly parametrizable
 * can adapt to any kind of input data, in various format (might require the rewriting of a class)
@@ -306,11 +306,12 @@ The unit tests includes testing, on linux machines the correct integration of gr
 * python 3.10
 * python 3.11
 * python 3.12
+* python 3.13
 
-On all of these cases, we tested grid2op on all available numpy versions >= 1.20 (**nb** available numpy versions depend
+On all of these cases, we tested grid2op on all available numpy versions >= 2.0 (**nb** available numpy versions depend
 on python version).
 
-The complete test suit is run on linux with the latest numpy version on python 3.10.
+The complete test suit is run on linux with the latest numpy version on python 3.12.
 
 ### Known issues
 

grid2op/Environment/baseEnv.py

@@ -20,8 +20,9 @@
 import warnings
 import numpy as np
 from scipy.optimize import (minimize, LinearConstraint)
-
 from abc import ABC, abstractmethod
+
+from grid2op._glop_platform_info import _IS_WINDOWS
 from grid2op.Environment._env_prev_state import _EnvPreviousState
 from grid2op.Observation import (BaseObservation,
                                  ObservationSpace,
@@ -4117,14 +4118,25 @@ def close(self):
         self._aux_close_local_dir_cls()
 
     def _aux_close_local_dir_cls(self):
-        if self._local_dir_cls is not None:
-            # I am the "keeper" of the temporary directory
-            # deleting this env should also delete the temporary directory
-            if not (hasattr(self._local_dir_cls, "_RUNNER_DO_NOT_ERASE") and not self._local_dir_cls._RUNNER_DO_NOT_ERASE):
-                # BUT if a runner uses it, then I should not delete it !
-                self._local_dir_cls.cleanup()
-                self._local_dir_cls = None
-                # In this case it's likely that the OS will clean it for grid2op with a warning...
+        if self._local_dir_cls is None:
+            return
+        # I am the "keeper" of the temporary directory
+        # deleting this env should also delete the temporary directory
+        if not (hasattr(self._local_dir_cls, "_RUNNER_DO_NOT_ERASE") and not self._local_dir_cls._RUNNER_DO_NOT_ERASE):
+            # BUT if a runner uses it, then I should not delete it !
+            self._local_dir_cls.cleanup()
+            self._local_dir_cls = None
+            # In this case it's likely that the OS will clean it for grid2op with a warning...
+        
+        # clear all imported modules (required for windows)
+        # otherwise it tries to import the classes when processes are spawned
+        # even the classes that have been "cleaned"
+        if _IS_WINDOWS and type(self)._PATH_GRID_CLASSES is not None:
+            # TODO find a better way here
+            module_name = os.path.split(type(self)._PATH_GRID_CLASSES)[-1]
+            for el in sys.modules.copy():
+                if module_name in el:
+                    del sys.modules[el]
 
     def attach_layout(self, grid_layout):
         """

grid2op/VoltageControler/BaseVoltageController.py

@@ -7,10 +7,9 @@
 # This file is part of Grid2Op, Grid2Op a testbed platform to model sequential decision making in power systems.
 from abc import ABC, abstractmethod
 import numpy as np
-import copy
 
 from grid2op.dtypes import dt_int
-from grid2op.Action import VoltageOnlyAction, ActionSpace
+from grid2op.Action import VoltageOnlyAction
 from grid2op.Rules import AlwaysLegal
 from grid2op.Space import RandomObject