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

[Eli Schwartz]

    Date: Friday, May 7, 2021 @ 18:47:32
  Author: eschwartz
Revision: 928660

upgpkg: python-networkx 2.5.1-2: make compatible with latest packaged python-decorator

Added:
  python-networkx/trunk/0001-Updated-decorator-requirement-for-4718.patch
Modified:
  python-networkx/trunk/PKGBUILD

---------------------------------------------------+
 0001-Updated-decorator-requirement-for-4718.patch |   29 ++++++++++++++++++++
 PKGBUILD                                          |   15 ++++++++--
 2 files changed, 41 insertions(+), 3 deletions(-)

Added: 0001-Updated-decorator-requirement-for-4718.patch
===================================================================
--- 0001-Updated-decorator-requirement-for-4718.patch	                        (rev 0)
+++ 0001-Updated-decorator-requirement-for-4718.patch	2021-05-07 18:47:32 UTC (rev 928660)
@@ -0,0 +1,29 @@
+From 2a472c4fab230394842f252abd033d9d3c69f0c0 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at archlinux.org>
+Date: Fri, 7 May 2021 14:39:53 -0400
+Subject: [PATCH] Updated decorator requirement for #4718
+
+incompatible with decorator 5.0.0 through 5.0.6, fix pinned version
+by requiring >=5.0.7 (which we package) rather than 4.* which we don't
+
+See https://github.com/networkx/networkx/pull/4773
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index eb1521d7..3cad13f3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -124,7 +124,7 @@ package_data = {
+     "networkx.utils": ["tests/*.py"],
+ }
+ 
+-install_requires = ["decorator>=4.3,<5"]
++install_requires = ["decorator>=5.0.7"]
+ extras_require = {
+     "all": [
+         "numpy",
+-- 
+2.31.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-07 18:27:28 UTC (rev 928659)
+++ PKGBUILD	2021-05-07 18:47:32 UTC (rev 928660)
@@ -3,7 +3,7 @@
 
 pkgname=python-networkx
 pkgver=2.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Python package for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks.'
 arch=('any')
 license=('BSD')
@@ -15,9 +15,18 @@
             'python-yaml: Required for YAML format reading and writing.')
 makedepends=('python-setuptools')
 checkdepends=('python-pytest-runner')
-source=("https://github.com/networkx/networkx/archive/networkx-$pkgver.tar.gz")
-sha512sums=('0eb43aa9cedacb3e6dfa44703d300591ce5214e983d01e526f34105e0a565d49ef424c4c4232340b01b3e396a09ed44aee658bab0aa613edcba4d7b9b1aebe6a')
+source=("https://github.com/networkx/networkx/archive/networkx-$pkgver.tar.gz"
+        "0001-Updated-decorator-requirement-for-4718.patch")
+sha512sums=('0eb43aa9cedacb3e6dfa44703d300591ce5214e983d01e526f34105e0a565d49ef424c4c4232340b01b3e396a09ed44aee658bab0aa613edcba4d7b9b1aebe6a'
+            '007e3dceb06f20ec7e2e492839e5d21d51966c6b6ae65d92140caebe97745b386ceebc8db6bdd4a8e27f807a7d158f42ddbaaeb2320e533567c19910ae1dd6e4')
 
+prepare() {
+  cd networkx-networkx-$pkgver
+
+  # https://github.com/networkx/networkx/pull/4773
+  patch -p1 -i ../0001-Updated-decorator-requirement-for-4718.patch
+}
+
 build() {
   cd networkx-networkx-$pkgver
   python setup.py build