Skip to content

paperwork: unbreak#327214

Merged
symphorien merged 2 commits intoNixOS:masterfrom
pyrox0:unbreak-paperwork
Jul 20, 2024
Merged

paperwork: unbreak#327214
symphorien merged 2 commits intoNixOS:masterfrom
pyrox0:unbreak-paperwork

Conversation

@pyrox0
Copy link
Member

@pyrox0 pyrox0 commented Jul 14, 2024

Description of changes

As reported here, paperwork was broken due to both pypillowfight and fabulous being broken. This fixes both of them, by:

  • Updating pypillowfight to a recent commit that removes nose tests, allowing it to work on recent python versions. The tests also pass now, so there's no reason to have doCheck = false; now.
  • Adds a patch(also submitted upstream) to fabulous that unbreaks its tests, as it was using deprecated and now-removed function aliases from python's unittest library.

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 14, 2024
emilazy
emilazy reviewed Jul 14, 2024
View reviewed changes
@emilazy emilazy mentioned this pull request Jul 14, 2024
Closed
emilazy
emilazy reviewed Jul 14, 2024
View reviewed changes
@pyrox0 pyrox0 force-pushed the unbreak-paperwork branch from 12b2fbf to bc7e046 Compare July 14, 2024 22:21
emilazy
emilazy approved these changes Jul 14, 2024
View reviewed changes
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 327214 run on x86_64-darwin 1

4 packages built:
  • python311Packages.fabulous
  • python311Packages.fabulous.dist
  • python312Packages.fabulous
  • python312Packages.fabulous.dist

@eclairevoyant
Copy link
Contributor

eclairevoyant commented Jul 14, 2024

commit content seems fine at a glance, but commit messages should start with python312Packages.

@pyrox0 pyrox0 force-pushed the unbreak-paperwork branch from bc7e046 to a5a0fc8 Compare July 14, 2024 23:03
@pyrox0
Copy link
Member Author

pyrox0 commented Jul 14, 2024

Updated both commit messages

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jul 15, 2024
@ofborg ofborg bot requested a review from symphorien July 15, 2024 00:17
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 15, 2024
pyrox0 added 2 commits July 18, 2024 21:32
@pyrox0
python312Packages.pypillowfight: 0.3.0 -> 0.3.0-unstable-2024-07-07, …
c9e3709 
…modernize and remove nose

Updates to a recent commit that removes nose in favor of pytest. Also
includes a few misc improvements made upstream.
@pyrox0
python312Packages.fabulous: Fix tests on python 3.12
e9277a6
@pyrox0 pyrox0 force-pushed the unbreak-paperwork branch from a5a0fc8 to e9277a6 Compare July 19, 2024 01:32
@symphorien symphorien merged commit e7279da into NixOS:master Jul 20, 2024
@symphorien symphorien mentioned this pull request Jul 20, 2024
Closed
13 tasks
@pyrox0 pyrox0 deleted the unbreak-paperwork branch August 4, 2024 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@emilazy emilazy emilazy approved these changes

@symphorien symphorien Awaiting requested review from symphorien

+1 more reviewer

@eclairevoyant eclairevoyant eclairevoyant left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@pyrox0 @eclairevoyant @symphorien @emilazy