Merge pull request #2882 from erwincoumans/master

fix pybullet_utils import, bump up pybullet version
This commit is contained in:
erwincoumans 2020-06-24 15:59:13 -07:00 committed by GitHub
commit fa218725ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 14 additions and 14 deletions

View File

@ -17,7 +17,7 @@ import time
import subprocess import subprocess
import pybullet as p2 import pybullet as p2
import pybullet_data import pybullet_data
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
from pkg_resources import parse_version from pkg_resources import parse_version
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@ -17,7 +17,7 @@ from gym import spaces
from gym.utils import seeding from gym.utils import seeding
import numpy as np import numpy as np
import pybullet import pybullet
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
from . import minitaur from . import minitaur
import pybullet_data import pybullet_data
from . import minitaur_env_randomizer from . import minitaur_env_randomizer

View File

@ -14,7 +14,7 @@ from gym import spaces
from gym.utils import seeding from gym.utils import seeding
import numpy as np import numpy as np
import pybullet import pybullet
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
from . import minitaur from . import minitaur
import os import os
import pybullet_data import pybullet_data

View File

@ -12,7 +12,7 @@ import numpy as np
import pybullet import pybullet
from . import racecar from . import racecar
import random import random
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
import pybullet_data import pybullet_data
from pkg_resources import parse_version from pkg_resources import parse_version

View File

@ -10,7 +10,7 @@ from gym.utils import seeding
import numpy as np import numpy as np
import time import time
import pybullet import pybullet
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
from . import racecar from . import racecar
import random import random
import pybullet_data import pybullet_data

View File

@ -17,7 +17,7 @@ import time
import subprocess import subprocess
import pybullet as p2 import pybullet as p2
import pybullet_data import pybullet_data
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
from pkg_resources import parse_version from pkg_resources import parse_version
from pybullet_envs.deep_mimic.env.pybullet_deep_mimic_env import PyBulletDeepMimicEnv from pybullet_envs.deep_mimic.env.pybullet_deep_mimic_env import PyBulletDeepMimicEnv
from pybullet_utils.arg_parser import ArgParser from pybullet_utils.arg_parser import ArgParser

View File

@ -1,7 +1,7 @@
import pybullet_data as pd import pybullet_data as pd
import pybullet_utils as pu import pybullet_utils as pu
import pybullet import pybullet
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
import time import time
p = bc.BulletClient(connection_mode=pybullet.GUI) p = bc.BulletClient(connection_mode=pybullet.GUI)

View File

@ -14,7 +14,7 @@ from gym import spaces
from gym.utils import seeding from gym.utils import seeding
import numpy as np import numpy as np
import pybullet import pybullet
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
import pybullet_data import pybullet_data
from pybullet_envs.minitaur.envs import minitaur from pybullet_envs.minitaur.envs import minitaur
from pybullet_envs.minitaur.envs import minitaur_derpy from pybullet_envs.minitaur.envs import minitaur_derpy

View File

@ -14,7 +14,7 @@ from gym import spaces
from gym.utils import seeding from gym.utils import seeding
import numpy as np import numpy as np
import pybullet import pybullet
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
from pybullet_envs.prediction import boxstack_pybullet_sim from pybullet_envs.prediction import boxstack_pybullet_sim

View File

@ -1,5 +1,5 @@
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
import pybullet_utils.urdfEditor as ed from pybullet_utils import urdfEditor as ed
import pybullet import pybullet
import pybullet_data import pybullet_data
import time import time

View File

@ -1,6 +1,6 @@
#rudimentary MuJoCo mjcf to ROS URDF converter using the UrdfEditor #rudimentary MuJoCo mjcf to ROS URDF converter using the UrdfEditor
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
import pybullet_data as pd import pybullet_data as pd
import pybullet_utils.urdfEditor as ed import pybullet_utils.urdfEditor as ed

View File

@ -1,4 +1,4 @@
import pybullet_utils.bullet_client as bc from pybullet_utils import bullet_client as bc
import pybullet import pybullet
import pybullet_data import pybullet_data

View File

@ -501,7 +501,7 @@ if 'BT_USE_EGL' in EGL_CXX_FLAGS:
setup( setup(
name='pybullet', name='pybullet',
version='2.8.0', version='2.8.2',
description= description=
'Official Python Interface for the Bullet Physics SDK specialized for Robotics Simulation and Reinforcement Learning', 'Official Python Interface for the Bullet Physics SDK specialized for Robotics Simulation and Reinforcement Learning',
long_description= long_description=