python312Packages.{blackdiag,seqdiag,actdiag,nwdiag}: drop nose dependency #330396
Conversation
Sigmanificient
changed the title
There was a problem hiding this comment.
Thanks!
The two pull requests we’re vendoring here are included in a fork by the author of one of them at https://github.com/yuzutech/blockdiag, which also has other clean‐ups. I think we should strongly consider switching to that instead of applying more patches, as it seems unlikely that they’ll ever be merged upstream.
| # requires network access the url-based icon | ||
| # and path-based icon is set to debian logo (/usr/share/pixmaps/debian-logo.png) | ||
| rm src/blockdiag/tests/diagrams/node_icon.diag |
There was a problem hiding this comment.
| from blockdiag.tests.test_generate_diagram import (get_diagram_files, | ||
| - testcase_generator) | ||
| - | ||
| -import seqdiag.command | ||
| - | ||
| - | ||
| -def test_generate(): | ||
| - mainfunc = seqdiag.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) |
There was a problem hiding this comment.
Could you help me understand what this patch is doing? What’s the difference in behaviour here?
There was a problem hiding this comment.
testcase_generator was replaced with test_generate_with_separate with blackdiag migrate-to-pytest patch
Since it uses a pytest decoration (@pytest.mark.parametrize) it is collected automatically by pytest. All the logic is done through the single import statement
Lets see @bjornfor opinion (if he doens't reply, well try to migrate) |
I think this PR is fine and we can migrate to a fork in a separate PR. |
|
Result of 8 packages failed to build:
27 packages built:
The regressions are because of the |
|
Should we setup a custom patch for this then? |
|
I think probably. Those packages also have a nose dependency we’ll need to clean up. It’s kind of awkward since people are fixing up the main package but not the other ones that are part of the same collection. |
|
Well sorry, thought I had it with |
|
Oh, sorry, I meant people making PRs on GitHub and doing forks etc. :) You’re doing fine. |
Sigmanificient
force-pushed
the
blockdiag
branch
from
c86ef18
to
44f13e3
Compare
Sigmanificient
force-pushed
the
blockdiag
branch
from
44f13e3
to
ac2e5fb
Compare
Sigmanificient
changed the title
There was a problem hiding this comment.
Result of nixpkgs-review pr 330396 run on x86_64-linux 1
35 packages built:
- actdiag (python312Packages.actdiag)
- actdiag.dist (python312Packages.actdiag.dist)
- asciidoc-full-with-plugins
- asciidoc-full-with-plugins.dist
- blockdiag (python312Packages.blockdiag)
- blockdiag.dist (python312Packages.blockdiag.dist)
- nixpkgs-manual
- nwdiag (python312Packages.nwdiag)
- nwdiag.dist (python312Packages.nwdiag.dist)
- python311Packages.actdiag
- python311Packages.actdiag.dist
- python311Packages.blockdiag
- python311Packages.blockdiag.dist
- python311Packages.nwdiag
- python311Packages.nwdiag.dist
- python311Packages.seqdiag
- python311Packages.seqdiag.dist
- python311Packages.sphinxcontrib-actdiag
- python311Packages.sphinxcontrib-actdiag.dist
- python311Packages.sphinxcontrib-blockdiag
- python311Packages.sphinxcontrib-blockdiag.dist
- python311Packages.sphinxcontrib-nwdiag
- python311Packages.sphinxcontrib-nwdiag.dist
- python311Packages.sphinxcontrib-seqdiag
- python311Packages.sphinxcontrib-seqdiag.dist
- seqdiag (python312Packages.seqdiag)
- seqdiag.dist (python312Packages.seqdiag.dist)
- python312Packages.sphinxcontrib-actdiag
- python312Packages.sphinxcontrib-actdiag.dist
- python312Packages.sphinxcontrib-blockdiag
- python312Packages.sphinxcontrib-blockdiag.dist
- python312Packages.sphinxcontrib-nwdiag
- python312Packages.sphinxcontrib-nwdiag.dist
- python312Packages.sphinxcontrib-seqdiag
- python312Packages.sphinxcontrib-seqdiag.dist
Description of changes
part of:
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.