Merge pull request cyberbotics#6484 from cyberbotics/sync-master-3c3f84995

Merge master into develop

Author: omichel

.github/pull_request_template.md

@@ -1,20 +1,25 @@
 **Description**
-Describe the bug you are fixing, the new feature your are introducing or the enhancement you are proposing.
+Describe the bug fix, enhancement or new feature your are proposing.
 
 **Related Issues**
 This pull-request fixes issue #
 
 **Tasks**
 Add the list of tasks of this PR.
+  - [ ] Update the [changelog](https://github.com/cyberbotics/webots/blob/master/docs/reference/changelog-r2023.md)
+  - [ ] Update the documentation (if needed)
   - [ ] Task 1
   - [ ] Task 2
+  - [ ] ...
 
 **Documentation**
 If this pull-request changes the doc, add the link to the related page, including the `?version=BRANCH_NAME`, such as:
-https://cyberbotics.com/doc/guide/getting-started-with-webots?version=develop
+https://cyberbotics.com/doc/guide/getting-started-with-webots?version=my_repo:my_branch
+or
+https://cyberbotics.com/doc/guide/getting-started-with-webots?version=my_branch (if the branch is on this repository)
 
 **Screenshots**
-If this pull-request includes any new robots/simulations/etc. add one or more screenshots of the result.
+If this pull-request includes any interesting visible result, add one or more screenshots.
 
 **Additional context**
 Add any other context about the pull-request here.

docs/reference/changelog-r2023.md

@@ -8,6 +8,7 @@ Released on XXX XXth, 2023.
     - Enabled the launching of MATLAB desktop from the extern launcher ([#6366](https://github.com/cyberbotics/webots/pull/6366)). 
     - Improved overlays visible in Overlays menu by adding all the robots in the menu list ([#6297](https://github.com/cyberbotics/webots/pull/6297)).
   - Bug fixes
+    - Fixed Python path for `libcar.dylib` and `libdriver.dylib` on macOS ([#6482](https://github.com/cyberbotics/webots/pull/6482)).
     - Avoided crash and provided better warnings when attempting to access PROTO nodes in a wrong way from the supervisor API ([#6473](https://github.com/cyberbotics/webots/pull/6473)).
     - Fixed errors loading template PROTO if the system user name, the project path, or the temporary directory path contains the `\` character ([#6288](https://github.com/cyberbotics/webots/pull/6288)).
     - Fixed Webots and libController version comparison not to take revisions into account ([#6315](https://github.com/cyberbotics/webots/pull/6315)).

lib/controller/python/vehicle/car.py

@@ -41,7 +41,7 @@ def __init__(self):
         elif sys.platform == 'win32':
             path = os.path.join('lib', 'controller', 'car.dll')
         elif sys.platform == 'darwin':
-            path = os.path.join('Contents', 'MacOS', 'lib', 'controller', 'libcar.dylib')
+            path = os.path.join('Contents', 'lib', 'controller', 'libcar.dylib')
         self.api = ctypes.cdll.LoadLibrary(os.path.join(os.environ['WEBOTS_HOME'], path))
         self.api.wbu_car_get_front_wheel_radius.restype = ctypes.c_double
         self.api.wbu_car_get_indicator_period.restype = ctypes.c_double

lib/controller/python/vehicle/driver.py

@@ -43,7 +43,7 @@ def loadApi() -> ctypes.cdll:
             car = 'car.dll'
             driver = 'driver.dll'
         elif sys.platform == 'darwin':
-            path = os.path.join('Contents', 'MacOS', 'lib', 'controller')
+            path = os.path.join('Contents', 'lib', 'controller')
             car = 'libcar.dylib'
             driver = 'libdriver.dylib'
         ctypes.cdll.LoadLibrary(os.path.join(os.environ['WEBOTS_HOME'], path, car))