Skip to content

Commit

Permalink
Merge pull request #1131 from davidhalter/ci
Browse files Browse the repository at this point in the history
CI Fixes
  • Loading branch information
davidhalter authored Dec 27, 2024
2 parents 130ce7f + a063955 commit 344814c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 45 deletions.
32 changes: 2 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -25,39 +25,11 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: recursive

- name: Run tests
run: |
vim --version
make check
coverage:
runs-on: ubuntu-20.04

steps:
- name: Checkout code
uses: actions/checkout@v2
with:
submodules: recursive

- name: Install dependencies
run: |
sudo add-apt-repository ppa:neovim-ppa/stable -y
sudo apt-get update -q
sudo apt-get install neovim -y
sudo pip install pynvim pytest-cov
sudo pip list
nvim --version
- name: Run tests
run: |
make --keep-going test_coverage BUILD_VIRTUAL_ENV=$VIRTUAL_ENV
- name: Upload coverage data
run: |
coverage xml
bash <(curl -s https://codecov.io/bash) -X fix -f coverage.xml -F py${TRAVIS_PYTHON_VERSION//./}
2 changes: 1 addition & 1 deletion pythonx/jedi
Submodule jedi updated 41 files
+6 −6 .github/workflows/ci.yml
+5 −0 .readthedocs.yml
+3 −0 AUTHORS.txt
+5 −0 CHANGELOG.rst
+1 −1 SECURITY.md
+1 −1 jedi/__init__.py
+14 −1 jedi/_compatibility.py
+2 −2 jedi/api/__init__.py
+33 −3 jedi/api/completion.py
+20 −6 jedi/api/environment.py
+1 −1 jedi/inference/__init__.py
+139 −18 jedi/inference/compiled/subprocess/__init__.py
+12 −3 jedi/inference/syntax_tree.py
+9 −5 jedi/parser_utils.py
+20 −1 jedi/plugins/pytest.py
+7 −1 setup.cfg
+4 −3 setup.py
+10 −0 test/completion/basic.py
+6 −0 test/completion/conftest.py
+2 −4 test/completion/context.py
+6 −0 test/completion/fixture_module.py
+5 −0 test/completion/pep0484_basic.py
+3 −0 test/completion/pytest.py
+11 −2 test/test_api/test_api.py
+2 −2 test/test_api/test_classes.py
+1 −1 test/test_api/test_context.py
+23 −19 test/test_api/test_interpreter.py
+8 −4 test/test_api/test_project.py
+1 −1 test/test_api/test_refactoring.py
+1 −1 test/test_api/test_search.py
+1 −0 test/test_debug.py
+3 −2 test/test_inference/test_compiled.py
+5 −2 test/test_inference/test_docstring.py
+3 −1 test/test_inference/test_extension.py
+2 −2 test/test_inference/test_gradual/test_typeshed.py
+22 −0 test/test_inference/test_imports.py
+0 −1 test/test_inference/test_literals.py
+3 −2 test/test_inference/test_signature.py
+2 −2 test/test_inference/test_sys_path.py
+0 −1 test/test_parso_integration/test_basic.py
+12 −6 test/test_utils.py
13 changes: 0 additions & 13 deletions test/vspec/completions.vim
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,6 @@ describe 'completions'
Expect getline('.') == 'IndentationError().filename'
end

it 'multi complete'
" NOTE: nvim results in "importErr()" here with completeopt+=longest,
" but Vim is fine.
" This is due to `pumvisible()` in jedi#complete_opened being true
" with nvim still, but it is 0 with Vim, i.e. Vim appears to close
" the pum already (with the tests).
"
" This might be a misunderstanding though, since the test might not
" expect the "import" keyword to be offered for completion?!
normal oImpXErrX()
Expect getline('.') == 'ImportError()'
end

it 'cycling through entries popup_select_first=0'
set completeopt+=longest
let g:jedi#popup_select_first = 0
Expand Down

0 comments on commit 344814c

Please sign in to comment.