[arch-commits] Commit in python-keyrings-alt/trunk (PKGBUILD pep517-0.5.patch)

Evangelos Foutras foutrelis at archlinux.org
Wed Nov 6 23:27:31 UTC 2019


    Date: Wednesday, November 6, 2019 @ 23:27:31
  Author: foutrelis
Revision: 524438

Fix flake8 error breaking tests

Added:
  python-keyrings-alt/trunk/pep517-0.5.patch
Modified:
  python-keyrings-alt/trunk/PKGBUILD

------------------+
 PKGBUILD         |   13 ++++++++++--
 pep517-0.5.patch |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-06 23:25:25 UTC (rev 524437)
+++ PKGBUILD	2019-11-06 23:27:31 UTC (rev 524438)
@@ -22,11 +22,20 @@
             'python-gobject: GNOME Integration'
             'python-fs'
             'python-crypto: Encrypted file storage')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
-sha512sums=('0ec460620d684c83477f5a5810f8d01058cf251bf9ef34af1afcca0c663fb9025a94ae7785ac4bc6982eb88f44e103f7821c9756a359b2af04800752d3e1fc0e')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+        pep517-0.5.patch)
+sha512sums=('0ec460620d684c83477f5a5810f8d01058cf251bf9ef34af1afcca0c663fb9025a94ae7785ac4bc6982eb88f44e103f7821c9756a359b2af04800752d3e1fc0e'
+            '1a8dc30ded29cf0f8c8376d36906a50298e74c8f092db318d587f36e87e3a34104418c53c9cc758061104723aa66dfed2f8f7390462024bd3980b569e2b702b7')
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
 
+prepare() {
+  cd $_pkgname-$pkgver
+
+  # Fix flake8 error breaking tests
+  patch -Np1 -i ../pep517-0.5.patch
+}
+
 build() {
   cd $_pkgname-$pkgver
 

Added: pep517-0.5.patch
===================================================================
--- pep517-0.5.patch	                        (rev 0)
+++ pep517-0.5.patch	2019-11-06 23:27:31 UTC (rev 524438)
@@ -0,0 +1,55 @@
+From 939c515f2cc01525cbbd71f26e71d21471abdc93 Mon Sep 17 00:00:00 2001
+From: "Jason R. Coombs" <jaraco at jaraco.com>
+Date: Mon, 17 Dec 2018 12:17:02 -0500
+Subject: [PATCH] Rely on pep517 0.5
+
+---
+ install-pip-master.py | 21 ---------------------
+ tox.ini               |  5 +----
+ 2 files changed, 1 insertion(+), 25 deletions(-)
+ delete mode 100644 install-pip-master.py
+
+diff --git a/install-pip-master.py b/install-pip-master.py
+deleted file mode 100644
+index d62d20f..0000000
+--- a/install-pip-master.py
++++ /dev/null
+@@ -1,21 +0,0 @@
+-"""
+-In order to support installation of pep517 from source,
+-pip from master must be installed.
+-"""
+-
+-import subprocess
+-import sys
+-
+-
+-def main():
+-	cmd = [
+-		sys.executable,
+-		'-m', 'pip', 'install',
+-		'git+https://github.com/pypa/pip',
+-	]
+-	subprocess.run(cmd)
+-	cmd[-1:] = sys.argv[1:]
+-	subprocess.run(cmd)
+-
+-
+-__name__ == '__main__' and main()
+diff --git a/tox.ini b/tox.ini
+index 853d7de..70b0be7 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -20,11 +20,8 @@ commands =
+ 
+ [testenv:release]
+ skip_install = True
+-# workaround for pep517 build support
+-install_command = python install-pip-master.py {opts} {packages}
+ deps =
+-	# pull from feature branch for feature
+-	git+https://github.com/pypa/pep517@feature/build-command
++	pep517>=0.5
+ 	# workaround for https://github.com/pypa/twine/issues/423
+ 	git+https://github.com/pypa/twine
+ 	path.py



More information about the arch-commits mailing list