about summary refs log tree commit diff
path: root/pkgs/development/python-modules/jaraco_itertools
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2019-03-10 13:12:22 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2019-03-10 13:12:22 +0100
commiteede376d73716798093930369a3c76cde7af6a28 (patch)
tree1d222e26c46ae4b328c228bcf0dadc5a08ea5a94 /pkgs/development/python-modules/jaraco_itertools
parentc103b5b236019323ab0df03b7e5a45f86dc2542e (diff)
downloadnixlib-eede376d73716798093930369a3c76cde7af6a28.tar
nixlib-eede376d73716798093930369a3c76cde7af6a28.tar.gz
nixlib-eede376d73716798093930369a3c76cde7af6a28.tar.bz2
nixlib-eede376d73716798093930369a3c76cde7af6a28.tar.lz
nixlib-eede376d73716798093930369a3c76cde7af6a28.tar.xz
nixlib-eede376d73716798093930369a3c76cde7af6a28.tar.zst
nixlib-eede376d73716798093930369a3c76cde7af6a28.zip
pythonPackages.jaraco_itertools: fix build
The package currently fails because of some flake8 violations. However
invalid coding style shouldn't break the Nix package.

See also https://hydra.nixos.org/build/90115508
Addresses #56826
Diffstat (limited to 'pkgs/development/python-modules/jaraco_itertools')
-rw-r--r--pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch38
-rw-r--r--pkgs/development/python-modules/jaraco_itertools/default.nix7
2 files changed, 43 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch
new file mode 100644
index 000000000000..43530fcc3285
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch
@@ -0,0 +1,38 @@
+From fcffcc61e432e5250e7fbfb1ecbe0f1cac3006cf Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Sun, 10 Mar 2019 13:10:18 +0100
+Subject: [PATCH] Don't run flake8 checks during the build
+
+If the code simply violates their code style, the Nix package shouldn't fail.
+---
+ pytest.ini | 2 +-
+ setup.cfg  | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/pytest.ini b/pytest.ini
+index d165e5e..d8e4694 100644
+--- a/pytest.ini
++++ b/pytest.ini
+@@ -1,6 +1,6 @@
+ [pytest]
+ norecursedirs=dist build .tox .eggs
+-addopts=--doctest-modules --flake8
++addopts=--doctest-modules
+ doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES
+ filterwarnings=
+ 	ignore:Possible nested set::pycodestyle:113
+diff --git a/setup.cfg b/setup.cfg
+index 9f3517f..c9033ec 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -30,7 +30,6 @@ setup_requires = setuptools_scm >= 1.15.0
+ testing = 
+ 	pytest >= 3.5, !=3.7.3
+ 	pytest-checkdocs
+-	pytest-flake8
+ docs = 
+ 	sphinx
+ 	jaraco.packaging >= 3.2
+-- 
+2.18.1
+
diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix
index 4057d7ad2758..cbf966785e17 100644
--- a/pkgs/development/python-modules/jaraco_itertools/default.nix
+++ b/pkgs/development/python-modules/jaraco_itertools/default.nix
@@ -1,5 +1,6 @@
 { lib, buildPythonPackage, fetchPypi, setuptools_scm
-, inflect, more-itertools, six, pytest, pytest-flake8 }:
+, inflect, more-itertools, six, pytest
+}:
 
 buildPythonPackage rec {
   pname = "jaraco.itertools";
@@ -10,9 +11,11 @@ buildPythonPackage rec {
     sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae";
   };
 
+  patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ];
+
   buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ inflect more-itertools six ];
-  checkInputs = [ pytest pytest-flake8 ];
+  checkInputs = [ pytest ];
 
   checkPhase = ''
     pytest