Skip to content

Commit

Permalink
Remove the pettingzoo and pybullet dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
RedTachyon committed Nov 8, 2021
1 parent f794b78 commit c4190ba
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 90 deletions.
3 changes: 1 addition & 2 deletions coltra/envs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from .base_env import MultiAgentEnv
from .subproc_vec_env import SubprocVecEnv
from .probe_envs import probe_env_classes
from .gym_envs import MultiGymEnv, import_bullet
from .gym_envs import MultiGymEnv
from .base_env import Observation, Action
from .smartnav_envs import SmartNavEnv
from .pettingzoo_envs import PettingZooEnv
7 changes: 0 additions & 7 deletions coltra/envs/gym_envs.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
from coltra.envs.subproc_vec_env import VecEnv, SubprocVecEnv


def import_bullet():
# noinspection PyUnresolvedReferences
import pybullet_envs


class MultiGymEnv(MultiAgentEnv):
"""
A wrapper for environments that can be `gym.make`'d
Expand All @@ -32,8 +27,6 @@ def __init__(
super().__init__(seed)
if wrappers is None:
wrappers = []
if "Bullet" in env_name:
import_fn = import_bullet

import_fn()

Expand Down
66 changes: 0 additions & 66 deletions coltra/envs/pettingzoo_envs.py

This file was deleted.

1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ ipykernel>=5.4.3
numba>=0.54.0
pytest>=6.2.2
coverage>=5.5.0
pybullet>=3.1.9
opencv-python~=3.4.15.55
cloudpickle~=2.0.0
pillow~=8.4.0
Expand Down
2 changes: 0 additions & 2 deletions scripts/enjoy_gym.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
from coltra.trainers import PPOCrowdTrainer
from coltra.envs import MultiGymEnv

import pybullet_envs


class Parser(BaseParser):
path: str
Expand Down
2 changes: 0 additions & 2 deletions scripts/train_gym.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
from coltra.trainers import PPOCrowdTrainer
from coltra.envs import MultiGymEnv

import pybullet_envs

from coltra.wrappers import ObsVecNormWrapper, LastRewardWrapper
from coltra.wrappers.agent_wrappers import RetNormWrapper

Expand Down
10 changes: 0 additions & 10 deletions tests/test_pybullet.py

This file was deleted.

0 comments on commit c4190ba

Please sign in to comment.