Fix pre-commit

automl · Jun 7, 2023 · 0bba185 · 0bba185
1 parent 9de0e29
commit 0bba185
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 43 deletions.
diff --git a/carl/envs/gymnax/__init__.py b/carl/envs/gymnax/__init__.py
@@ -1,37 +1,36 @@
-from carl.envs.gymnax.carl_jax_acrobot import (  # noqa: F401
-    CONTEXT_BOUNDS as CARLJaxAcrobotEnv_bounds,
-)
-from carl.envs.gymnax.carl_jax_acrobot import (  # noqa: F401
+# flake8: noqa: F401
+from carl.envs.gymnax.carl_jax_acrobot import CONTEXT_BOUNDS as CARLJaxAcrobotEnv_bounds
+from carl.envs.gymnax.carl_jax_acrobot import (
     DEFAULT_CONTEXT as CARLJaxAcrobotEnv_defaults,
 )
-from carl.envs.gymnax.carl_jax_acrobot import CARLJaxAcrobotEnv  # noqa: F401
-from carl.envs.gymnax.carl_jax_cartpole import (  # noqa: F401
+from carl.envs.gymnax.carl_jax_acrobot import CARLJaxAcrobotEnv
+from carl.envs.gymnax.carl_jax_cartpole import (
     CONTEXT_BOUNDS as CARLJaxCartPoleEnv_bounds,
 )
-from carl.envs.gymnax.carl_jax_cartpole import (  # noqa: F401
+from carl.envs.gymnax.carl_jax_cartpole import (
     DEFAULT_CONTEXT as CARLJaxCartPoleEnv_defaults,
 )
-from carl.envs.gymnax.carl_jax_cartpole import CARLJaxCartPoleEnv  # noqa: F401
-from carl.envs.gymnax.carl_jax_mountaincar import (  # noqa: F401
+from carl.envs.gymnax.carl_jax_cartpole import CARLJaxCartPoleEnv
+from carl.envs.gymnax.carl_jax_mountaincar import (
     CONTEXT_BOUNDS as CARLJaxMountainCarContinuousEnv_bounds,
 )
 from carl.envs.gymnax.carl_jax_mountaincar import (
     CONTEXT_BOUNDS as CARLJaxMountainCarEnv_bounds,
 )
-from carl.envs.gymnax.carl_jax_mountaincar import (  # noqa: F401
+from carl.envs.gymnax.carl_jax_mountaincar import (
     DEFAULT_CONTEXT as CARLJaxMountainCarContinuousEnv_defaults,
 )
 from carl.envs.gymnax.carl_jax_mountaincar import (
     DEFAULT_CONTEXT as CARLJaxMountainCarEnv_defaults,
 )
-from carl.envs.gymnax.carl_jax_mountaincar import CARLJaxMountainCarEnv  # noqa: F401
-from carl.envs.gymnax.carl_jax_mountaincar import (  # noqa: F401
+from carl.envs.gymnax.carl_jax_mountaincar import (
     CARLJaxMountainCarContinuousEnv,
+    CARLJaxMountainCarEnv,
 )
-from carl.envs.gymnax.carl_jax_pendulum import (  # noqa: F401
+from carl.envs.gymnax.carl_jax_pendulum import (
     CONTEXT_BOUNDS as CARLJaxPendulumEnv_bounds,
 )
-from carl.envs.gymnax.carl_jax_pendulum import (  # noqa: F401
+from carl.envs.gymnax.carl_jax_pendulum import (
     DEFAULT_CONTEXT as CARLJaxPendulumEnv_defaults,
 )
-from carl.envs.gymnax.carl_jax_pendulum import CARLJaxPendulumEnv  # noqa: F401
+from carl.envs.gymnax.carl_jax_pendulum import CARLJaxPendulumEnv
diff --git a/carl/envs/gymnax/carl_gymnax_env.py b/carl/envs/gymnax/carl_gymnax_env.py
@@ -1,10 +1,12 @@
+from __future__ import annotations
+
 from typing import Any, Dict, List, Optional, Union
 
 import gymnasium
 
+from CARL.carl.envs.gymnax.utils import make_gymnax_env
 from carl.context.selection import AbstractSelector
 from carl.envs.carl_env import CARLEnv
-from carl.envs.gymnax.wrappers import make_gymnax_env
 from carl.utils.trial_logger import TrialLogger
 from carl.utils.types import Context, Contexts
 

diff --git a/carl/envs/gymnax/carl_jax_acrobot.py b/carl/envs/gymnax/carl_jax_acrobot.py
@@ -1,18 +1,11 @@
 from __future__ import annotations
 
-from typing import Dict, List, Optional, Union
-
-import gymnasium
 import gymnax
 import jax.numpy as jnp
 import numpy as np
-from gymnax.environments.classic_control.acrobot import Acrobot
 
-from carl.context.selection import AbstractSelector
-from carl.envs.carl_env import CARLEnv
 from carl.envs.gymnax.carl_gymnax_env import CARLGymnaxEnv
-from carl.utils.trial_logger import TrialLogger
-from carl.utils.types import Context, Contexts
+from carl.utils.types import Context
 
 DEFAULT_CONTEXT = {
     "link_length_1": 1,
@@ -69,7 +62,7 @@
 
 class CARLJaxAcrobotEnv(CARLGymnaxEnv):
     env_name: str = "Acrobot-v1"
-    max_episode_steps: int = DEFAULT_CONTEXT["max_steps_in_episode"]
+    max_episode_steps: int = int(DEFAULT_CONTEXT["max_steps_in_episode"])
     DEFAULT_CONTEXT: Context = DEFAULT_CONTEXT
 
     def _update_context(self) -> None:

diff --git a/carl/envs/gymnax/carl_jax_cartpole.py b/carl/envs/gymnax/carl_jax_cartpole.py
@@ -2,10 +2,9 @@
 
 import gymnax
 import jax.numpy as jnp
-from gymnax.environments.classic_control.cartpole import CartPole
 
 from carl.envs.gymnax.carl_gymnax_env import CARLGymnaxEnv
-from carl.utils.types import Context, Contexts
+from carl.utils.types import Context
 
 DEFAULT_CONTEXT = {
     "gravity": 9.8,
@@ -34,7 +33,7 @@
 
 class CARLJaxCartPoleEnv(CARLGymnaxEnv):
     env_name: str = "CartPole-v1"
-    max_episode_steps: int = DEFAULT_CONTEXT["max_steps_in_episode"]
+    max_episode_steps: int = int(DEFAULT_CONTEXT["max_steps_in_episode"])  # type: ignore[arg-type]
     DEFAULT_CONTEXT: Context = DEFAULT_CONTEXT
 
     def _update_context(self) -> None:

diff --git a/carl/envs/gymnax/carl_jax_mountaincar.py b/carl/envs/gymnax/carl_jax_mountaincar.py
@@ -1,17 +1,10 @@
 from __future__ import annotations
 
-from typing import Dict, List, Optional, Union
-
 import gymnax
 import jax.numpy as jnp
-from gymnax.environments.classic_control.mountain_car import MountainCar
 
-from carl.context.selection import AbstractSelector
-from carl.envs.carl_env import CARLEnv
 from carl.envs.gymnax.carl_gymnax_env import CARLGymnaxEnv
-from carl.envs.gymnax.wrappers import CustomGymnaxToGymWrapper
-from carl.utils.trial_logger import TrialLogger
-from carl.utils.types import Context, Contexts
+from carl.utils.types import Context
 
 DEFAULT_CONTEXT = {
     "min_position": -1.2,
@@ -38,7 +31,7 @@
 
 class CARLJaxMountainCarEnv(CARLGymnaxEnv):
     env_name: str = "MountainCar-v0"
-    max_episode_steps: int = DEFAULT_CONTEXT["max_steps_in_episode"]
+    max_episode_steps: int = int(DEFAULT_CONTEXT["max_steps_in_episode"])
     DEFAULT_CONTEXT: Context = DEFAULT_CONTEXT
 
     def _update_context(self) -> None:

diff --git a/carl/envs/gymnax/carl_jax_pendulum.py b/carl/envs/gymnax/carl_jax_pendulum.py
@@ -1,12 +1,10 @@
 from __future__ import annotations
 
-from typing import Dict, List, Optional, Union
-
 import jax.numpy as jnp
-from gymnax.environments.classic_control.pendulum import EnvParams, Pendulum
+from gymnax.environments.classic_control.pendulum import EnvParams
 
 from carl.envs.gymnax.carl_gymnax_env import CARLGymnaxEnv
-from carl.utils.types import Context, Contexts
+from carl.utils.types import Context
 
 DEFAULT_CONTEXT = {
     "max_speed": 8.0,
@@ -31,7 +29,7 @@
 
 class CARLJaxPendulumEnv(CARLGymnaxEnv):
     env_name: str = "Pendulum-v1"
-    max_episode_steps: int = DEFAULT_CONTEXT["max_steps_in_episode"]
+    max_episode_steps: int = int(DEFAULT_CONTEXT["max_steps_in_episode"])
     DEFAULT_CONTEXT: Context = DEFAULT_CONTEXT
 
     def _update_context(self) -> None:

diff --git a/carl/envs/gymnax/wrappers.py → carl/envs/gymnax/utils.py b/carl/envs/gymnax/wrappers.py → carl/envs/gymnax/utils.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import gym
 import gymnasium
 import gymnax
 from gymnasium.wrappers import EnvCompatibility