Skip to content

Comments

Fix treeo, treex, elegy#166167

Merged
SuperSandro2000 merged 5 commits intoNixOS:masterfrom
samuela:samuela/fix-treeo
Mar 31, 2022
Merged

Fix treeo, treex, elegy#166167
SuperSandro2000 merged 5 commits intoNixOS:masterfrom
samuela:samuela/fix-treeo

Conversation

@samuela
Copy link
Member

@samuela samuela commented Mar 29, 2022

Description of changes

Follow up to #159933. Fix #159455.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@samuela samuela requested review from FRidh and jonringer as code owners March 29, 2022 01:20
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Mar 29, 2022
@samuela
Copy link
Member Author

samuela commented Mar 29, 2022

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

4 packages built:
  • python310Packages.treeo
  • python39Packages.elegy
  • python39Packages.treeo
  • python39Packages.treex

@samuela samuela mentioned this pull request Mar 29, 2022
Merged
13 tasks
@ofborg ofborg bot requested a review from ndl March 29, 2022 01:33
@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 Mar 29, 2022
@samuela
Copy link
Member Author

samuela commented Mar 29, 2022

I'll go ahead and merge tomorrow unless anyone objects.

SuperSandro2000
SuperSandro2000 reviewed Mar 29, 2022
View reviewed changes
@samuela samuela force-pushed the samuela/fix-treeo branch from 6542a04 to 734ee96 Compare March 29, 2022 19:39
@samuela
Copy link
Member Author

samuela commented Mar 29, 2022 •
edited
Loading

nixpkgs-review is claiming that I've updated 930 packages which is clearly false. But All of the packages that are being updated in this PR build successfully manually.

@ofborg ofborg bot requested review from risicle and yl3dy March 29, 2022 20:20
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. and removed 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 Mar 29, 2022
SuperSandro2000
SuperSandro2000 reviewed Mar 29, 2022
View reviewed changes
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Mar 29, 2022

If you move the rich update to another PR I think we can target master with the other things.

@samuela
Copy link
Member Author

samuela commented Mar 29, 2022

Is there a reason not to target rich to master?

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Mar 29, 2022

The 928 rebuilds on x86_64-linux.

@samuela
Copy link
Member Author

samuela commented Mar 29, 2022

The 928 rebuilds on x86_64-linux.

Oh gotcha, fair enough!

@samuela samuela force-pushed the samuela/fix-treeo branch from 734ee96 to 75235ab Compare March 29, 2022 22:21
@samuela
Copy link
Member Author

samuela commented Mar 29, 2022

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

8 packages built:
  • python310Packages.treeo
  • python39Packages.augmax
  • python39Packages.einops
  • python39Packages.elegy
  • python39Packages.flax
  • python39Packages.optax
  • python39Packages.treeo
  • python39Packages.treex

@samuela
Copy link
Member Author

samuela commented Mar 29, 2022

Ok I redid things, this time patching around the rich issue instead of updating it so as to keep this PR smaller and target master.

@samuela
Copy link
Member Author

samuela commented Mar 29, 2022

I also included the patch cgarciae/treeo#14 to workaround issue cgarciae/treex#68.

@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. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Mar 29, 2022
SuperSandro2000
SuperSandro2000 reviewed Mar 30, 2022
View reviewed changes
@samuela samuela force-pushed the samuela/fix-treeo branch from 75235ab to db60f46 Compare March 30, 2022 02:50
@samuela
Copy link
Member Author

samuela commented Mar 30, 2022

I'll go ahead and merge tomorrow unless anyone objects

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Mar 31, 2022

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).

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

8 packages built:
  • python310Packages.treeo
  • python39Packages.augmax
  • python39Packages.einops
  • python39Packages.elegy
  • python39Packages.flax
  • python39Packages.optax
  • python39Packages.treeo
  • python39Packages.treex

@SuperSandro2000 SuperSandro2000 merged commit 9d1a1d1 into NixOS:master Mar 31, 2022
@samuela samuela deleted the samuela/fix-treeo branch March 31, 2022 07:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@ndl ndl Awaiting requested review from ndl

@risicle risicle Awaiting requested review from risicle

+1 more reviewer

@yl3dy yl3dy yl3dy approved these changes

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. 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.

python3Packages.treex build failure on x86_64-linux as of 70aa8d9e

3 participants

@samuela @SuperSandro2000 @yl3dy