pythonPackages.jaraco_logging: 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/90301692
Addresses #56826
This commit is contained in:
Maximilian Bosch 2019-03-10 16:44:31 +01:00
parent 4c57b5e896
commit 18b0729790
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 43 additions and 2 deletions

View File

@ -0,0 +1,38 @@
From 4b9801d9bbe535fd6719933b96278915573e3595 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Mar 2019 16:42:21 +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 9b3c1ec..a5189c1 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
filterwarnings=
ignore:Possible nested set::pycodestyle:113
diff --git a/setup.cfg b/setup.cfg
index 3e7bbed..5cac7a2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,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

View File

@ -1,5 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, setuptools_scm { lib, buildPythonPackage, fetchPypi, setuptools_scm
, tempora, six, pytest, pytest-flake8 }: , tempora, six, pytest
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "jaraco.logging"; pname = "jaraco.logging";
@ -10,9 +11,11 @@ buildPythonPackage rec {
sha256 = "1lb846j7qs1hgqwkyifv51nhl3f8jimbc4lk8yn9nkaynw0vyzcg"; sha256 = "1lb846j7qs1hgqwkyifv51nhl3f8jimbc4lk8yn9nkaynw0vyzcg";
}; };
patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ];
buildInputs = [ setuptools_scm ]; buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ tempora six ]; propagatedBuildInputs = [ tempora six ];
checkInputs = [ pytest pytest-flake8 ]; checkInputs = [ pytest ];
checkPhase = '' checkPhase = ''
PYTHONPATH=".:$PYTHONPATH" pytest PYTHONPATH=".:$PYTHONPATH" pytest