From 80363dbdd27f592463d40e526f88d5b98daf5c5a Mon Sep 17 00:00:00 2001 From: Shinya Ohyanagi Date: Mon, 27 Apr 2020 00:03:13 +0900 Subject: [PATCH 1/5] Fix travis settings --- .travis.yml | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index c42a84d..28ac44f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,41 @@ -dist: bionic +sudo: false +group: travis_latest language: vim -install: - - pwd +cache: + apt: true + ccache: true + +before_install: - git clone https://github.com/junegunn/vader.vim.git tests/vader.vim - - git clone https://github.com/vim/vim /tmp/vim - - mkdir ~/tmp - - cd /tmp/vim - - sudo apt-get install -y gettext libncurses5-dev libacl1-dev libgpm-dev - - ./configure --with-features=huge --enable-fail-if-missing --enable-pythoninterp --prefix=$HOME/tmp/vim --disable-gui - - make && make install - - git clone https://github.com/junegunn/vader.vim.git - - export VIM_EXE=$HOME/tmp/vim/bin/vim - sudo apt-get install python3 - sudo apt-get install python3-dev - sudo apt-get install python3-venv + +before_script: - cd $HOME/build/heavenshell/vim-pydocstring - make install + - cd $HOME/build/heavenshell/vim-pydocstring/tests -before_script: - - $HOME/tmp/vim/bin/vim --version +jobs: + include: + - env: ENV="Vim8" + install: + - git clone https://github.com/vim/vim /tmp/vim + - mkdir ~/tmp + - cd /tmp/vim + - sudo apt-get install -y gettext libncurses5-dev libacl1-dev libgpm-dev + - ./configure --with-features=huge --enable-fail-if-missing --enable-pythoninterp --prefix=$HOME/tmp/vim --disable-gui + - make && make install + + script: + - VIM_EXE=$HOME/bin/vim/bin/vim ./run.sh + + - env: ENV="Neovim" + install: + - mkdir -p ~/tmp/nvim/bin + - curl -L https://github.com/neovim/neovim/releases/download/v0.4.3/nvim.appimage -o ~/tmp/nvim/bin/nvim + - chmod u+x ~/tmp/nvim/bin/nvim -script: - - cd tests - - ./run.sh + script: + - VIM_EXE=$HOME/tmp/nvim/bin/nvim ./run.sh From ad366af89a0b9e23bb2c57597c0085db416c5d27 Mon Sep 17 00:00:00 2001 From: Shinya Ohyanagi Date: Mon, 27 Apr 2020 00:10:29 +0900 Subject: [PATCH 2/5] Fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 28ac44f..e4749d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ jobs: - make && make install script: - - VIM_EXE=$HOME/bin/vim/bin/vim ./run.sh + - VIM_EXE=$HOME/tmp/vim/bin/vim ./run.sh - env: ENV="Neovim" install: From 2a46e9e1793fb9649e2d12d6e09a7afcd9c0d769 Mon Sep 17 00:00:00 2001 From: Shinya Ohyanagi Date: Mon, 27 Apr 2020 00:28:18 +0900 Subject: [PATCH 3/5] Fix --- ftplugin/python/pydocstring.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ftplugin/python/pydocstring.vim b/ftplugin/python/pydocstring.vim index c2dc95c..3f9d4b6 100644 --- a/ftplugin/python/pydocstring.vim +++ b/ftplugin/python/pydocstring.vim @@ -9,10 +9,10 @@ let s:save_cpo = &cpo set cpo&vim " version check -if !has('nvim') && (!has('channel') || !has('job')) - echoerr '+channel and +job are required for pydocstring.vim' - finish -endif +" if !has('nvim') && (!has('channel') || !has('job')) +" echoerr '+channel and +job are required for pydocstring.vim' +" finish +" endif command! -nargs=0 -range=0 -complete=customlist,pydocstring#insert Pydocstring call pydocstring#insert(, , , ) command! -nargs=0 -complete=customlist,pydocstring#format PydocstringFormat call pydocstring#format() From c9ab5311017c6aa05c26f8f0d4cfc72902a7a465 Mon Sep 17 00:00:00 2001 From: Shinya Ohyanagi Date: Tue, 28 Apr 2020 00:53:20 +0900 Subject: [PATCH 4/5] Fix typo --- tests/format.vader | 4 ++-- tests/google.vader | 2 +- tests/numpy.vader | 2 +- tests/sphinx.vader | 2 +- tests/template.vader | 5 ++++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/format.vader b/tests/format.vader index bb54532..956816f 100644 --- a/tests/format.vader +++ b/tests/format.vader @@ -1,6 +1,6 @@ # vim:set et sw=4 ts=4 tw=79: -Execute (Setup template dir): +Execute (Setup template formatter): Save g:pydocstring_formatter let g:pydocstring_formatter = 'sphinx' @@ -18,7 +18,7 @@ Given python (Format all): Execute: :PydocstringFormat - :sleep 500m + :sleep 1 Expect python: class Foo: diff --git a/tests/google.vader b/tests/google.vader index b98016a..283b40d 100644 --- a/tests/google.vader +++ b/tests/google.vader @@ -1,6 +1,6 @@ # vim:set et sw=4 ts=4 tw=79: -Execute (Setup template dir): +Execute (Setup template formatter): Save g:pydocstring_formatter let g:pydocstring_formatter = 'google' diff --git a/tests/numpy.vader b/tests/numpy.vader index 77e1b87..14fa3aa 100644 --- a/tests/numpy.vader +++ b/tests/numpy.vader @@ -1,6 +1,6 @@ # vim:set et sw=4 ts=4 tw=79: -Execute (Setup template dir): +Execute (Setup template formatter): Save g:pydocstring_formatter let g:pydocstring_formatter = 'numpy' diff --git a/tests/sphinx.vader b/tests/sphinx.vader index 3776d0d..0f62426 100644 --- a/tests/sphinx.vader +++ b/tests/sphinx.vader @@ -1,6 +1,6 @@ # vim:set et sw=4 ts=4 tw=79: -Execute (Setup template dir): +Execute (Setup template formatter): Save g:pydocstring_formatter let g:pydocstring_formatter = 'sphinx' diff --git a/tests/template.vader b/tests/template.vader index b3364a2..a845ad2 100644 --- a/tests/template.vader +++ b/tests/template.vader @@ -1,9 +1,12 @@ # vim:set et sw=4 ts=4 tw=79: -Execute (Setup template dir): +Execute (Setup template path): Save g:pydocstring_templates_path let g:pydocstring_templates_path = './templates' + Save g:pydocstring_formatter + let g:pydocstring_formatter = 'sphinx' + Given python (def foo): def foo(): pass From a907061396a0535f2465939710364d3cf1e1dd1a Mon Sep 17 00:00:00 2001 From: Shinya Ohyanagi Date: Tue, 28 Apr 2020 00:58:41 +0900 Subject: [PATCH 5/5] Fix revert version check --- ftplugin/python/pydocstring.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ftplugin/python/pydocstring.vim b/ftplugin/python/pydocstring.vim index 3f9d4b6..c2dc95c 100644 --- a/ftplugin/python/pydocstring.vim +++ b/ftplugin/python/pydocstring.vim @@ -9,10 +9,10 @@ let s:save_cpo = &cpo set cpo&vim " version check -" if !has('nvim') && (!has('channel') || !has('job')) -" echoerr '+channel and +job are required for pydocstring.vim' -" finish -" endif +if !has('nvim') && (!has('channel') || !has('job')) + echoerr '+channel and +job are required for pydocstring.vim' + finish +endif command! -nargs=0 -range=0 -complete=customlist,pydocstring#insert Pydocstring call pydocstring#insert(, , , ) command! -nargs=0 -complete=customlist,pydocstring#format PydocstringFormat call pydocstring#format()