From 9020c049cdb61fad9a7039f8c8972834b9d5d45e Mon Sep 17 00:00:00 2001 From: Trent Palmer Date: Tue, 21 Apr 2020 14:58:17 -0700 Subject: [PATCH] add option deoplete-jedi-git --- deoplete-jedi-git/.SRCINFO | 11 +++--- deoplete-jedi-git/PKGBUILD | 70 ++++++++++++++++++++++++-------------- 2 files changed, 49 insertions(+), 32 deletions(-) diff --git a/deoplete-jedi-git/.SRCINFO b/deoplete-jedi-git/.SRCINFO index bafee48..fd048a1 100644 --- a/deoplete-jedi-git/.SRCINFO +++ b/deoplete-jedi-git/.SRCINFO @@ -1,21 +1,18 @@ pkgbase = deoplete-jedi-git pkgdesc = jedi add-on for deoplete completion plugin for neovim pkgver = r381.42f4c24 - pkgrel = 1 + pkgrel = 2 url = https://github.com/deoplete-plugins/deoplete-jedi arch = any license = MIT makedepends = git depends = deoplete + depends = python-jedi + depends = python-parso + depends = python-numpydoc provides = deoplete-jedi conflicts = deoplete-jedi source = git+https://github.com/deoplete-plugins/deoplete-jedi - source = git+https://github.com/davidhalter/jedi.git - source = git+https://github.com/davidhalter/typeshed.git - source = git+https://github.com/davidhalter/parso.git - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP md5sums = SKIP pkgname = deoplete-jedi-git diff --git a/deoplete-jedi-git/PKGBUILD b/deoplete-jedi-git/PKGBUILD index 57539a2..c96ec1a 100644 --- a/deoplete-jedi-git/PKGBUILD +++ b/deoplete-jedi-git/PKGBUILD @@ -4,14 +4,14 @@ # Build Options ########################################################################################################### _vim="y" - +_use_system_jedi="y" _neovim="n" ########################################################################################################### _name='deoplete-jedi' pkgname="${_name}-git" pkgver=r381.42f4c24 -pkgrel=1 +pkgrel=2 pkgdesc="jedi add-on for deoplete completion plugin for neovim" arch=('any') url="https://github.com/deoplete-plugins/deoplete-jedi" @@ -26,26 +26,36 @@ backup=() options=() source=( 'git+https://github.com/deoplete-plugins/deoplete-jedi' # deopletejedi -'git+https://github.com/davidhalter/jedi.git' # jedi -'git+https://github.com/davidhalter/typeshed.git' # jedi -'git+https://github.com/davidhalter/parso.git' # parso ) noextract=() -md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP') +md5sums=('SKIP') pkgver() { cd "${srcdir}/${_name}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } +if [[ "$_use_system_jedi" == "y" ]]; then + depends+=('python-jedi' 'python-parso' 'python-numpydoc') +fi + +if [[ "$_use_system_jedi" == "n" ]]; then + source+=('git+https://github.com/davidhalter/jedi.git') # jedi + source+=('git+https://github.com/davidhalter/typeshed.git') # jedi + source+=('git+https://github.com/davidhalter/parso.git') # parso + md5sums+=('SKIP' 'SKIP' 'SKIP') +fi + prepare() { msg2 'Setting up Git submodules...' deopletejedi=("jedi" "parso") - gitprepare "deoplete-jedi" "rplugin/python3/deoplete/vendored/" "${deopletejedi[@]}" - deopletejeditypeshed=("typeshed") - gitprepare "deoplete-jedi/rplugin/python3/deoplete/vendored/jedi" "jedi/third_party/" "${deopletejeditypeshed[@]}" + + if [[ "$_use_system_jedi" == "n" ]]; then + gitprepare "deoplete-jedi" "rplugin/python3/deoplete/vendored/" "${deopletejedi[@]}" + gitprepare "deoplete-jedi/rplugin/python3/deoplete/vendored/jedi" "jedi/third_party/" "${deopletejeditypeshed[@]}" + fi } gitprepare() { @@ -72,27 +82,37 @@ gitprepare() { package() { if [ "$_neovim" = "y" ]; then - mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi" - mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso" - cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/parso/parso" \ - "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso/" - cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi" \ - "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi/" - cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed"{stdlib,third_party} \ - "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/" + if [[ "$_use_system_jedi" == "n" ]]; then + mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi" + mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso" + cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/parso/parso" \ + "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso/" + cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi" \ + "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi/" + cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed"{stdlib,third_party} \ + "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/" + fi + if [[ "$_use_system_jedi" == "y" ]]; then + mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete" + fi cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/sources" \ "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/" fi if [ "$_vim" = "y" ]; then - mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi" - mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso" - cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/parso/parso" \ - "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso/" - cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi" \ - "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi/" - cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/"{stdlib,third_party} \ - "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/" + if [[ "$_use_system_jedi" == "n" ]]; then + mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi" + mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso" + cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/parso/parso" \ + "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso/" + cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi" \ + "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi/" + cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/"{stdlib,third_party} \ + "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/" + fi + if [[ "$_use_system_jedi" == "y" ]]; then + mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete" + fi cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/sources" \ "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/" fi