Use assertIn instead of assertContainsSubsequence for substring checks.

PiperOrigin-RevId: 690716793
google · Oct 29, 2024 · a804d3c · a804d3c
1 parent 9f616b9
commit a804d3c
Show file tree

Hide file tree

Showing 40 changed files with 5 additions and 5 deletions.
diff --git a/dopamine/discrete_domains/atari_lib.py b/dopamine/discrete_domains/atari_lib.py
@@ -41,7 +41,7 @@ class has two main functions: `.__init__` and `.call`. When we create our
 
 from absl import logging
 
-from ale_py import registration
+import ale_py
 from baselines.common import atari_wrappers
 import cv2
 import gin
@@ -108,8 +108,8 @@ def create_atari_environment(
     full_game_name = f'{game_name}NoFrameskip-{game_version}'
     env = legacy_gym.make(full_game_name)
   else:
-    registration.register_v5_envs()
-    registration.register_v5_envs()
+    gym.register_envs(ale_py)
+    gym.register_envs(ale_py)
     full_game_name = f'ALE/{game_name}-v5'
     repeat_action_probability = 0.25 if sticky_actions else 0.0
     continuous = continuous_action_threshold is not None

diff --git a/tf/agents/__init__.py → dopamine/tf/agents/__init__.py b/tf/agents/__init__.py → dopamine/tf/agents/__init__.py
diff --git a/tf/agents/dqn/__init__.py → dopamine/tf/agents/dqn/__init__.py b/tf/agents/dqn/__init__.py → dopamine/tf/agents/dqn/__init__.py
diff --git a/tf/agents/dqn/configs/dqn.gin → dopamine/tf/agents/dqn/configs/dqn.gin b/tf/agents/dqn/configs/dqn.gin → dopamine/tf/agents/dqn/configs/dqn.gin
diff --git a/tf/agents/dqn/configs/dqn_acrobot.gin → ...ine/tf/agents/dqn/configs/dqn_acrobot.gin b/tf/agents/dqn/configs/dqn_acrobot.gin → ...ine/tf/agents/dqn/configs/dqn_acrobot.gin
diff --git a/tf/agents/dqn/configs/dqn_cartpole.gin → ...ne/tf/agents/dqn/configs/dqn_cartpole.gin b/tf/agents/dqn/configs/dqn_cartpole.gin → ...ne/tf/agents/dqn/configs/dqn_cartpole.gin
diff --git a/tf/agents/dqn/configs/dqn_icml.gin → dopamine/tf/agents/dqn/configs/dqn_icml.gin b/tf/agents/dqn/configs/dqn_icml.gin → dopamine/tf/agents/dqn/configs/dqn_icml.gin
diff --git a/tf/agents/dqn/configs/dqn_lunarlander.gin → ...tf/agents/dqn/configs/dqn_lunarlander.gin b/tf/agents/dqn/configs/dqn_lunarlander.gin → ...tf/agents/dqn/configs/dqn_lunarlander.gin
diff --git a/tf/agents/dqn/configs/dqn_mountaincar.gin → ...tf/agents/dqn/configs/dqn_mountaincar.gin b/tf/agents/dqn/configs/dqn_mountaincar.gin → ...tf/agents/dqn/configs/dqn_mountaincar.gin
diff --git a/tf/agents/dqn/configs/dqn_nature.gin → ...mine/tf/agents/dqn/configs/dqn_nature.gin b/tf/agents/dqn/configs/dqn_nature.gin → ...mine/tf/agents/dqn/configs/dqn_nature.gin
diff --git a/tf/agents/dqn/configs/dqn_profiling.gin → ...e/tf/agents/dqn/configs/dqn_profiling.gin b/tf/agents/dqn/configs/dqn_profiling.gin → ...e/tf/agents/dqn/configs/dqn_profiling.gin
diff --git a/tf/agents/dqn/dqn_agent.py → dopamine/tf/agents/dqn/dqn_agent.py b/tf/agents/dqn/dqn_agent.py → dopamine/tf/agents/dqn/dqn_agent.py
diff --git a/tf/agents/implicit_quantile/__init__.py → ...e/tf/agents/implicit_quantile/__init__.py b/tf/agents/implicit_quantile/__init__.py → ...e/tf/agents/implicit_quantile/__init__.py
diff --git a/...it_quantile/configs/implicit_quantile.gin → ...it_quantile/configs/implicit_quantile.gin b/...it_quantile/configs/implicit_quantile.gin → ...it_quantile/configs/implicit_quantile.gin
diff --git a/...antile/configs/implicit_quantile_icml.gin → ...antile/configs/implicit_quantile_icml.gin b/...antile/configs/implicit_quantile_icml.gin → ...antile/configs/implicit_quantile_icml.gin
diff --git a/...e/configs/implicit_quantile_profiling.gin → ...e/configs/implicit_quantile_profiling.gin b/...e/configs/implicit_quantile_profiling.gin → ...e/configs/implicit_quantile_profiling.gin
diff --git a/...licit_quantile/implicit_quantile_agent.py → ...licit_quantile/implicit_quantile_agent.py b/...licit_quantile/implicit_quantile_agent.py → ...licit_quantile/implicit_quantile_agent.py
diff --git a/tf/agents/rainbow/__init__.py → dopamine/tf/agents/rainbow/__init__.py b/tf/agents/rainbow/__init__.py → dopamine/tf/agents/rainbow/__init__.py
diff --git a/tf/agents/rainbow/configs/c51.gin → dopamine/tf/agents/rainbow/configs/c51.gin b/tf/agents/rainbow/configs/c51.gin → dopamine/tf/agents/rainbow/configs/c51.gin
diff --git a/tf/agents/rainbow/configs/c51_acrobot.gin → ...tf/agents/rainbow/configs/c51_acrobot.gin b/tf/agents/rainbow/configs/c51_acrobot.gin → ...tf/agents/rainbow/configs/c51_acrobot.gin
diff --git a/tf/agents/rainbow/configs/c51_cartpole.gin → ...f/agents/rainbow/configs/c51_cartpole.gin b/tf/agents/rainbow/configs/c51_cartpole.gin → ...f/agents/rainbow/configs/c51_cartpole.gin
diff --git a/tf/agents/rainbow/configs/c51_icml.gin → ...ne/tf/agents/rainbow/configs/c51_icml.gin b/tf/agents/rainbow/configs/c51_icml.gin → ...ne/tf/agents/rainbow/configs/c51_icml.gin
diff --git a/tf/agents/rainbow/configs/c51_profiling.gin → .../agents/rainbow/configs/c51_profiling.gin b/tf/agents/rainbow/configs/c51_profiling.gin → .../agents/rainbow/configs/c51_profiling.gin
diff --git a/tf/agents/rainbow/configs/rainbow.gin → ...ine/tf/agents/rainbow/configs/rainbow.gin b/tf/agents/rainbow/configs/rainbow.gin → ...ine/tf/agents/rainbow/configs/rainbow.gin
diff --git a/tf/agents/rainbow/configs/rainbow_aaai.gin → ...f/agents/rainbow/configs/rainbow_aaai.gin b/tf/agents/rainbow/configs/rainbow_aaai.gin → ...f/agents/rainbow/configs/rainbow_aaai.gin
diff --git a/...gents/rainbow/configs/rainbow_acrobot.gin → ...gents/rainbow/configs/rainbow_acrobot.gin b/...gents/rainbow/configs/rainbow_acrobot.gin → ...gents/rainbow/configs/rainbow_acrobot.gin
diff --git a/...ents/rainbow/configs/rainbow_cartpole.gin → ...ents/rainbow/configs/rainbow_cartpole.gin b/...ents/rainbow/configs/rainbow_cartpole.gin → ...ents/rainbow/configs/rainbow_cartpole.gin
diff --git a/...nts/rainbow/configs/rainbow_profiling.gin → ...nts/rainbow/configs/rainbow_profiling.gin b/...nts/rainbow/configs/rainbow_profiling.gin → ...nts/rainbow/configs/rainbow_profiling.gin
diff --git a/tf/agents/rainbow/rainbow_agent.py → dopamine/tf/agents/rainbow/rainbow_agent.py b/tf/agents/rainbow/rainbow_agent.py → dopamine/tf/agents/rainbow/rainbow_agent.py
diff --git a/tf/replay_memory/__init__.py → dopamine/tf/replay_memory/__init__.py b/tf/replay_memory/__init__.py → dopamine/tf/replay_memory/__init__.py
diff --git a/tf/replay_memory/circular_replay_buffer.py → ...f/replay_memory/circular_replay_buffer.py b/tf/replay_memory/circular_replay_buffer.py → ...f/replay_memory/circular_replay_buffer.py
diff --git a/...eplay_memory/prioritized_replay_buffer.py → ...eplay_memory/prioritized_replay_buffer.py b/...eplay_memory/prioritized_replay_buffer.py → ...eplay_memory/prioritized_replay_buffer.py
diff --git a/tf/replay_memory/sum_tree.py → dopamine/tf/replay_memory/sum_tree.py b/tf/replay_memory/sum_tree.py → dopamine/tf/replay_memory/sum_tree.py
diff --git a/tests/dopamine/jax/replay_memory/samplers_test.py b/tests/dopamine/jax/replay_memory/samplers_test.py
@@ -30,13 +30,13 @@ def test_update_does_not_raise_and_logs(self):
     with self.assertLogs(level="INFO") as logs:
       self.sampler.update(0, None, [], arg_x=1, arg_y=2)
     self.assertLen(logs.output, 1)
-    self.assertContainsSubsequence(logs.output[0], "is a no-op")
+    self.assertIn("is a no-op", logs.output[0])
 
   def test_additional_kwargs_to_add_logs(self):
     with self.assertLogs(level="INFO") as logs:
       self.sampler.add(1, dummy_kwargs="dummy")
     self.assertLen(logs.output, 1)
-    self.assertContainsSubsequence(logs.output[0], "dummy_kwargs")
+    self.assertIn("dummy_kwargs", logs.output[0])
 
   def test_sample_when_empty(self):
     with self.assertRaises(ValueError):

diff --git a/tests/tf/agents/dqn/dqn_agent_test.py → .../dopamine/tf/agents/dqn/dqn_agent_test.py b/tests/tf/agents/dqn/dqn_agent_test.py → .../dopamine/tf/agents/dqn/dqn_agent_test.py
diff --git a/..._quantile/implicit_quantile_agent_test.py → ..._quantile/implicit_quantile_agent_test.py b/..._quantile/implicit_quantile_agent_test.py → ..._quantile/implicit_quantile_agent_test.py
diff --git a/...s/tf/agents/rainbow/rainbow_agent_test.py → ...e/tf/agents/rainbow/rainbow_agent_test.py b/...s/tf/agents/rainbow/rainbow_agent_test.py → ...e/tf/agents/rainbow/rainbow_agent_test.py
diff --git a/...lay_memory/circular_replay_buffer_test.py → ...lay_memory/circular_replay_buffer_test.py b/...lay_memory/circular_replay_buffer_test.py → ...lay_memory/circular_replay_buffer_test.py
diff --git a/..._memory/prioritized_replay_buffer_test.py → ..._memory/prioritized_replay_buffer_test.py b/..._memory/prioritized_replay_buffer_test.py → ..._memory/prioritized_replay_buffer_test.py
diff --git a/tests/tf/replay_memory/sum_tree_test.py → ...opamine/tf/replay_memory/sum_tree_test.py b/tests/tf/replay_memory/sum_tree_test.py → ...opamine/tf/replay_memory/sum_tree_test.py