From a7add33190588daeaad44f92ee5e4e48a31077b8 Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Thu, 7 Nov 2024 20:19:36 +0000
Subject: [PATCH 1/3] Fix yet more python CI slop: just make pip work again

---
 .github/workflows/build.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fed98479..e64ff261 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: 'Insatll requirements'
-      run: pip3 install --user -r dev_requirements.txt
+      run: pip3 install  --user -r dev_requirements.txt
     - name: 'Run flake8'
       run: '$HOME/.local/bin/flake8 python3/ *.py'
   VimscriptLint:
@@ -27,7 +27,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: 'Install requirements'
-      run: pip3 install --user -r dev_requirements.txt
+      run: pip3 install  --user -r dev_requirements.txt
     - name: 'Run vint'
       run: $HOME/.local/bin/vint autoload/ compiler/ plugin/ tests/ syntax/
 
@@ -122,11 +122,11 @@ jobs:
         brew link --overwrite go
         # latest neovim doesn't work on python 3.12
         # https://github.com/neovim/pynvim/issues/538
-        pip3 install --user 'pynvim @ git+https://github.com/neovim/pynvim'
+        pip3 install --break-system-packages --user 'pynvim @ git+https://github.com/neovim/pynvim'
       name: 'Install vim and deps'
 
     - name: 'Install requirements'
-      run: pip3 install --user -r dev_requirements.txt
+      run: pip3 install --break-system-packages --user -r dev_requirements.txt
 
     - run: go install github.com/go-delve/delve/cmd/dlv@latest
       name: 'Install Delve for Go'

From 6be65e555fd7f63c5cffac6758e061440b47cdd5 Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Sat, 16 Nov 2024 16:52:38 +0000
Subject: [PATCH 2/3] Upgrade flake8 to fix boring python slop

---
 dev_requirements.txt | 6 +++---
 tox.ini              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index f24ae6df..12e336c2 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,6 +1,6 @@
-flake8                  == 3.8.3
-flake8-comprehensions   == 3.2.3
-flake8-ycm              >= 0.1.0
+flake8                >= 3.0.0
+flake8-comprehensions
+flake8-ycm            >= 0.1.0
 
 # asciinema is used to record the output in case of failure
 # asciinema               >= 2.2.0
diff --git a/tox.ini b/tox.ini
index 7a6c06e7..2ed322fb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,4 @@
 [flake8]
-ignore = E111,E114,E121,E125,E126,E127,E128,E129,E131,E133,E201,E202,E203,E211,E221,E222,E241,E251,E261,E303,E402,W503,W504
+ignore = E111,E114,E121,E125,E126,E127,E128,E129,E131,E133,E201,E202,E203,E211,E221,E222,E241,E251,E261,E303,E402,W503,W504,YCM201,YCM202
 max-line-length = 80
 exclude = python3/vimspector/vendor

From 68115a04e36590da7e08875933f0fb64b0cfbf23 Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Thu, 7 Nov 2024 21:08:44 +0000
Subject: [PATCH 3/3] Fix race condition in PID picker/atatch tests

Previously we were starting and resetting immediately, but sometimes if
this was slow we could end up in the exception breakpoints prompt and
stuck until timeout. Supress the prompt.
---
 support/test/cpp/simple_c_program/.vimspector.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/support/test/cpp/simple_c_program/.vimspector.json b/support/test/cpp/simple_c_program/.vimspector.json
index f277fc77..c72f550b 100644
--- a/support/test/cpp/simple_c_program/.vimspector.json
+++ b/support/test/cpp/simple_c_program/.vimspector.json
@@ -100,6 +100,12 @@
       "extends": "cpptools (lldb)",
       "configuration": {
         "request": "attach"
+      },
+      "breakpoints": {
+        "exception": {
+          "cpp_throw": "",
+          "cpp_catch": ""
+        }
       }
     },
     "CodeLLDB-attach": {
@@ -107,6 +113,12 @@
       "configuration": {
         "request": "attach",
         "pid": "${PickProcess(\"test\")}"
+      },
+      "breakpoints": {
+        "exception": {
+          "cpp_throw": "",
+          "cpp_catch": ""
+        }
       }
     }
   }