revert older version of black

husarion · Jan 30, 2024 · 65e241f · 65e241f
1 parent 066ae9b
commit 65e241f
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 24 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -33,10 +33,10 @@ repos:
         args: [--mapping, '2', --sequence, '4', --offset, '2', --width, '100']
 
   - repo: https://github.com/psf/black
-    rev: 24.1.1
+    rev: 23.11.0
     hooks:
       - id: black
-        args: [--line-length=99]
+        args: [--line-length=99, --experimental-string-processing]
 
   - repo: https://github.com/PyCQA/flake8
     rev: 7.0.0

diff --git a/industrial_ci b/industrial_ci
diff --git a/rosbot_xl_bringup/test/test_diff_drive_ekf_and_scan.py b/rosbot_xl_bringup/test/test_diff_drive_ekf_and_scan.py
@@ -29,7 +29,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_bringup = get_package_share_directory("rosbot_xl_bringup")
     bringup_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_bringup/test/test_mecanum_ekf_and_scan.py b/rosbot_xl_bringup/test/test_mecanum_ekf_and_scan.py
@@ -29,7 +29,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_bringup = get_package_share_directory("rosbot_xl_bringup")
     bringup_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_bringup/test/test_multirobot_ekf_and_scan.py b/rosbot_xl_bringup/test/test_multirobot_ekf_and_scan.py
@@ -33,7 +33,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_bringup = get_package_share_directory("rosbot_xl_bringup")
     actions = []
     for i in range(len(robot_names)):

diff --git a/rosbot_xl_bringup/test/test_namespaced_diff_drive_ekf_and_scan.py b/rosbot_xl_bringup/test/test_namespaced_diff_drive_ekf_and_scan.py
@@ -29,7 +29,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_bringup = get_package_share_directory("rosbot_xl_bringup")
     bringup_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_bringup/test/test_namespaced_mecanum_ekf_and_scan.py b/rosbot_xl_bringup/test/test_namespaced_mecanum_ekf_and_scan.py
@@ -29,7 +29,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_bringup = get_package_share_directory("rosbot_xl_bringup")
     bringup_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_bringup/test/test_utils.py b/rosbot_xl_bringup/test/test_utils.py
@@ -114,9 +114,10 @@ def publish_scan(self):
 
 
 def ekf_and_scan_test(node: BringupTestNode, robot_name="ROSbot"):
-    assert node.odom_tf_event.wait(
-        20.0
-    ), f"{robot_name}: Expected odom to base_link tf but it was not received. Check robot_localization!"
+    assert node.odom_tf_event.wait(20.0), (
+        f"{robot_name}: Expected odom to base_link tf but it was not received. Check"
+        " robot_localization!"
+    )
 
     assert node.scan_filter_event.wait(
         20.0

diff --git a/rosbot_xl_controller/test/test_diff_drive_controllers.py b/rosbot_xl_controller/test/test_diff_drive_controllers.py
@@ -29,7 +29,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_controller = get_package_share_directory("rosbot_xl_controller")
     bringup_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_controller/test/test_mecanum_controllers.py b/rosbot_xl_controller/test/test_mecanum_controllers.py
@@ -30,7 +30,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_controller = get_package_share_directory("rosbot_xl_controller")
     bringup_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_controller/test/test_multirobot_controllers.py b/rosbot_xl_controller/test/test_multirobot_controllers.py
@@ -32,7 +32,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_controller = get_package_share_directory("rosbot_xl_controller")
     actions = []
     for i in range(len(robot_names)):

diff --git a/rosbot_xl_controller/test/test_namespaced_diff_drive_controllers.py b/rosbot_xl_controller/test/test_namespaced_diff_drive_controllers.py
@@ -30,7 +30,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_controller = get_package_share_directory("rosbot_xl_controller")
     bringup_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_controller/test/test_namespaced_mecanum_controllers.py b/rosbot_xl_controller/test/test_namespaced_mecanum_controllers.py
@@ -30,7 +30,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_controller = get_package_share_directory("rosbot_xl_controller")
     bringup_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_gazebo/test/test_diff_drive_simulation.py b/rosbot_xl_gazebo/test/test_diff_drive_simulation.py
@@ -33,7 +33,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_gazebo = get_package_share_directory("rosbot_xl_gazebo")
     simulation_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_gazebo/test/test_mecanum_simulation.py b/rosbot_xl_gazebo/test/test_mecanum_simulation.py
@@ -33,7 +33,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_gazebo = get_package_share_directory("rosbot_xl_gazebo")
     simulation_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_gazebo/test/test_multirobot_diff_drive_simulation.py b/rosbot_xl_gazebo/test/test_multirobot_diff_drive_simulation.py
@@ -31,7 +31,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     # IncludeLaunchDescription does not work with robots argument
     simulation_launch = ExecuteProcess(
         cmd=[

diff --git a/rosbot_xl_gazebo/test/test_multirobot_mecanum_simulation.py b/rosbot_xl_gazebo/test/test_multirobot_mecanum_simulation.py
@@ -31,7 +31,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     # IncludeLaunchDescription does not work with robots argument
     simulation_launch = ExecuteProcess(
         cmd=[

diff --git a/rosbot_xl_gazebo/test/test_namespaced_diff_drive_simulation.py b/rosbot_xl_gazebo/test/test_namespaced_diff_drive_simulation.py
@@ -33,7 +33,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_gazebo = get_package_share_directory("rosbot_xl_gazebo")
     simulation_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_gazebo/test/test_namespaced_mecanum_simulation.py b/rosbot_xl_gazebo/test/test_namespaced_mecanum_simulation.py
@@ -32,7 +32,6 @@
 
 @launch_pytest.fixture
 def generate_test_description():
-
     rosbot_xl_gazebo = get_package_share_directory("rosbot_xl_gazebo")
     simulation_launch = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(

diff --git a/rosbot_xl_gazebo/test/test_utils.py b/rosbot_xl_gazebo/test/test_utils.py
@@ -186,9 +186,11 @@ def __exit__(self, exep_type, exep_value, trace):
 
 
 def wait_for_initialization(node: SimulationTestNode, robot_name="ROSbot"):
-    assert node.robot_initialized_event.wait(
-        30
-    ), f"{robot_name} does not initialized correctly!\n\tIs controller_msg: {node.is_controller_msg}\n\tIs ekf_msg: {node.is_ekf_msg}\n\tIs imu_msg: {node.is_imu_msg}\n\tIs joint_msg: {node.is_joint_msg}"
+    assert node.robot_initialized_event.wait(30), (
+        f"{robot_name} does not initialized correctly!\n\tIs controller_msg:"
+        f" {node.is_controller_msg}\n\tIs ekf_msg: {node.is_ekf_msg}\n\tIs imu_msg:"
+        f" {node.is_imu_msg}\n\tIs joint_msg: {node.is_joint_msg}"
+    )
 
 
 def x_speed_test(node: SimulationTestNode, v_x=0.0, v_y=0.0, v_yaw=0.0, robot_name="ROSbot"):