From fe7d5f2a86b37376abe82f904c34f382122ba77b Mon Sep 17 00:00:00 2001 From: Ryan Sundberg Date: Sun, 2 May 2021 22:47:35 -0700 Subject: [PATCH 08/55] Upgrade python-hacking to 4.1.0; patch diamond dependency on flake8 --- gnu/packages/openstack.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 75eab66544..bde6b22831 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages xml) #:use-module (guix build-system python) #:use-module (guix download) + #:use-module (guix gexp) #:use-module ((guix licenses) #:select (asl2.0)) #:use-module (guix packages) @@ -137,6 +138,17 @@ strategies that help you collect your technical debt in a non-destructive manner.") (license asl2.0))) +(define python-hacking-patch-requirements + (plain-file "python-hacking-patch-requirements.patch" +"diff --git a/requirements.txt b/requirements.txt +index 8367022..1442b66 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1 +1 @@ +-flake8<3.9.0,>=3.8.0 # MIT ++flake8>=3.8.0 # MIT +")) + (define-public python-hacking (package (name "python-hacking") @@ -147,7 +159,8 @@ manner.") (uri (pypi-uri "hacking" version)) (sha256 (base32 - "0fg19rlcky3n1y1ri61xyjp7534yzf8r102z9dw3zqg93f4kj20m")))) + "0fg19rlcky3n1y1ri61xyjp7534yzf8r102z9dw3zqg93f4kj20m")) + (patches (list python-hacking-patch-requirements)))) (build-system python-build-system) (propagated-inputs `(("python-flake8" ,python-flake8-3.8))) -- 2.31.1