version bump 4 commits deoplete-jedi-git, jedi no longer bundled as a git submodule upstream

This commit is contained in:
Trent Palmer 2020-07-08 09:46:13 -07:00
parent c3ce7e8e63
commit 0fc691479b
2 changed files with 80 additions and 75 deletions

View File

@ -1,6 +1,6 @@
pkgbase = deoplete-jedi-git pkgbase = deoplete-jedi-git
pkgdesc = jedi add-on for deoplete completion plugin for neovim pkgdesc = jedi add-on for deoplete completion plugin for neovim
pkgver = r385.9ad4cba pkgver = r389.a0e5a06
pkgrel = 1 pkgrel = 1
url = https://github.com/deoplete-plugins/deoplete-jedi url = https://github.com/deoplete-plugins/deoplete-jedi
arch = any arch = any

View File

@ -6,20 +6,21 @@
# seems to work for both vim or neovim if you install for vim, # seems to work for both vim or neovim if you install for vim,
# but doesn't work for vim if you only install for neovim # but doesn't work for vim if you only install for neovim
_vim="y" _vim="y"
_use_system_jedi="y" # _use_system_jedi="y" # no more bundled jedi module
_neovim="n" _neovim="n"
########################################################################################################### ###########################################################################################################
_name='deoplete-jedi' _name='deoplete-jedi'
pkgname="${_name}-git" pkgname="${_name}-git"
pkgver=r385.9ad4cba pkgver=r389.a0e5a06
pkgrel=1 pkgrel=1
pkgdesc="jedi add-on for deoplete completion plugin for neovim" pkgdesc="jedi add-on for deoplete completion plugin for neovim"
arch=('any') arch=('any')
url="https://github.com/deoplete-plugins/deoplete-jedi" url="https://github.com/deoplete-plugins/deoplete-jedi"
license=('MIT') license=('MIT')
groups=() groups=()
depends=('deoplete') # depends=('deoplete')
depends=('deoplete' 'python-jedi' 'python-parso' 'python-numpydoc')
makedepends=('git') makedepends=('git')
provides=('deoplete-jedi') provides=('deoplete-jedi')
conflicts=('deoplete-jedi') conflicts=('deoplete-jedi')
@ -37,86 +38,90 @@ pkgver() {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
} }
if [[ "$_use_system_jedi" == "y" ]]; then # if [[ "$_use_system_jedi" == "y" ]]; then
depends+=('python-jedi' 'python-parso' 'python-numpydoc') # depends+=('python-jedi' 'python-parso' 'python-numpydoc')
fi # 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
if [[ "$_use_system_jedi" == "n" ]]; then # prepare() {
source+=('git+https://github.com/davidhalter/jedi.git') # jedi # msg2 'Setting up Git submodules...'
source+=('git+https://github.com/davidhalter/typeshed.git') # jedi #
source+=('git+https://github.com/davidhalter/parso.git') # parso # deopletejedi=("jedi" "parso")
md5sums+=('SKIP' 'SKIP' 'SKIP') # deopletejeditypeshed=("typeshed")
fi #
# 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
# }
prepare() { # gitprepare() {
msg2 'Setting up Git submodules...' # local CD_DIR=$1
# local GIT_PREFIX=$2
deopletejedi=("jedi" "parso") # c=0
deopletejeditypeshed=("typeshed") # for val in "$@" ; do
# if [ $c -gt 1 ]; then
if [[ "$_use_system_jedi" == "n" ]]; then # FEED[$c]=$val
gitprepare "deoplete-jedi" "rplugin/python3/deoplete/vendored/" "${deopletejedi[@]}" # fi
gitprepare "deoplete-jedi/rplugin/python3/deoplete/vendored/jedi" "jedi/third_party/" "${deopletejeditypeshed[@]}" # c=$(( c + 1 ))
fi # done
} #
# cd "$srcdir/$CD_DIR" || exit
gitprepare() { #
local CD_DIR=$1 # git submodule init
local GIT_PREFIX=$2 # for GITSUBVAR in "${FEED[@]}" ; do
c=0 # git config submodule."$GIT_PREFIX$GITSUBVAR".url "$srcdir/$GITSUBVAR"
for val in "$@" ; do # done
if [ $c -gt 1 ]; then # git submodule update
FEED[$c]=$val # unset -v FEED
fi # }
c=$(( c + 1 ))
done
cd "$srcdir/$CD_DIR" || exit
git submodule init
for GITSUBVAR in "${FEED[@]}" ; do
git config submodule."$GIT_PREFIX$GITSUBVAR".url "$srcdir/$GITSUBVAR"
done
git submodule update
unset -v FEED
}
package() { package() {
if [ "$_neovim" = "y" ]; then if [ "$_neovim" = "y" ]; then
if [[ "$_use_system_jedi" == "n" ]]; then # 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/jedi"
mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso" # mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso"
cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/parso/parso" \ # cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/parso/parso" \
"$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso/" # "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso/"
cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi" \ # cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi" \
"$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/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} \ # 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/" # "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/"
fi # fi
if [[ "$_use_system_jedi" == "y" ]]; then # if [[ "$_use_system_jedi" == "y" ]]; then
mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete" # mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete"
fi # fi
cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/sources" \ mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3"
"$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/" # cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/sources" "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/"
cp -r "${srcdir}/${_name}/rplugin/python3/deoplete" \
"$pkgdir/usr/share/nvim/runtime/rplugin/python3/"
fi fi
if [ "$_vim" = "y" ]; then if [ "$_vim" = "y" ]; then
if [[ "$_use_system_jedi" == "n" ]]; then # if [[ "$_use_system_jedi" == "n" ]]; then
mkdir -p "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/jedi" # mkdir -p "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/jedi"
mkdir -p "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/parso" # mkdir -p "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/parso"
cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/parso/parso" \ # cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/parso/parso" \
"$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/parso/" # "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/parso/"
cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi" \ # cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi" \
"$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/jedi/" # "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/jedi/"
cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/"{stdlib,third_party} \ # cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/"{stdlib,third_party} \
"$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/" # "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/"
fi # fi
if [[ "$_use_system_jedi" == "y" ]]; then # if [[ "$_use_system_jedi" == "y" ]]; then
mkdir -p "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete" # mkdir -p "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete"
fi # fi
cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/sources" \ mkdir -p "$pkgdir/usr/share/vim/vimfiles/rplugin/python3"
"$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/" # cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/sources" "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/"
cp -r "${srcdir}/${_name}/rplugin/python3/deoplete" \
"$pkgdir/usr/share/vim/vimfiles/rplugin/python3/"
fi fi
install -D -m644 "${srcdir}/${_name}/README.md" "$pkgdir"/usr/share/doc/$pkgname/README.md install -D -m644 "${srcdir}/${_name}/README.md" "$pkgdir"/usr/share/doc/$pkgname/README.md