Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import pybullet as p2
import pybullet_data
from pybullet_utils import bullet_client as bc
from pkg_resources import parse_version


logger = logging.getLogger(__name__)

Expand Down
3 changes: 1 addition & 2 deletions examples/pybullet/gym/pybullet_envs/bullet/kukaCamGymEnv.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from . import kuka
import random
import pybullet_data
from pkg_resources import parse_version

maxSteps = 1000

Expand Down Expand Up @@ -252,7 +251,7 @@ def _reward(self):
#print(reward)
return reward

if parse_version(gym.__version__) < parse_version('0.9.6'):
if tuple(int(x) for x in gym.__version__.split('.')) < (0, 9, 6):
_render = render
_reset = reset
_seed = seed
Expand Down
3 changes: 1 addition & 2 deletions examples/pybullet/gym/pybullet_envs/bullet/kukaGymEnv.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from . import kuka
import random
import pybullet_data
from pkg_resources import parse_version

largeValObservation = 100

Expand Down Expand Up @@ -286,7 +285,7 @@ def _reward(self):
#print(reward)
return reward

if parse_version(gym.__version__) < parse_version('0.9.6'):
if tuple(int(x) for x in gym.__version__.split('.')) < (0, 9, 6):
_render = render
_reset = reset
_seed = seed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import pdb
import distutils.dir_util
import glob
from pkg_resources import parse_version
import gym


Expand Down Expand Up @@ -319,6 +318,6 @@ def _get_random_object(self, num_objects, test):
selected_objects_filenames += [found_object_directories[object_index]]
return selected_objects_filenames

if parse_version(gym.__version__) < parse_version('0.9.6'):
if tuple(int(x) for x in gym.__version__.split('.')) < (0, 9, 6):
_reset = reset
_step = step
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import math
import time
from pkg_resources import parse_version

import gym
from gym import spaces
Expand Down Expand Up @@ -383,7 +382,7 @@ def _noisy_observation(self):
self.minitaur.GetObservationUpperBound())
return observation

if parse_version(gym.__version__) < parse_version('0.9.6'):
if tuple(int(x) for x in gym.__version__.split('.')) < (0, 9, 6):
_render = render
_reset = reset
_seed = seed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import os
import pybullet_data
from . import minitaur_env_randomizer
from pkg_resources import parse_version

NUM_SUBSTEPS = 5
NUM_MOTORS = 8
Expand Down Expand Up @@ -383,7 +382,7 @@ def _noisy_observation(self):
self.minitaur.GetObservationUpperBound())
return observation

if parse_version(gym.__version__) < parse_version('0.9.6'):
if tuple(int(x) for x in gym.__version__.split('.')) < (0, 9, 6):
_render = render
_reset = reset
_seed = seed
Expand Down
3 changes: 1 addition & 2 deletions examples/pybullet/gym/pybullet_envs/bullet/racecarGymEnv.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import random
from pybullet_utils import bullet_client as bc
import pybullet_data
from pkg_resources import parse_version

RENDER_HEIGHT = 720
RENDER_WIDTH = 960
Expand Down Expand Up @@ -176,7 +175,7 @@ def _reward(self):
#print(reward)
return reward

if parse_version(gym.__version__) < parse_version('0.9.6'):
if tuple(int(x) for x in gym.__version__.split('.')) < (0, 9, 6):
_render = render
_reset = reset
_seed = seed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from . import racecar
import random
import pybullet_data
from pkg_resources import parse_version

RENDER_HEIGHT = 720
RENDER_WIDTH = 960
Expand Down Expand Up @@ -206,7 +205,7 @@ def _reward(self):
#print(reward)
return reward

if parse_version(gym.__version__) < parse_version('0.9.6'):
if tuple(int(x) for x in gym.__version__.split('.')) < (0, 9, 6):
_render = render
_reset = reset
_seed = seed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import pybullet as p2
import pybullet_data
from pybullet_utils import bullet_client as bc
from pkg_resources import parse_version

from pybullet_envs.deep_mimic.env.pybullet_deep_mimic_env import PyBulletDeepMimicEnv, InitializationStrategy
from pybullet_utils.arg_parser import ArgParser
from pybullet_utils.logger import Logger
Expand Down
4 changes: 2 additions & 2 deletions examples/pybullet/gym/pybullet_envs/env_bases.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from pybullet_utils import bullet_client

from pkg_resources import parse_version


try:
if os.environ["PYBULLET_EGL"]:
Expand Down Expand Up @@ -152,7 +152,7 @@ def HUD(self, state, a, done):
#
#
# return self.step(*args, **kwargs)
if parse_version(gym.__version__) < parse_version('0.9.6'):
if tuple(int(x) for x in gym.__version__.split('.')) < (0, 9, 6):
_render = render
_reset = reset
_seed = seed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
from pybullet_envs.minitaur.envs import minitaur_logging_pb2
from pybullet_envs.minitaur.envs import minitaur_rainbow_dash
from pybullet_envs.minitaur.envs import motor
from pkg_resources import parse_version

NUM_MOTORS = 8
MOTOR_ANGLE_OBSERVATION_INDEX = 0
Expand Down Expand Up @@ -548,7 +547,7 @@ def _get_observation_dimension(self):
"""
return len(self._get_observation())

if parse_version(gym.__version__) < parse_version('0.9.6'):
if tuple(int(x) for x in gym.__version__.split('.')) < (0, 9, 6):
_render = render
_reset = reset
_seed = seed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import os
import pybullet_data

from pkg_resources import parse_version


class PyBulletSimGymEnv(gym.Env):
Expand Down Expand Up @@ -209,7 +208,7 @@ def _get_observation(self):
self._observation = self._example_sim.GetObservation()
return self._observation

if parse_version(gym.__version__) < parse_version('0.9.6'):
if tuple(int(x) for x in gym.__version__.split('.')) < (0, 9, 6):
_render = render
_reset = reset
_seed = seed
Expand Down