Merge branch 'master' into dead-actor-cleanup

carla-simulator · Dec 2, 2024 · d03a3be · d03a3be
2 parents 3e3c2b8 + 26b643d
commit d03a3be
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,8 @@ You can use this system to prepare your agent for the CARLA Challenge.
 Scenarios can be defined through a Python interface, and with the newest version
 the scenario_runner also the upcoming [OpenSCENARIO](http://www.openscenario.org/) standard and [OpenSCENARIO 2.0](https://www.asam.net/standards/detail/openscenario/v200/) standard is supported.
 
+[Read the documentation here](https://scenario-runner.readthedocs.io/en/latest/).
+
 [![Scenario_Runner for CARLA](Docs/img/scenario_runner_video.png)](https://youtu.be/ChmF8IFagpo?t=68)
 
 Getting the ScenarioRunner
@@ -22,7 +24,7 @@ branch contains the latest fixes and features, and may be required to use the la
 It is important to also consider the release version that has to match the CARLA version.
 
 * [Version 0.9.15](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.15) and the 0.9.15 Branch: Compatible with [CARLA 0.9.15](https://github.com/carla-simulator/carla/releases/tag/0.9.15)
-* [Version 0.9.13](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.13) and the 0.9.13 Branch: Compatible with [CARLA 0.9.13](https://github.com/carla-simulator/carla/releases/tag/0.9.13)
+* [Version 0.9.13](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.13) and the 0.9.13 Branch: Compatible with [CARLA 0.9.13](https://github.com/carla-simulator/carla/releases/tag/0.9.13) and [CARLA 0.9.14](https://github.com/carla-simulator/carla/releases/tag/0.9.14)
 * [Version 0.9.12](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.12) and the 0.9.12 Branch: Compatible with [CARLA 0.9.12](https://github.com/carla-simulator/carla/releases/tag/0.9.12)
 * [Version 0.9.11](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.11) and the 0.9.11 Branch: Compatible with [CARLA 0.9.11](https://github.com/carla-simulator/carla/releases/tag/0.9.11)
 * [Version 0.9.10](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.10) and the 0.9.10 Branch: Compatible with [CARLA 0.9.10](https://github.com/carla-simulator/carla/releases/tag/0.9.10)
@@ -40,7 +42,7 @@ Currently no build is required, as all code is in Python.
 Using the ScenarioRunner
 ------------------------
 
-Please take a look at our [Getting started](Docs/getting_scenariorunner.md)
+Please take a look at our [Getting started](https://scenario-runner.readthedocs.io/en/latest/getting_scenariorunner/)
 documentation.
 
 Challenge Evaluation

diff --git a/scenario_runner.py b/scenario_runner.py
@@ -200,9 +200,9 @@ def _cleanup(self):
             except RuntimeError:
                 sys.exit(-1)
 
-        self.manager.cleanup()
+        # self.manager.cleanup()
 
-        CarlaDataProvider.cleanup()
+        # CarlaDataProvider.cleanup()
 
         for i, _ in enumerate(self.ego_vehicles):
             if self.ego_vehicles[i]:
@@ -660,4 +660,4 @@ def main():
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    sys.exit(main())
diff --git a/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py b/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py
@@ -4593,7 +4593,9 @@ def update(self):
                 new_status = py_trees.common.Status.SUCCESS
         except:  # pylint: disable=bare-except
             print("ActorSource unable to spawn actor")
-
+            new_status = py_trees.common.Status.FAILURE
+        finally:
+            return new_status
 
 class SwitchWrongDirectionTest(AtomicBehavior):