From e683007aebd90be8aacdcf94b364a8631f22ea77 Mon Sep 17 00:00:00 2001 From: nsubiron Date: Thu, 28 Mar 2019 17:58:46 +0100 Subject: [PATCH] Reorganize PythonAPI folder --- PythonAPI/{ => carla}/.gitignore | 0 PythonAPI/{ => carla}/agents/__init__.py | 0 PythonAPI/{ => carla}/agents/navigation/__init__.py | 0 PythonAPI/{ => carla}/agents/navigation/agent.py | 0 PythonAPI/{ => carla}/agents/navigation/basic_agent.py | 0 PythonAPI/{ => carla}/agents/navigation/controller.py | 0 .../{ => carla}/agents/navigation/global_route_planner.py | 0 .../agents/navigation/global_route_planner_dao.py | 0 PythonAPI/{ => carla}/agents/navigation/local_planner.py | 0 PythonAPI/{ => carla}/agents/navigation/roaming_agent.py | 0 PythonAPI/{ => carla}/agents/tools/__init__.py | 0 PythonAPI/{ => carla}/agents/tools/misc.py | 0 PythonAPI/carla/requirements.txt | 2 ++ PythonAPI/{ => carla}/scene_layout.py | 0 PythonAPI/{ => carla}/setup.py | 0 PythonAPI/{ => carla}/source/carla/__init__.py | 0 PythonAPI/{ => carla}/source/carla/command.py | 0 PythonAPI/{ => carla}/source/libcarla/Actor.cpp | 0 PythonAPI/{ => carla}/source/libcarla/Blueprint.cpp | 0 PythonAPI/{ => carla}/source/libcarla/Client.cpp | 0 PythonAPI/{ => carla}/source/libcarla/Commands.cpp | 0 PythonAPI/{ => carla}/source/libcarla/Control.cpp | 0 PythonAPI/{ => carla}/source/libcarla/Exception.cpp | 0 PythonAPI/{ => carla}/source/libcarla/Geom.cpp | 0 PythonAPI/{ => carla}/source/libcarla/Map.cpp | 0 PythonAPI/{ => carla}/source/libcarla/Sensor.cpp | 0 PythonAPI/{ => carla}/source/libcarla/SensorData.cpp | 0 PythonAPI/{ => carla}/source/libcarla/Weather.cpp | 0 PythonAPI/{ => carla}/source/libcarla/World.cpp | 0 PythonAPI/{ => carla}/source/libcarla/libcarla.cpp | 0 PythonAPI/{ => examples}/automatic_control.py | 0 PythonAPI/{ => examples}/dynamic_weather.py | 0 PythonAPI/{ => examples}/manual_control.py | 0 PythonAPI/{ => examples}/manual_control_steeringwheel.py | 0 PythonAPI/{ => examples}/no_rendering_mode.py | 0 PythonAPI/examples/requirements.txt | 3 +++ PythonAPI/{ => examples}/show_recorder_actors_blocked.py | 0 PythonAPI/{ => examples}/show_recorder_collisions.py | 0 PythonAPI/{ => examples}/show_recorder_file_info.py | 0 PythonAPI/{ => examples}/spawn_npc.py | 0 PythonAPI/{ => examples}/start_recording.py | 0 PythonAPI/{ => examples}/start_replaying.py | 0 PythonAPI/{ => examples}/synchronous_mode.py | 0 PythonAPI/{ => examples}/tutorial.py | 0 PythonAPI/{ => examples}/vehicle_gallery.py | 0 PythonAPI/requirements.txt | 6 ------ PythonAPI/test/requirements.txt | 1 + PythonAPI/{ => util}/lane_explorer.py | 0 PythonAPI/{ => util}/performance_benchmark.py | 0 PythonAPI/util/requirements.txt | 3 +++ PythonAPI/{test => util}/test_connection.py | 0 51 files changed, 9 insertions(+), 6 deletions(-) rename PythonAPI/{ => carla}/.gitignore (100%) rename PythonAPI/{ => carla}/agents/__init__.py (100%) rename PythonAPI/{ => carla}/agents/navigation/__init__.py (100%) rename PythonAPI/{ => carla}/agents/navigation/agent.py (100%) rename PythonAPI/{ => carla}/agents/navigation/basic_agent.py (100%) rename PythonAPI/{ => carla}/agents/navigation/controller.py (100%) rename PythonAPI/{ => carla}/agents/navigation/global_route_planner.py (100%) rename PythonAPI/{ => carla}/agents/navigation/global_route_planner_dao.py (100%) rename PythonAPI/{ => carla}/agents/navigation/local_planner.py (100%) rename PythonAPI/{ => carla}/agents/navigation/roaming_agent.py (100%) rename PythonAPI/{ => carla}/agents/tools/__init__.py (100%) rename PythonAPI/{ => carla}/agents/tools/misc.py (100%) create mode 100644 PythonAPI/carla/requirements.txt rename PythonAPI/{ => carla}/scene_layout.py (100%) rename PythonAPI/{ => carla}/setup.py (100%) rename PythonAPI/{ => carla}/source/carla/__init__.py (100%) rename PythonAPI/{ => carla}/source/carla/command.py (100%) rename PythonAPI/{ => carla}/source/libcarla/Actor.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/Blueprint.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/Client.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/Commands.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/Control.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/Exception.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/Geom.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/Map.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/Sensor.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/SensorData.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/Weather.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/World.cpp (100%) rename PythonAPI/{ => carla}/source/libcarla/libcarla.cpp (100%) rename PythonAPI/{ => examples}/automatic_control.py (100%) rename PythonAPI/{ => examples}/dynamic_weather.py (100%) rename PythonAPI/{ => examples}/manual_control.py (100%) rename PythonAPI/{ => examples}/manual_control_steeringwheel.py (100%) rename PythonAPI/{ => examples}/no_rendering_mode.py (100%) create mode 100644 PythonAPI/examples/requirements.txt rename PythonAPI/{ => examples}/show_recorder_actors_blocked.py (100%) rename PythonAPI/{ => examples}/show_recorder_collisions.py (100%) rename PythonAPI/{ => examples}/show_recorder_file_info.py (100%) rename PythonAPI/{ => examples}/spawn_npc.py (100%) rename PythonAPI/{ => examples}/start_recording.py (100%) rename PythonAPI/{ => examples}/start_replaying.py (100%) rename PythonAPI/{ => examples}/synchronous_mode.py (100%) rename PythonAPI/{ => examples}/tutorial.py (100%) rename PythonAPI/{ => examples}/vehicle_gallery.py (100%) delete mode 100644 PythonAPI/requirements.txt create mode 100644 PythonAPI/test/requirements.txt rename PythonAPI/{ => util}/lane_explorer.py (100%) rename PythonAPI/{ => util}/performance_benchmark.py (100%) create mode 100644 PythonAPI/util/requirements.txt rename PythonAPI/{test => util}/test_connection.py (100%) diff --git a/PythonAPI/.gitignore b/PythonAPI/carla/.gitignore similarity index 100% rename from PythonAPI/.gitignore rename to PythonAPI/carla/.gitignore diff --git a/PythonAPI/agents/__init__.py b/PythonAPI/carla/agents/__init__.py similarity index 100% rename from PythonAPI/agents/__init__.py rename to PythonAPI/carla/agents/__init__.py diff --git a/PythonAPI/agents/navigation/__init__.py b/PythonAPI/carla/agents/navigation/__init__.py similarity index 100% rename from PythonAPI/agents/navigation/__init__.py rename to PythonAPI/carla/agents/navigation/__init__.py diff --git a/PythonAPI/agents/navigation/agent.py b/PythonAPI/carla/agents/navigation/agent.py similarity index 100% rename from PythonAPI/agents/navigation/agent.py rename to PythonAPI/carla/agents/navigation/agent.py diff --git a/PythonAPI/agents/navigation/basic_agent.py b/PythonAPI/carla/agents/navigation/basic_agent.py similarity index 100% rename from PythonAPI/agents/navigation/basic_agent.py rename to PythonAPI/carla/agents/navigation/basic_agent.py diff --git a/PythonAPI/agents/navigation/controller.py b/PythonAPI/carla/agents/navigation/controller.py similarity index 100% rename from PythonAPI/agents/navigation/controller.py rename to PythonAPI/carla/agents/navigation/controller.py diff --git a/PythonAPI/agents/navigation/global_route_planner.py b/PythonAPI/carla/agents/navigation/global_route_planner.py similarity index 100% rename from PythonAPI/agents/navigation/global_route_planner.py rename to PythonAPI/carla/agents/navigation/global_route_planner.py diff --git a/PythonAPI/agents/navigation/global_route_planner_dao.py b/PythonAPI/carla/agents/navigation/global_route_planner_dao.py similarity index 100% rename from PythonAPI/agents/navigation/global_route_planner_dao.py rename to PythonAPI/carla/agents/navigation/global_route_planner_dao.py diff --git a/PythonAPI/agents/navigation/local_planner.py b/PythonAPI/carla/agents/navigation/local_planner.py similarity index 100% rename from PythonAPI/agents/navigation/local_planner.py rename to PythonAPI/carla/agents/navigation/local_planner.py diff --git a/PythonAPI/agents/navigation/roaming_agent.py b/PythonAPI/carla/agents/navigation/roaming_agent.py similarity index 100% rename from PythonAPI/agents/navigation/roaming_agent.py rename to PythonAPI/carla/agents/navigation/roaming_agent.py diff --git a/PythonAPI/agents/tools/__init__.py b/PythonAPI/carla/agents/tools/__init__.py similarity index 100% rename from PythonAPI/agents/tools/__init__.py rename to PythonAPI/carla/agents/tools/__init__.py diff --git a/PythonAPI/agents/tools/misc.py b/PythonAPI/carla/agents/tools/misc.py similarity index 100% rename from PythonAPI/agents/tools/misc.py rename to PythonAPI/carla/agents/tools/misc.py diff --git a/PythonAPI/carla/requirements.txt b/PythonAPI/carla/requirements.txt new file mode 100644 index 000000000..d8202e605 --- /dev/null +++ b/PythonAPI/carla/requirements.txt @@ -0,0 +1,2 @@ +networkx +numpy diff --git a/PythonAPI/scene_layout.py b/PythonAPI/carla/scene_layout.py similarity index 100% rename from PythonAPI/scene_layout.py rename to PythonAPI/carla/scene_layout.py diff --git a/PythonAPI/setup.py b/PythonAPI/carla/setup.py similarity index 100% rename from PythonAPI/setup.py rename to PythonAPI/carla/setup.py diff --git a/PythonAPI/source/carla/__init__.py b/PythonAPI/carla/source/carla/__init__.py similarity index 100% rename from PythonAPI/source/carla/__init__.py rename to PythonAPI/carla/source/carla/__init__.py diff --git a/PythonAPI/source/carla/command.py b/PythonAPI/carla/source/carla/command.py similarity index 100% rename from PythonAPI/source/carla/command.py rename to PythonAPI/carla/source/carla/command.py diff --git a/PythonAPI/source/libcarla/Actor.cpp b/PythonAPI/carla/source/libcarla/Actor.cpp similarity index 100% rename from PythonAPI/source/libcarla/Actor.cpp rename to PythonAPI/carla/source/libcarla/Actor.cpp diff --git a/PythonAPI/source/libcarla/Blueprint.cpp b/PythonAPI/carla/source/libcarla/Blueprint.cpp similarity index 100% rename from PythonAPI/source/libcarla/Blueprint.cpp rename to PythonAPI/carla/source/libcarla/Blueprint.cpp diff --git a/PythonAPI/source/libcarla/Client.cpp b/PythonAPI/carla/source/libcarla/Client.cpp similarity index 100% rename from PythonAPI/source/libcarla/Client.cpp rename to PythonAPI/carla/source/libcarla/Client.cpp diff --git a/PythonAPI/source/libcarla/Commands.cpp b/PythonAPI/carla/source/libcarla/Commands.cpp similarity index 100% rename from PythonAPI/source/libcarla/Commands.cpp rename to PythonAPI/carla/source/libcarla/Commands.cpp diff --git a/PythonAPI/source/libcarla/Control.cpp b/PythonAPI/carla/source/libcarla/Control.cpp similarity index 100% rename from PythonAPI/source/libcarla/Control.cpp rename to PythonAPI/carla/source/libcarla/Control.cpp diff --git a/PythonAPI/source/libcarla/Exception.cpp b/PythonAPI/carla/source/libcarla/Exception.cpp similarity index 100% rename from PythonAPI/source/libcarla/Exception.cpp rename to PythonAPI/carla/source/libcarla/Exception.cpp diff --git a/PythonAPI/source/libcarla/Geom.cpp b/PythonAPI/carla/source/libcarla/Geom.cpp similarity index 100% rename from PythonAPI/source/libcarla/Geom.cpp rename to PythonAPI/carla/source/libcarla/Geom.cpp diff --git a/PythonAPI/source/libcarla/Map.cpp b/PythonAPI/carla/source/libcarla/Map.cpp similarity index 100% rename from PythonAPI/source/libcarla/Map.cpp rename to PythonAPI/carla/source/libcarla/Map.cpp diff --git a/PythonAPI/source/libcarla/Sensor.cpp b/PythonAPI/carla/source/libcarla/Sensor.cpp similarity index 100% rename from PythonAPI/source/libcarla/Sensor.cpp rename to PythonAPI/carla/source/libcarla/Sensor.cpp diff --git a/PythonAPI/source/libcarla/SensorData.cpp b/PythonAPI/carla/source/libcarla/SensorData.cpp similarity index 100% rename from PythonAPI/source/libcarla/SensorData.cpp rename to PythonAPI/carla/source/libcarla/SensorData.cpp diff --git a/PythonAPI/source/libcarla/Weather.cpp b/PythonAPI/carla/source/libcarla/Weather.cpp similarity index 100% rename from PythonAPI/source/libcarla/Weather.cpp rename to PythonAPI/carla/source/libcarla/Weather.cpp diff --git a/PythonAPI/source/libcarla/World.cpp b/PythonAPI/carla/source/libcarla/World.cpp similarity index 100% rename from PythonAPI/source/libcarla/World.cpp rename to PythonAPI/carla/source/libcarla/World.cpp diff --git a/PythonAPI/source/libcarla/libcarla.cpp b/PythonAPI/carla/source/libcarla/libcarla.cpp similarity index 100% rename from PythonAPI/source/libcarla/libcarla.cpp rename to PythonAPI/carla/source/libcarla/libcarla.cpp diff --git a/PythonAPI/automatic_control.py b/PythonAPI/examples/automatic_control.py similarity index 100% rename from PythonAPI/automatic_control.py rename to PythonAPI/examples/automatic_control.py diff --git a/PythonAPI/dynamic_weather.py b/PythonAPI/examples/dynamic_weather.py similarity index 100% rename from PythonAPI/dynamic_weather.py rename to PythonAPI/examples/dynamic_weather.py diff --git a/PythonAPI/manual_control.py b/PythonAPI/examples/manual_control.py similarity index 100% rename from PythonAPI/manual_control.py rename to PythonAPI/examples/manual_control.py diff --git a/PythonAPI/manual_control_steeringwheel.py b/PythonAPI/examples/manual_control_steeringwheel.py similarity index 100% rename from PythonAPI/manual_control_steeringwheel.py rename to PythonAPI/examples/manual_control_steeringwheel.py diff --git a/PythonAPI/no_rendering_mode.py b/PythonAPI/examples/no_rendering_mode.py similarity index 100% rename from PythonAPI/no_rendering_mode.py rename to PythonAPI/examples/no_rendering_mode.py diff --git a/PythonAPI/examples/requirements.txt b/PythonAPI/examples/requirements.txt new file mode 100644 index 000000000..a094ef062 --- /dev/null +++ b/PythonAPI/examples/requirements.txt @@ -0,0 +1,3 @@ +future +numpy +pygame diff --git a/PythonAPI/show_recorder_actors_blocked.py b/PythonAPI/examples/show_recorder_actors_blocked.py similarity index 100% rename from PythonAPI/show_recorder_actors_blocked.py rename to PythonAPI/examples/show_recorder_actors_blocked.py diff --git a/PythonAPI/show_recorder_collisions.py b/PythonAPI/examples/show_recorder_collisions.py similarity index 100% rename from PythonAPI/show_recorder_collisions.py rename to PythonAPI/examples/show_recorder_collisions.py diff --git a/PythonAPI/show_recorder_file_info.py b/PythonAPI/examples/show_recorder_file_info.py similarity index 100% rename from PythonAPI/show_recorder_file_info.py rename to PythonAPI/examples/show_recorder_file_info.py diff --git a/PythonAPI/spawn_npc.py b/PythonAPI/examples/spawn_npc.py similarity index 100% rename from PythonAPI/spawn_npc.py rename to PythonAPI/examples/spawn_npc.py diff --git a/PythonAPI/start_recording.py b/PythonAPI/examples/start_recording.py similarity index 100% rename from PythonAPI/start_recording.py rename to PythonAPI/examples/start_recording.py diff --git a/PythonAPI/start_replaying.py b/PythonAPI/examples/start_replaying.py similarity index 100% rename from PythonAPI/start_replaying.py rename to PythonAPI/examples/start_replaying.py diff --git a/PythonAPI/synchronous_mode.py b/PythonAPI/examples/synchronous_mode.py similarity index 100% rename from PythonAPI/synchronous_mode.py rename to PythonAPI/examples/synchronous_mode.py diff --git a/PythonAPI/tutorial.py b/PythonAPI/examples/tutorial.py similarity index 100% rename from PythonAPI/tutorial.py rename to PythonAPI/examples/tutorial.py diff --git a/PythonAPI/vehicle_gallery.py b/PythonAPI/examples/vehicle_gallery.py similarity index 100% rename from PythonAPI/vehicle_gallery.py rename to PythonAPI/examples/vehicle_gallery.py diff --git a/PythonAPI/requirements.txt b/PythonAPI/requirements.txt deleted file mode 100644 index 022078dc8..000000000 --- a/PythonAPI/requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -future -networkx -nose2 -numpy -pygame -setuptools diff --git a/PythonAPI/test/requirements.txt b/PythonAPI/test/requirements.txt new file mode 100644 index 000000000..cafd3e032 --- /dev/null +++ b/PythonAPI/test/requirements.txt @@ -0,0 +1 @@ +nose2 diff --git a/PythonAPI/lane_explorer.py b/PythonAPI/util/lane_explorer.py similarity index 100% rename from PythonAPI/lane_explorer.py rename to PythonAPI/util/lane_explorer.py diff --git a/PythonAPI/performance_benchmark.py b/PythonAPI/util/performance_benchmark.py similarity index 100% rename from PythonAPI/performance_benchmark.py rename to PythonAPI/util/performance_benchmark.py diff --git a/PythonAPI/util/requirements.txt b/PythonAPI/util/requirements.txt new file mode 100644 index 000000000..a094ef062 --- /dev/null +++ b/PythonAPI/util/requirements.txt @@ -0,0 +1,3 @@ +future +numpy +pygame diff --git a/PythonAPI/test/test_connection.py b/PythonAPI/util/test_connection.py similarity index 100% rename from PythonAPI/test/test_connection.py rename to PythonAPI/util/test_connection.py