From 996a6b7ab0e07469ae027fae818e16feaa5546ee Mon Sep 17 00:00:00 2001 From: knQzx <75641500+knQzx@users.noreply.github.com> Date: Fri, 27 Mar 2026 15:45:36 +0100 Subject: [PATCH] replace deprecated pkg_resources with stdlib version tuple comparison --- examples/pybullet/gym/pybullet_envs/bullet/cartpole_bullet.py | 2 +- examples/pybullet/gym/pybullet_envs/bullet/kukaCamGymEnv.py | 3 +-- examples/pybullet/gym/pybullet_envs/bullet/kukaGymEnv.py | 3 +-- .../gym/pybullet_envs/bullet/kuka_diverse_object_gym_env.py | 3 +-- .../gym/pybullet_envs/bullet/minitaur_duck_gym_env.py | 3 +-- .../pybullet/gym/pybullet_envs/bullet/minitaur_gym_env.py | 3 +-- examples/pybullet/gym/pybullet_envs/bullet/racecarGymEnv.py | 3 +-- .../pybullet/gym/pybullet_envs/bullet/racecarZEDGymEnv.py | 3 +-- .../gym/pybullet_envs/deep_mimic/gym_env/deep_mimic_env.py | 2 +- examples/pybullet/gym/pybullet_envs/env_bases.py | 4 ++-- .../gym/pybullet_envs/minitaur/envs/minitaur_gym_env.py | 3 +-- .../gym/pybullet_envs/prediction/pybullet_sim_gym_env.py | 3 +-- 12 files changed, 13 insertions(+), 22 deletions(-) diff --git a/examples/pybullet/gym/pybullet_envs/bullet/cartpole_bullet.py b/examples/pybullet/gym/pybullet_envs/bullet/cartpole_bullet.py index 399b7f455a..c1a3741a15 100644 --- a/examples/pybullet/gym/pybullet_envs/bullet/cartpole_bullet.py +++ b/examples/pybullet/gym/pybullet_envs/bullet/cartpole_bullet.py @@ -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__) diff --git a/examples/pybullet/gym/pybullet_envs/bullet/kukaCamGymEnv.py b/examples/pybullet/gym/pybullet_envs/bullet/kukaCamGymEnv.py index bb715ec41a..0d3024d05f 100644 --- a/examples/pybullet/gym/pybullet_envs/bullet/kukaCamGymEnv.py +++ b/examples/pybullet/gym/pybullet_envs/bullet/kukaCamGymEnv.py @@ -13,7 +13,6 @@ from . import kuka import random import pybullet_data -from pkg_resources import parse_version maxSteps = 1000 @@ -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 diff --git a/examples/pybullet/gym/pybullet_envs/bullet/kukaGymEnv.py b/examples/pybullet/gym/pybullet_envs/bullet/kukaGymEnv.py index f47a0dd13d..759da65cac 100644 --- a/examples/pybullet/gym/pybullet_envs/bullet/kukaGymEnv.py +++ b/examples/pybullet/gym/pybullet_envs/bullet/kukaGymEnv.py @@ -13,7 +13,6 @@ from . import kuka import random import pybullet_data -from pkg_resources import parse_version largeValObservation = 100 @@ -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 diff --git a/examples/pybullet/gym/pybullet_envs/bullet/kuka_diverse_object_gym_env.py b/examples/pybullet/gym/pybullet_envs/bullet/kuka_diverse_object_gym_env.py index 294a5984a3..924e43d187 100644 --- a/examples/pybullet/gym/pybullet_envs/bullet/kuka_diverse_object_gym_env.py +++ b/examples/pybullet/gym/pybullet_envs/bullet/kuka_diverse_object_gym_env.py @@ -10,7 +10,6 @@ import pdb import distutils.dir_util import glob -from pkg_resources import parse_version import gym @@ -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 diff --git a/examples/pybullet/gym/pybullet_envs/bullet/minitaur_duck_gym_env.py b/examples/pybullet/gym/pybullet_envs/bullet/minitaur_duck_gym_env.py index 6c2d9dabba..6ad8fa3a21 100644 --- a/examples/pybullet/gym/pybullet_envs/bullet/minitaur_duck_gym_env.py +++ b/examples/pybullet/gym/pybullet_envs/bullet/minitaur_duck_gym_env.py @@ -10,7 +10,6 @@ import math import time -from pkg_resources import parse_version import gym from gym import spaces @@ -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 diff --git a/examples/pybullet/gym/pybullet_envs/bullet/minitaur_gym_env.py b/examples/pybullet/gym/pybullet_envs/bullet/minitaur_gym_env.py index 1770fa5e3d..55286f52ce 100644 --- a/examples/pybullet/gym/pybullet_envs/bullet/minitaur_gym_env.py +++ b/examples/pybullet/gym/pybullet_envs/bullet/minitaur_gym_env.py @@ -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 @@ -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 diff --git a/examples/pybullet/gym/pybullet_envs/bullet/racecarGymEnv.py b/examples/pybullet/gym/pybullet_envs/bullet/racecarGymEnv.py index 445ae7d652..7646378b4f 100644 --- a/examples/pybullet/gym/pybullet_envs/bullet/racecarGymEnv.py +++ b/examples/pybullet/gym/pybullet_envs/bullet/racecarGymEnv.py @@ -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 @@ -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 diff --git a/examples/pybullet/gym/pybullet_envs/bullet/racecarZEDGymEnv.py b/examples/pybullet/gym/pybullet_envs/bullet/racecarZEDGymEnv.py index ebd67f156c..404c4edac8 100644 --- a/examples/pybullet/gym/pybullet_envs/bullet/racecarZEDGymEnv.py +++ b/examples/pybullet/gym/pybullet_envs/bullet/racecarZEDGymEnv.py @@ -14,7 +14,6 @@ from . import racecar import random import pybullet_data -from pkg_resources import parse_version RENDER_HEIGHT = 720 RENDER_WIDTH = 960 @@ -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 diff --git a/examples/pybullet/gym/pybullet_envs/deep_mimic/gym_env/deep_mimic_env.py b/examples/pybullet/gym/pybullet_envs/deep_mimic/gym_env/deep_mimic_env.py index 26366a079b..ad8e844725 100644 --- a/examples/pybullet/gym/pybullet_envs/deep_mimic/gym_env/deep_mimic_env.py +++ b/examples/pybullet/gym/pybullet_envs/deep_mimic/gym_env/deep_mimic_env.py @@ -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 diff --git a/examples/pybullet/gym/pybullet_envs/env_bases.py b/examples/pybullet/gym/pybullet_envs/env_bases.py index ac7c2c067a..9bed666822 100644 --- a/examples/pybullet/gym/pybullet_envs/env_bases.py +++ b/examples/pybullet/gym/pybullet_envs/env_bases.py @@ -5,7 +5,7 @@ from pybullet_utils import bullet_client -from pkg_resources import parse_version + try: if os.environ["PYBULLET_EGL"]: @@ -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 diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env.py index 608b8eab0d..b6afe38b54 100644 --- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env.py +++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env.py @@ -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 @@ -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 diff --git a/examples/pybullet/gym/pybullet_envs/prediction/pybullet_sim_gym_env.py b/examples/pybullet/gym/pybullet_envs/prediction/pybullet_sim_gym_env.py index 0d94520cc4..2a48dc4e4f 100644 --- a/examples/pybullet/gym/pybullet_envs/prediction/pybullet_sim_gym_env.py +++ b/examples/pybullet/gym/pybullet_envs/prediction/pybullet_sim_gym_env.py @@ -21,7 +21,6 @@ import os import pybullet_data -from pkg_resources import parse_version class PyBulletSimGymEnv(gym.Env): @@ -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