pythonPackages.pygal: fix build by forcing pytest_3 - staging rebase #60888
Conversation
ofborg
bot
added
6.topic: python
10.rebuild-darwin: 101-500
10.rebuild-linux: 101-500
labels
risicle
force-pushed
the
ris-pygal-fix-staging
branch
from
c3ea670
to
4cf439c
Compare
|
I've checked the |
| ]; | ||
|
|
||
| checkInputs = [ | ||
| pytest | ||
| pytest_3 |
There was a problem hiding this comment.
I think it's not needed to bump to pytest_3, because we could fix setup.cfg:
diff --git i/pkgs/development/python-modules/pygal/default.nix w/pkgs/development/python-modules/pygal/default.nix
index b0d533f5d68..e8b82d53d93 100644
--- i/pkgs/development/python-modules/pygal/default.nix
+++ w/pkgs/development/python-modules/pygal/default.nix
@@ -39,6 +39,8 @@ buildPythonPackage rec {
preCheck = ''
# necessary on darwin to pass the testsuite
export LANG=en_US.UTF-8
+ # Fix setup.cfg for recent pytest versions. Remove with the next release
+ substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]"
'';
propagatedBuildInputs = [ cairosvg tinycss cssselect ]it was already fixed in upstream, but the patch doesn't apply cleanly. Besides that LGTM
There was a problem hiding this comment.
Hah - I did it via a substitute originally but someone told me "why not just use pytest_3?"...
There was a problem hiding this comment.
I'm inclined to use substituteInPlace because: 1. it's already fixed in upstream 2. we might forget the reasons behind using pytest_3 and leave it in future version bumps.
There was a problem hiding this comment.
Okay, but it will make the other packages I fixed in this PR effectively unrelated - I fixed them to allow the pytest_3 use to work.
|
Closing because pytest_3 was removed from nixpkgs #66376 |
Motivation for this change
This is a rebase of #59431 onto
staging, seeing as it does have a fairly high rebuild count. Please see that PR for details.