public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117886 from risicle/ris-pygments-tests

Browse Source
This commit is contained in:
Sandro 2021-03-29 11:58:10 +02:00 committed by GitHub
commit 49e0bbb333
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/Pygments/2_5.nix
View File

@ -3,6 +3,7 @@
, fetchPypi , fetchPypi
, fetchpatch , fetchpatch
, docutils , docutils
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -25,8 +26,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ docutils ]; propagatedBuildInputs = [ docutils ];
# Circular dependency with sphinx checkInputs = [ pytestCheckHook ];
doCheck = false;
meta = { meta = {
homepage = "https://pygments.org/"; homepage = "https://pygments.org/";

6
pkgs/development/python-modules/Pygments/default.nix
View File

@ -2,6 +2,8 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, docutils , docutils
, pytestCheckHook
, doCheck ? true
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -15,8 +17,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ docutils ]; propagatedBuildInputs = [ docutils ];
# Circular dependency with sphinx inherit doCheck;
doCheck = false; checkInputs = [ pytestCheckHook ];
meta = { meta = {
homepage = "https://pygments.org/"; homepage = "https://pygments.org/";

10
pkgs/top-level/python-packages.nix
View File

@ -6417,18 +6417,24 @@ in {
pytest_5 = callPackage pytest_5 = callPackage
../development/python-modules/pytest/5.nix { ../development/python-modules/pytest/5.nix {
# hypothesis tests require pytest that causes dependency cycle # hypothesis & pygments tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { hypothesis = self.hypothesis.override {
doCheck = false; doCheck = false;
}; };
pygments = self.pygments.override {
doCheck = false;
};
}; };
pytest_6 = pytest_6 =
callPackage ../development/python-modules/pytest { callPackage ../development/python-modules/pytest {
# hypothesis tests require pytest that causes dependency cycle # hypothesis & pygments tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { hypothesis = self.hypothesis.override {
doCheck = false; doCheck = false;
}; };
pygments = self.pygments.override {
doCheck = false;
};
}; };
pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec { pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec {