From b24f8a8f091c73ce546c8cc60f6bca003693c9f7 Mon Sep 17 00:00:00 2001 From: oaken-source Date: Tue, 5 Nov 2019 13:12:43 +0100 Subject: pcr/papis: updated to 0.9 --- pcr/papis/PKGBUILD | 11 +- pcr/papis/papis-click-0.7.patch | 140 ----------------------- pcr/papis/papis-vim-gui-add-notes-edit-key.patch | 55 --------- 3 files changed, 4 insertions(+), 202 deletions(-) delete mode 100644 pcr/papis/papis-click-0.7.patch delete mode 100644 pcr/papis/papis-vim-gui-add-notes-edit-key.patch diff --git a/pcr/papis/PKGBUILD b/pcr/papis/PKGBUILD index 186f8c89a..b59f5fb9c 100644 --- a/pcr/papis/PKGBUILD +++ b/pcr/papis/PKGBUILD @@ -2,8 +2,8 @@ _pkgname=papis pkgname=$_pkgname -pkgver=0.7.5 -pkgrel=2 +pkgver=0.9 +pkgrel=1 pkgdesc="Powerful and highly extensible command-line based document and bibliography manager." arch=('any') url="https://github.com/papis/papis" @@ -14,15 +14,12 @@ _pypi=(click requests filetype pyparsing arxiv2bib yaml chardet pylibgen habanero isbnlib) depends=(python "${_pypi[@]/#/python-}") makedepends=('python-setuptools') -source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" - $pkgname-vim-gui-add-notes-edit-key.patch) -sha256sums=('1a2a3f6673741f858d4ba41b64255e2fca33b17c5abb642608dbb4ee117d0ac4' - 'ec7a2ada63b5eac58cc89e0230ef6db3438357c2669b7c0f88e247e0266cbe53') +source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") +sha256sums=('6a1070ea9a8345dde9cb5d9ccda582e2592520f987d0cfefa6f95d714bf5fd42') prepare() { cd "$srcdir/$_pkgname-$pkgver" sed -i '/configparser/d' setup.py - patch -Np1 -i "$srcdir/$pkgname-vim-gui-add-notes-edit-key.patch" } package() { diff --git a/pcr/papis/papis-click-0.7.patch b/pcr/papis/papis-click-0.7.patch deleted file mode 100644 index 5fd5a6f7a..000000000 --- a/pcr/papis/papis-click-0.7.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 7414634a11c61268a98edd26a4de2d65cb44a28b Mon Sep 17 00:00:00 2001 -From: Alejandro Gallo -Date: Sat, 29 Sep 2018 12:52:01 +0200 -Subject: [PATCH] Fix issue #110 - -Thank you @ARamsey118 and @zamlz ! ---- - papis/commands/add.py | 18 +++++++++--------- - papis/commands/default.py | 14 ++++++++------ - 2 files changed, 17 insertions(+), 15 deletions(-) - -diff --git a/papis/commands/add.py b/papis/commands/add.py -index e25e330..57985c9 100644 ---- a/papis/commands/add.py -+++ b/papis/commands/add.py -@@ -536,13 +536,13 @@ def run( - @click.help_option('--help', '-h') - @click.argument("files", type=click.Path(exists=True), nargs=-1) - @click.option( -- "-s", "--set", -+ "-s", "--set", "set_list", - help="Set some information before", - multiple=True, - type=(str, str) - ) - @click.option( -- "-d", "--dir", -+ "-d", "--dir", "directory", - help="Subfolder in the library", - default="" - ) -@@ -604,7 +604,7 @@ def run( - default=lambda: True if papis.config.get('add-confirm') else False - ) - @click.option( -- "--open/--no-open", -+ "--open/--no-open", "open_file", - help="Open file before adding document", - default=lambda: True if papis.config.get('add-open') else False - ) -@@ -632,8 +632,8 @@ def run( - ) - def cli( - files, -- set, -- dir, -+ set_list, -+ directory, - interactive, - name, - file_name, -@@ -645,7 +645,7 @@ def cli( - from_pmid, - from_lib, - confirm, -- open, -+ open_file, - edit, - commit, - link, -@@ -655,7 +655,7 @@ def cli( - """ - data = dict() - -- for data_set in set: -+ for data_set in set_list: - data[data_set[0]] = data_set[1] - - logger = logging.getLogger('cli:add') -@@ -694,7 +694,7 @@ def cli( - data=data, - name=name, - file_name=file_name, -- subfolder=dir, -+ subfolder=directory, - interactive=interactive, - from_bibtex=from_bibtex, - from_yaml=from_yaml, -@@ -703,7 +703,7 @@ def cli( - from_doi=from_doi, - from_pmid=from_pmid, - confirm=confirm, -- open_file=open, -+ open_file=open_file, - edit=edit, - commit=commit, - link=link, -diff --git a/papis/commands/default.py b/papis/commands/default.py -index 791e134..dc5e2c3 100644 ---- a/papis/commands/default.py -+++ b/papis/commands/default.py -@@ -74,7 +74,7 @@ import papis.cli - is_flag=True - ) - @click.option( -- "--clear-cache", "--cc", -+ "--cc", "--clear-cache", "clear_cache", - help="Clear cache of the library used", - default=False, - is_flag=True -@@ -86,7 +86,7 @@ import papis.cli - default=__import__("multiprocessing").cpu_count(), - ) - @click.option( -- "-s", "--set", -+ "-s", "--set", "set_list", - type=(str, str), - multiple=True, - help="Set key value, e.g., " -@@ -98,9 +98,9 @@ def run( - lib, - log, - pick_lib, -- cc, -+ clear_cache, - cores, -- set -+ set_list - ): - log_format = '%(levelname)s:%(name)s:%(message)s' - if verbose: -@@ -110,8 +110,10 @@ def run( - level=getattr(logging, log), - format=log_format - ) -+ logger = logging.getLogger('default') - -- for pair in set: -+ for pair in set_list: -+ logger.debug('Setting "{0}" to "{1}"'.format(*pair)) - papis.config.set(pair[0], pair[1]) - - if config: -@@ -140,5 +142,5 @@ def run( - papis.config.get_configuration() - ) - -- if cc: -+ if clear_cache: - papis.api.clear_lib_cache(lib) diff --git a/pcr/papis/papis-vim-gui-add-notes-edit-key.patch b/pcr/papis/papis-vim-gui-add-notes-edit-key.patch deleted file mode 100644 index 8db21b013..000000000 --- a/pcr/papis/papis-vim-gui-add-notes-edit-key.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/papis/gui/vim/main.vim b/papis/gui/vim/main.vim -index 4fd2452..05249dc 100644 ---- a/papis/gui/vim/main.vim -+++ b/papis/gui/vim/main.vim -@@ -6,6 +6,7 @@ let g:papis_delete_key = "dd" - let g:papis_open_key = "o" - let g:papis_open_dir_key = "" - let g:papis_edit_key = "e" -+let g:papis_notes_edit_key = "E" - - let g:papis_next_key = "j" - let g:papis_prev_key = "k" -@@ -61,12 +62,13 @@ function! PapisExeCommand(cmd, ...) - endfunction - - function! PapisHelp() -- echomsg "Help - ".g:papis_help_key -- echomsg "Open - ".g:papis_open_key -- echomsg "Open dir - ".g:papis_open_dir_key -- echomsg "Edit - ".g:papis_edit_key -- echomsg "Search - ".g:papis_search_key -- echomsg "Delete - ".g:papis_delete_key -+ echomsg "Help - ".g:papis_help_key -+ echomsg "Open - ".g:papis_open_key -+ echomsg "Open dir - ".g:papis_open_dir_key -+ echomsg "Edit - ".g:papis_edit_key -+ echomsg "Edit Notes - ".g:papis_notes_edit_key -+ echomsg "Search - ".g:papis_search_key -+ echomsg "Delete - ".g:papis_delete_key - endfunction - - function! PapisGo(direction) -@@ -124,6 +126,7 @@ exec "nnoremap ".g:papis_delete_key." :silent call PapisExeCommand('rm' - exec "nnoremap :silent call PapisExeCommand('open')" - exec "nnoremap ".g:papis_open_dir_key." :silent call PapisExeCommand('open', '--dir')" - exec "nnoremap ".g:papis_edit_key." :silent call PapisExeCommand('edit')" -+exec "nnoremap ".g:papis_notes_edit_key." :silent call PapisExeCommand('edit', '-n')" - - exec "nnoremap ".g:papis_next_key." :silent call PapisGo('next')" - exec "nnoremap ".g:papis_prev_key." :silent call PapisGo('prev')" -@@ -136,8 +139,9 @@ nnoremap :silent call PapisGo("screen-down") - nnoremap :silent call PapisGo("screen-up") - - nnoremap q :quit --command! -nargs=0 PapisHelp call PapisHelp() --command! -nargs=0 PapisOpen call PapisExeCommand("open") --command! -nargs=0 PapisOpenDir call PapisExeCommand("open", '--dir') --command! -nargs=0 PapisBrowse call PapisExeCommand("browse") --command! -nargs=0 PapisEdit call PapisExeCommand("edit") -+command! -nargs=0 PapisHelp call PapisHelp() -+command! -nargs=0 PapisOpen call PapisExeCommand("open") -+command! -nargs=0 PapisOpenDir call PapisExeCommand("open", '--dir') -+command! -nargs=0 PapisBrowse call PapisExeCommand("browse") -+command! -nargs=0 PapisEdit call PapisExeCommand("edit") -+command! -nargs=0 PapisEditNotes call PapisExeCommand("edit", '-n') -- cgit v1.2.3