Merge pull request #895 from puremourning/fix-ci-again

Fix yet more python CI slop: just make pip work again
puremourning · Nov 16, 2024 · d028fec · d028fec
2 parents ecb4669 + 68115a0
commit d028fec
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git 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'

diff --git 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/support/test/cpp/simple_c_program/.vimspector.json b/support/test/cpp/simple_c_program/.vimspector.json
@@ -100,13 +100,25 @@
       "extends": "cpptools (lldb)",
       "configuration": {
         "request": "attach"
+      },
+      "breakpoints": {
+        "exception": {
+          "cpp_throw": "",
+          "cpp_catch": ""
+        }
       }
     },
     "CodeLLDB-attach": {
       "extends": "CodeLLDB",
       "configuration": {
         "request": "attach",
         "pid": "${PickProcess(\"test\")}"
+      },
+      "breakpoints": {
+        "exception": {
+          "cpp_throw": "",
+          "cpp_catch": ""
+        }
       }
     }
   }

diff --git 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