Fix: ci issues and cherry-pick from stable branch. (#2163)

* fix: the flake8 max line failure (#2134) * Fix additional issue
Open-MSS · Jan 24, 2024 · 2d22420 · 2d22420
1 parent bcd7193
commit 2d22420
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/python-flake8.yml b/.github/workflows/python-flake8.yml
@@ -31,4 +31,4 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install flake8 flake8-builtins
-        flake8 --count --max-line-length=127 --statistics mslib tests
+        flake8 --count --statistics mslib tests
diff --git a/tests/_test_msui/test_mscolab_merge_waypoints.py b/tests/_test_msui/test_mscolab_merge_waypoints.py
@@ -132,7 +132,9 @@ def test_save_overwrite_to_server(self, mockbox):
         assert wp_server_before.lat != wp_local_before.lat
 
         # trigger save to server action from server options combobox
-        with mock.patch("mslib.msui.mscolab.MscolabMergeWaypointsDialog", AutoClickOverwriteMscolabMergeWaypointsDialog):
+        with mock.patch(
+            "mslib.msui.mscolab.MscolabMergeWaypointsDialog",
+                AutoClickOverwriteMscolabMergeWaypointsDialog):
             self.window.serverOptionsCb.setCurrentIndex(2)
         QtWidgets.QApplication.processEvents()
         # get the updated waypoints model from the server