Skip to content

python312Packages.{blackdiag,seqdiag,actdiag,nwdiag}: drop nose dependency#330396

Merged
emilazy merged 4 commits intoNixOS:masterfrom
Sigmanificient:blockdiag
Jul 28, 2024
Merged

python312Packages.{blackdiag,seqdiag,actdiag,nwdiag}: drop nose dependency#330396
emilazy merged 4 commits intoNixOS:masterfrom
Sigmanificient:blockdiag

Conversation

@Sigmanificient
Copy link
Member

@Sigmanificient Sigmanificient commented Jul 27, 2024

Description of changes

part of:

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jul 27, 2024
@Sigmanificient Sigmanificient changed the title python312Packages.blackdiag: drop nose dependency python312Packages.{blackdiag,seqdiag}: drop nose dependency Jul 27, 2024
@ofborg ofborg bot requested a review from bjornfor July 27, 2024 12:44
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jul 27, 2024
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment on lines +48 to +50
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment on lines +11 to +25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you help me understand what this patch is doing? What’s the difference in behaviour here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@Sigmanificient
Copy link
Member Author

Thanks!

The two pull requests we’re vendoring here are included in a fork by the author of one of them at 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.

Lets see @bjornfor opinion (if he doens't reply, well try to migrate)

@bjornfor
Copy link
Contributor

Thanks!
The two pull requests we’re vendoring here are included in a fork by the author of one of them at 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.

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.

Copy link
Contributor

@bjornfor bjornfor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Didn't build/test.

@emilazy
Copy link
Member

emilazy commented Jul 27, 2024

Result of nixpkgs-review pr 330396 run on x86_64-linux 1

8 packages failed to build:
  • python311Packages.actdiag
  • python311Packages.actdiag.dist
  • python311Packages.nwdiag
  • python311Packages.nwdiag.dist
  • python311Packages.sphinxcontrib-actdiag
  • python311Packages.sphinxcontrib-actdiag.dist
  • python311Packages.sphinxcontrib-nwdiag
  • python311Packages.sphinxcontrib-nwdiag.dist
27 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.blockdiag
  • python311Packages.blockdiag.dist
  • python311Packages.seqdiag
  • python311Packages.seqdiag.dist
  • python311Packages.sphinxcontrib-blockdiag
  • python311Packages.sphinxcontrib-blockdiag.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

The regressions are because of the testcase_generator removal; they break only on 3.11 because those packages also depend on nose and therefore have tests disabled on 3.12. That’s probably not a good situation to be in.

@Sigmanificient
Copy link
Member Author

Should we setup a custom patch for this then?

@emilazy
Copy link
Member

emilazy commented Jul 27, 2024

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.

@Sigmanificient
Copy link
Member Author

Well sorry, thought I had it with seqdiag

@emilazy
Copy link
Member

emilazy commented Jul 27, 2024

Oh, sorry, I meant people making PRs on GitHub and doing forks etc. :) You’re doing fine.

@Sigmanificient Sigmanificient changed the title python312Packages.{blackdiag,seqdiag}: drop nose dependency python312Packages.{blackdiag,seqdiag,actdiag,nwdiag}: drop nose dependency Jul 27, 2024
@ofborg ofborg bot requested a review from bjornfor July 27, 2024 21:11
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@emilazy emilazy merged commit b9fb14c into NixOS:master Jul 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants