oops - fix setup.py + yapf

bdaiinstitute · Apr 29, 2024 · a648307 · a648307
1 parent 3554fe8
commit a648307
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
         "opencv-python == 4.7.0.72",
         "pg3@git+https://github.com/tomsilver/pg3.git",
         "gym_sokoban@git+https://github.com/Learning-and-Intelligent-Systems/gym-sokoban.git",  # pylint: disable=line-too-long
-        "pbrspot@git+https://github.com/NishanthJKumar/pbrspot.git"
+        "pbrspot@git+https://github.com/NishanthJKumar/pbrspot.git",
         "ImageHash",
         "google-generativeai"
     ],

diff --git a/tests/approaches/test_oracle_approach.py b/tests/approaches/test_oracle_approach.py
@@ -47,29 +47,21 @@
 _PDDL_ENV_MODULE_PATH = predicators.envs.pddl_env.__name__
 
 ENV_NAME_AND_CLS = [
-    ("cover", CoverEnv),
-    ("cover_typed_options", CoverEnvTypedOptions),
+    ("cover", CoverEnv), ("cover_typed_options", CoverEnvTypedOptions),
     ("cover_place_hard", CoverEnvPlaceHard),
     ("cover_hierarchical_types", CoverEnvHierarchicalTypes),
-    ("cover_regrasp", CoverEnvRegrasp),
-    ("bumpy_cover", BumpyCoverEnv),
+    ("cover_regrasp", CoverEnvRegrasp), ("bumpy_cover", BumpyCoverEnv),
     ("cover_multistep_options", CoverMultistepOptions),
     ("regional_bumpy_cover", RegionalBumpyCoverEnv),
     ("cluttered_table", ClutteredTableEnv),
-    ("cluttered_table_place", ClutteredTablePlaceEnv),
-    ("blocks", BlocksEnv),
-    ("exit_garage", ExitGarageEnv),
-    ("narrow_passage", NarrowPassageEnv),
-    ("painting", PaintingEnv),
-    ("sandwich", SandwichEnv),
-    ("tools", ToolsEnv),
-    ("playroom", PlayroomEnv),
-    ("repeated_nextto", RepeatedNextToEnv),
+    ("cluttered_table_place", ClutteredTablePlaceEnv), ("blocks", BlocksEnv),
+    ("exit_garage", ExitGarageEnv), ("narrow_passage", NarrowPassageEnv),
+    ("painting", PaintingEnv), ("sandwich", SandwichEnv), ("tools", ToolsEnv),
+    ("playroom", PlayroomEnv), ("repeated_nextto", RepeatedNextToEnv),
     ("repeated_nextto_single_option", RepeatedNextToSingleOptionEnv),
     ("repeated_nextto_ambiguous", RepeatedNextToAmbiguousEnv),
     ("repeated_nextto_simple", RepeatedNextToSimple),
-    ("satellites", SatellitesEnv),
-    ("satellites_simple", SatellitesSimpleEnv),
+    ("satellites", SatellitesEnv), ("satellites_simple", SatellitesSimpleEnv),
     ("screws", ScrewsEnv),
     ("repeated_nextto_painting", RepeatedNextToPaintingEnv),
     ("pddl_blocks_fixed_tasks", FixedTasksBlocksPDDLEnv),