push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,52 @@
{
lib,
blockdiag,
fetchFromGitHub,
buildPythonPackage,
pytestCheckHook,
setuptools,
pythonOlder,
}:
buildPythonPackage rec {
pname = "nwdiag";
version = "3.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "blockdiag";
repo = "nwdiag";
tag = version;
hash = "sha256-uKrdkXpL5YBr953sRsHknYg+2/WwrZmyDf8BMA2+0tU=";
};
patches = [ ./fix_test_generate.patch ];
build-system = [ setuptools ];
dependencies = [ blockdiag ];
nativeCheckInputs = [ pytestCheckHook ];
enabledTestPaths = [ "src/nwdiag/tests/" ];
disabledTests = [
# AttributeError: 'TestRstDirectives' object has no attribute 'assertRegexpMatches'
"svg"
"noviewbox"
];
pythonImportsCheck = [ "nwdiag" ];
meta = with lib; {
description = "Generate network-diagram image from spec-text file (similar to Graphviz)";
homepage = "http://blockdiag.com/";
changelog = "https://github.com/blockdiag/nwdiag/blob/${version}/CHANGES.rst";
license = licenses.asl20;
maintainers = with maintainers; [ bjornfor ];
mainProgram = "rackdiag";
platforms = platforms.unix;
};
}

View File

@@ -0,0 +1,22 @@
diff --git a/src/nwdiag/tests/test_generate_diagram.py b/src/nwdiag/tests/test_generate_diagram.py
index 2065208..ac9b096 100644
--- a/src/nwdiag/tests/test_generate_diagram.py
+++ b/src/nwdiag/tests/test_generate_diagram.py
@@ -16,16 +16,4 @@
import os
from blockdiag.tests.test_generate_diagram import (get_diagram_files,
- testcase_generator)
-
-import nwdiag.command
-
-
-def test_generate():
- mainfunc = nwdiag.command.main
- basepath = os.path.dirname(__file__)
- files = get_diagram_files(basepath)
- options = []
-
- for testcase in testcase_generator(basepath, mainfunc, files, options):
- yield testcase
+ test_generate_with_separate)