mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-14 22:00:05 +00:00
Merge pull request #2882 from erwincoumans/master
fix pybullet_utils import, bump up pybullet version
This commit is contained in:
commit
fa218725ec
@ -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__)
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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)
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
2
setup.py
2
setup.py
@ -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=
|
||||||
|
Loading…
Reference in New Issue
Block a user