diff --git a/gym/envs/mujoco/mujoco_env.py b/gym/envs/mujoco/mujoco_env.py index 073f8273b..7461abaf2 100644 --- a/gym/envs/mujoco/mujoco_env.py +++ b/gym/envs/mujoco/mujoco_env.py @@ -8,19 +8,10 @@ import six try: import mujoco_py + from mujoco_py.mjlib import mjlib except ImportError as e: raise error.DependencyNotInstalled("{}. (HINT: you need to install mujoco_py, and also perform the setup instructions here: https://github.com/openai/mujoco-py/.)".format(e)) - -# move this into mujoco-py next time we upgrade it!!! -# --------------------------------------------------- -from mujoco_py.mjlib import mjlib -from mujoco_py.mjtypes import POINTER, MJMODEL, MJDATA -mjlib.mj_resetData.argtypes = [POINTER(MJMODEL), POINTER(MJDATA)] -mjlib.mj_resetData.restype = None -# --------------------------------------------------- - - class MujocoEnv(gym.Env): """ diff --git a/setup.py b/setup.py index 90efa5a8e..bc9620192 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setup(name='gym', 'all': ['atari_py>=0.0.17', 'Pillow', 'pyglet', 'PyOpenGL', 'pachi-py>=0.0.19', 'box2d-py', - 'mujoco_py>=0.4.2', 'imageio'], + 'mujoco_py>=0.4.3', 'imageio'], # Environment-specific dependencies. Keep these in sync with # 'all'! @@ -30,7 +30,7 @@ setup(name='gym', 'board_game' : ['pachi-py>=0.0.19'], 'box2d': ['box2d-py'], 'classic_control': ['pyglet', 'PyOpenGL'], - 'mujoco': ['mujoco_py>=0.4.2', 'imageio'], + 'mujoco': ['mujoco_py>=0.4.3', 'imageio'], }, package_data={'gym': ['envs/mujoco/assets/*.xml', 'envs/classic_control/assets/*.png']}, tests_require=['nose2', 'mock'],