From 577cf1d1b0a24b5681e851e5d8999290b159e0f7 Mon Sep 17 00:00:00 2001 From: Benedikt Haas Date: Tue, 30 Jan 2024 15:24:10 +0100 Subject: [PATCH] apply relevant review points --- CARLOS_CHANGELOG.md | 18 ++++++++++++++++++ FEATURES.md | 10 ---------- README.md | 4 ++-- docker/Dockerfile | 5 +---- .../actorcontrols/carla_autopilot.py | 4 ++-- 5 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 CARLOS_CHANGELOG.md delete mode 100644 FEATURES.md diff --git a/CARLOS_CHANGELOG.md b/CARLOS_CHANGELOG.md new file mode 100644 index 000000000..ad1a93d43 --- /dev/null +++ b/CARLOS_CHANGELOG.md @@ -0,0 +1,18 @@ +## Latest : 1.0.0 + +## 1.0.0 - Initial Release + +- GitHub workflow to automatically build Docker images +- update to CARLA 0.9.15 +- update to Ubuntu 22.04 and Python3.10 including corresponding pip versions + +### Major changes + +* Created GitHub workflow to automatically build Docker images using [docker-ros](https://github.com/ika-rwth-aachen/docker-ros) +* Update to [CARLA 0.9.15](https://carla.org/2023/11/10/release-0.9.15/) +* Update to Ubuntu 22.04 and Python 3.10 including corresponding pip versions + +### Minor changes + +* Small fixes related to version updates +* Move original Docker related content to `docker_original_folder/` diff --git a/FEATURES.md b/FEATURES.md deleted file mode 100644 index 6a8679b9c..000000000 --- a/FEATURES.md +++ /dev/null @@ -1,10 +0,0 @@ -# Feature List -All changes are modifications to the original repository. - -## Core Features -- GitHub workflow to automatically build Docker images -- update to CARLA 0.9.15 -- update to Ubuntu 22.04 and Python3.10 including corresponding pip versions - -## Minor Features -- ... \ No newline at end of file diff --git a/README.md b/README.md index 37d09373d..21f2d3061 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@

> [!IMPORTANT] -> This repository is a minimal fork of the official [scenario_runner](https://github.com/carla-simulator/scenario_runner)! All modifications to the original repository are documented in [FEATURES.md](./FEATURES.md). +> This repository is a minimal fork of the official [scenario_runner](https://github.com/carla-simulator/scenario_runner)! All initial and following modifications to the original repository are documented in [CARLOS_CHANGELOG.md](./CARLOS_CHANGELOG.md). > [!TIP] > We recommend to use the *carla-scenario-runner* as **control actor** in our open, modular and scalable simulation framework **CARLOS**. @@ -19,7 +19,7 @@ > The *carla-scenario-runner* is used to enable scenario-based testing and evaluation. It is a powerful engine that follows the OpenSCENARIO standard for scenario definitions. > [!NOTE] -> We set up a Continous Integration (CI) pipeline as [GitHub action](./github/workflows/docker.yml) to continously build Docker images for the `carla-scenario-runner`, publicly available on [Docker Hub](https://hub.docker.com/r/rwthika/carla-scenario-runner). +> We set up a Continous Integration (CI) pipeline as [GitHub workflow](./github/workflows/docker.yml) to continously build Docker images for the `carla-scenario-runner`, publicly available on [Docker Hub](https://hub.docker.com/r/rwthika/carla-scenario-runner). --- --- diff --git a/docker/Dockerfile b/docker/Dockerfile index 23e408ecf..b28c1c316 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ ARG UBUNTU_VERSION="22.04" ############ dependencies ############ -FROM "ubuntu:${UBUNTU_VERSION}" as dependencies +FROM "ubuntu:${UBUNTU_VERSION}" USER root SHELL ["/bin/bash", "-c"] @@ -45,9 +45,6 @@ RUN echo "export PYTHONPATH=\$PYTHONPATH:$CARLA_API_PATH/carla/dist/$(ls $CARLA_ echo "export CARLA_API_PATH=$CARLA_API_PATH" >> /setup_carla_env.sh; \ echo "source /setup_carla_env.sh" >> ~/.bashrc -############ final ############ -FROM dependencies as final - # Needed for (pygame based) scripts that have a GUI ENV SDL_VIDEODRIVER=x11 diff --git a/srunner/scenariomanager/actorcontrols/carla_autopilot.py b/srunner/scenariomanager/actorcontrols/carla_autopilot.py index 37dfdcdf2..5b030119f 100644 --- a/srunner/scenariomanager/actorcontrols/carla_autopilot.py +++ b/srunner/scenariomanager/actorcontrols/carla_autopilot.py @@ -18,7 +18,7 @@ from srunner.scenariomanager.actorcontrols.basic_control import BasicControl -class CarlaAutopilot(BasicControl): +class CarlaAutoPilotControl(BasicControl): """ Controller class for vehicles derived from BasicControl. @@ -33,7 +33,7 @@ class CarlaAutopilot(BasicControl): """ def __init__(self, actor, args=None): - super(CarlaAutopilot, self).__init__(actor) + super(CarlaAutoPilotControl, self).__init__(actor) self._actor.set_autopilot(enabled=True) def reset(self):