[arch-commits] Commit in python-whelk/trunk (PKGBUILD python-3.8.patch)

Felix Yan felixonmars at archlinux.org
Wed Jan 8 10:21:03 UTC 2020


    Date: Wednesday, January 8, 2020 @ 10:21:03
  Author: felixonmars
Revision: 550181

upgpkg: python-whelk 2.8.2-1

Modified:
  python-whelk/trunk/PKGBUILD
Deleted:
  python-whelk/trunk/python-3.8.patch

------------------+
 PKGBUILD         |   16 +++++-----------
 python-3.8.patch |   15 ---------------
 2 files changed, 5 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-08 10:19:25 UTC (rev 550180)
+++ PKGBUILD	2020-01-08 10:21:03 UTC (rev 550181)
@@ -1,23 +1,17 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=python-whelk
-pkgver=2.7.1
-pkgrel=4
+pkgver=2.8.2
+pkgrel=1
 pkgdesc="Easy access to shell commands from python"
 arch=('any')
 license=('custom:zlib')
 url="https://pypi.python.org/pypi/whelk"
 depends=('python')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/seveas/whelk/archive/$pkgver.tar.gz"
-        python-3.8.patch)
-sha512sums=('39b73ed09a0d2442cdde5b8bae72805571a172c6acfa3f652c8cb125d3a400f2538fe6534179f95383d321e8975b6127115616372c60c736e8cd8ceba00ef093'
-            'cb1f1cd86c78fce28e1515966547d66eaec9d474352b03710a83b5b4977cee650ee32501aea135c78a4065c40711ab9e8d32182ea770116c2b472fa94473ada9')
+makedepends=('python-setuptools')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/seveas/whelk/archive/$pkgver.tar.gz")
+sha512sums=('83c3f5ce1da07258ed4c3c22699be36fe960547619617de4fd384f3bf4b62a53a8c83dfbaef37d646542591d60a38ad567f9c3ecc2cb766db40d70cce27d60b2')
 
-prepare() {
-  cd whelk-$pkgver
-  patch -Np1 -i ../python-3.8.patch
-}
-
 build() {
   cd whelk-$pkgver
   python setup.py build

Deleted: python-3.8.patch
===================================================================
--- python-3.8.patch	2020-01-08 10:19:25 UTC (rev 550180)
+++ python-3.8.patch	2020-01-08 10:21:03 UTC (rev 550181)
@@ -1,15 +0,0 @@
-diff -upr whelk-2.7.1.orig/whelk/subprocess_34.py whelk-2.7.1/whelk/subprocess_34.py
---- whelk-2.7.1.orig/whelk/subprocess_34.py	2017-04-18 16:01:38.000000000 +0300
-+++ whelk-2.7.1/whelk/subprocess_34.py	2019-11-06 17:46:00.946759802 +0200
-@@ -92,7 +92,10 @@ class Popen(subprocess.Popen):
-                         raise TimeoutExpired(self.args, orig_timeout)
- 
-                     ready = selector.select(timeout)
--                    self._check_timeout(endtime, orig_timeout)
-+                    if sys.version_info[:2] >= (3,8):
-+                        self._check_timeout(endtime, orig_timeout, stdout, stderr)
-+                    else:
-+                        self._check_timeout(endtime, orig_timeout)
- 
-                     # XXX Rewrite these to use non-blocking I/O on the file
-                     # objects; they are no longer using C stdio!



More information about the arch-commits mailing list