[arch-commits] Commit in flake8/trunk (PKGBUILD)

[Eli Schwartz]

    Date: Friday, April 20, 2018 @ 14:35:23
  Author: eschwartz
Revision: 317212

upgpkg: flake8 1:3.5.0-2

Fix FS#58210 support pycodestyle >= 2.4.0

Modified:
  flake8/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-20 14:13:57 UTC (rev 317211)
+++ PKGBUILD	2018-04-20 14:35:23 UTC (rev 317212)
@@ -7,7 +7,7 @@
 pkgbase=flake8
 pkgname=(flake8 python2-flake8)
 pkgver=3.5.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="The modular source code checker: pep8, pyflakes and co"
 arch=('any')
@@ -17,10 +17,23 @@
              'python-pycodestyle' 'python2-pycodestyle' 'python-mccabe' 'python2-mccabe'
              'python2-enum34' 'python2-configparser' 'python-pytest-runner' 'python2-pytest-runner')
 checkdepends=('python-mock' 'python2-mock')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/PyCQA/flake8/archive/$pkgver.tar.gz")
-sha512sums=('36c6bd0166a0e8f9b8c99cfd7d92f21a4b8d761727185bbd0dff231001dbb495ed4128e2c60ab16bf3920a8a8394efb0127d9233962940333cfc346766736639')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/PyCQA/flake8/archive/$pkgver.tar.gz"
+        "https://gitlab.com/pycqa/flake8/commit/4fcbcccf381ce0987faa297173e4008b0490918f.patch"
+        "flake8-pycodestyle2.4-compat.patch::https://gitlab.com/pycqa/flake8/merge_requests/230.patch"
+        "flake8-pycodestyle2.4-new-checks.patch::https://gitlab.com/pycqa/flake8/merge_requests/231.patch")
+sha512sums=('36c6bd0166a0e8f9b8c99cfd7d92f21a4b8d761727185bbd0dff231001dbb495ed4128e2c60ab16bf3920a8a8394efb0127d9233962940333cfc346766736639'
+            '16805e72ea65a0e7de0b90e4ac011ebe90e1d4ff6ff88616c8aa13a9a30f4de873f0bd0254ef3939ba2e00240e8127904d68ae6c4e6e7e8482011a7d0dfaf7cb'
+            '416eae6c7b9d08e64769a443ad5e1a67a5bb327d389ca0aad4685d974ad9f5dabc4d99271ec86cd08953630750e82d3c189f49ad05b8f8d1f6f3299451415c9c'
+            '9324b7b86ffc7e07b4e0889f3532d620cbf5a9967a5b2139293318a324d798f990ddf835901bc62b6a2f920f533f555a5e3b1449c91152fc8fff3b7b195c75ba')
 
 prepare() {
+  # update versions to what the next patch expects
+  patch -p1 -d flake8-$pkgver < 4fcbcccf381ce0987faa297173e4008b0490918f.patch
+  # fix renamed checks in newer pycodestyle versions
+  patch -p1 -d flake8-$pkgver < flake8-pycodestyle2.4-compat.patch
+  # add new pycodestyle 2.4.0 checks
+  patch -p1 -d flake8-$pkgver < flake8-pycodestyle2.4-new-checks.patch
+  # disable overly restrictive dependency pinning
   sed -i -e 's/, *< *[0-9=.]*//' flake8-$pkgver/setup.py
   cp -a flake8-$pkgver{,-py2}
 }