[arch-commits] Commit in ranger/trunk (2 files)

[Levente Polyak]

    Date: Wednesday, November 21, 2018 @ 23:43:02
  Author: anthraxx
Revision: 409313

upgpkg: ranger 1.9.2-1

Modified:
  ranger/trunk/PKGBUILD
Deleted:
  ranger/trunk/replace-stopiteration-with-bare-return.patch

----------------------------------------------+
 PKGBUILD                                     |   38 ++++++++++++-------------
 replace-stopiteration-with-bare-return.patch |   21 -------------
 2 files changed, 19 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-21 22:41:33 UTC (rev 409312)
+++ PKGBUILD	2018-11-21 23:43:02 UTC (rev 409313)
@@ -1,10 +1,11 @@
 # Maintainer: schuay <jakob.gruber at gmail.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Previous maintainer: Roman Zimbelmann <romanz at lavabit.com>
 
 pkgname=ranger
-pkgver=1.9.1
-pkgrel=3
-pkgdesc='A simple, vim-like file manager'
+pkgver=1.9.2
+pkgrel=1
+pkgdesc='Simple, vim-like file manager'
 arch=('any')
 url='https://ranger.github.io'
 license=('GPL')
@@ -24,22 +25,21 @@
     'sudo: to use the "run as root"-feature'
     'transmission-cli: for viewing bittorrent information'
     'w3m: for previews of images and html pages')
-conflicts=('ranger-git')
-source=("http://ranger.github.io/${pkgname}-${pkgver}.tar.gz"
-        "http://ranger.github.io/${pkgname}-${pkgver}.tar.gz.sig"
-        "replace-stopiteration-with-bare-return.patch")
-sha256sums=('40411b0dd08b0abd2632399751b111359786ae5f1e6df047f49653cb7a9edfd2'
-            'SKIP'
-            '116d6a29139acb7d5216ced45cfcc9faa27ab66acc6aecf4306d9adc7059b872')
-validpgpkeys=('1E9B36EC051FF6F7FFC969A7F08CE1E200FB5CDF') # huterich
+checkdepends=('python-pytest')
+source=(https://ranger.github.io/${pkgname}-${pkgver}.tar.gz{,.sig})
+sha256sums=('0e1d1b1d3f78c227a6cfa783822e98591ca76a35c643d4814f40f73515d66b8a'
+            'SKIP')
+validpgpkeys=('1E9B36EC051FF6F7FFC969A7F08CE1E200FB5CDF'
+              '66FA95C0F1619BDA520A41F60D63346A5D15D055') # huterich
 
-package() { 
-  cd "${srcdir}/${pkgname}-${pkgver}"
+check() {
+  cd ${pkgname}-${pkgver}
+  make test_pytest
+}
 
-  # https://github.com/ranger/ranger/pull/1244
-  patch -Np1 < "${srcdir}/replace-stopiteration-with-bare-return.patch"
+package() {
+  cd ${pkgname}-${pkgver}
+  python setup.py install --root="${pkgdir}" --optimize=1
+}
 
-  # Replace "python" with the python binary you want ranger to use!
-  # (python 2.6 and >=3.1 supported, below 2.6 will certainly not work.)
-  python setup.py -q install --root="${pkgdir}" --optimize=1
-}
+# vim: ts=2 sw=2 et:

Deleted: replace-stopiteration-with-bare-return.patch
===================================================================
--- replace-stopiteration-with-bare-return.patch	2018-11-21 22:41:33 UTC (rev 409312)
+++ replace-stopiteration-with-bare-return.patch	2018-11-21 23:43:02 UTC (rev 409313)
@@ -1,21 +0,0 @@
-diff --git a/ranger/gui/widgets/pager.py b/ranger/gui/widgets/pager.py
-index 9afbfd15..d64d4ac1 100644
---- a/ranger/gui/widgets/pager.py
-+++ b/ranger/gui/widgets/pager.py
-@@ -234,7 +234,7 @@ class Pager(Widget):  # pylint: disable=too-many-instance-attributes
-     def _generate_lines(self, starty, startx):
-         i = starty
-         if not self.source:
--            raise StopIteration
-+            return
-         while True:
-             try:
-                 line = self._get_line(i).expandtabs(4)
-@@ -244,5 +244,5 @@ class Pager(Widget):  # pylint: disable=too-many-instance-attributes
-                     line = line[startx:self.wid + startx]
-                 yield line.rstrip().replace('\r\n', '\n')
-             except IndexError:
--                raise StopIteration
-+                return
-             i += 1
-