Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

python311Packages.spacy: 3.7.3 -> 3.7.4 #289693

Merged
merged 1 commit into from
Mar 3, 2024
Merged

python311Packages.spacy: 3.7.3 -> 3.7.4 #289693

merged 1 commit into from
Mar 3, 2024

Conversation

sarahec
Copy link
Contributor

@sarahec sarahec commented Feb 18, 2024 •
edited
Loading

Description of changes

  1. Updated version 3.7.3 to 3.7.4. Fixes a TypeError exception when using multiprocessing.
  2. Re-enabled pytest with a fix for the ModuleNotFoundError -- see pytestCheckHook: Switch from python -m pytest to simply pytest? #255262 for details.
  3. Excluded a small number of tests that use the network.

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.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@sarahec sarahec mentioned this pull request Feb 18, 2024
Closed
13 tasks
@sarahec
Copy link
Contributor Author

sarahec commented Feb 23, 2024

nixpkgs-review was blocked by an unrelated build error: #290983. Pending PR #290984 fixes it.

@sarahec
Copy link
Contributor Author

sarahec commented Feb 23, 2024

FYI @GaetanLepage @fabaff

@GaetanLepage
Copy link
Contributor

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

4 packages failed to build:
  • python311Packages.textacy
  • python311Packages.textacy.dist
  • python311Packages.textnets
  • python311Packages.textnets.dist
8 packages built:
  • python311Packages.fastai
  • python311Packages.fastai.dist
  • python311Packages.spacy
  • python311Packages.spacy-lookups-data
  • python311Packages.spacy-lookups-data.dist
  • python311Packages.spacy-transformers
  • python311Packages.spacy-transformers.dist
  • python311Packages.spacy.dist

@sarahec sarahec marked this pull request as draft February 25, 2024 04:02
@sarahec
Copy link
Contributor Author

sarahec commented Feb 25, 2024

Switching to a draft while I sort out the broken packages

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: policy discussion 6.topic: vim 6.topic: ocaml 6.topic: cinnamon Desktop environment 6.topic: module system About "NixOS" module system internals 6.topic: systemd 6.topic: agda "A dependently typed programming language / interactive theorem prover" 6.topic: vscode 6.topic: lib The Nixpkgs function library labels Feb 25, 2024
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 25, 2024
@github-actions github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: policy discussion labels Feb 25, 2024
sarahec
sarahec commented Feb 27, 2024
View reviewed changes
Copy link
Contributor Author

@sarahec sarahec left a comment

Choose a reason for hiding this comment

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

textnets build solved by filing #291938

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: printing 6.topic: flakes The experimental Nix feature labels Feb 28, 2024
@GaetanLepage
Copy link
Contributor

Switching to a draft while I sort out the broken packages

Rebasing on master should be enough.

@sarahec
Copy link
Contributor Author

sarahec commented Feb 28, 2024 •
edited
Loading

Rebase onto master: done. However, dependency textnets still isn't building; #291938 fixes it and is awaiting review.

I can reactivate this PR once textnets lands.

Question for future reference: is is better to patch the broken dependencies in their own PRs, or should I have patched them in this PR? (Patched: florin and textnets for broken builds.)

@sarahec sarahec marked this pull request as ready for review February 28, 2024 16:45
@GaetanLepage
Copy link
Contributor

I can reactivate this PR once textnets lands.

Seems like it has been merged :)

@github-actions github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: printing 6.topic: flakes The experimental Nix feature labels Mar 2, 2024
@sarahec
Copy link
Contributor Author

sarahec commented Mar 2, 2024

The updated thinc requirement was merged, so we don't have to patch that in the derivation anymore.

@sarahec
Copy link
Contributor Author

sarahec commented Mar 2, 2024 •
edited
Loading

One more thing: I was able to re-enable tests now that a known fix exists for testing Cythonized code. (Thanks to @natsukium for the help!)

@GaetanLepage
Copy link
Contributor

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

12 packages built:
  • python311Packages.fastai
  • python311Packages.fastai.dist
  • python311Packages.spacy
  • python311Packages.spacy-lookups-data
  • python311Packages.spacy-lookups-data.dist
  • python311Packages.spacy-transformers
  • python311Packages.spacy-transformers.dist
  • python311Packages.spacy.dist
  • python311Packages.textacy
  • python311Packages.textacy.dist
  • python311Packages.textnets
  • python311Packages.textnets.dist

GaetanLepage
GaetanLepage approved these changes Mar 2, 2024
View reviewed changes
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

LGTM ! Everything builds fine.

Thanks @sarahec and @natsukium !

@GaetanLepage
Copy link
Contributor

Result of nixpkgs-review pr 289693 run on aarch64-darwin 1

2 packages failed to build:
  • python311Packages.textnets
  • python311Packages.textnets.dist
10 packages built:
  • python311Packages.fastai
  • python311Packages.fastai.dist
  • python311Packages.spacy
  • python311Packages.spacy-lookups-data
  • python311Packages.spacy-lookups-data.dist
  • python311Packages.spacy-transformers
  • python311Packages.spacy-transformers.dist
  • python311Packages.spacy.dist
  • python311Packages.textacy
  • python311Packages.textacy.dist

@GaetanLepage
Copy link
Contributor

Hmmm textnets is building on darwin on master... This PR seems to break it though...

@sarahec
Copy link
Contributor Author

sarahec commented Mar 2, 2024 •
edited
Loading

Hmmm textnets is building on darwin on master... This PR seems to break it though...

It appears to be that torch isn't building and it's a dependency. See the ofborg log from textnets yesterday. The rest of the textnets build log looks fine.

The torch build is timing out during some file generation:

error: building of '/nix/store/919rz4h83yiickp8krbh03crpijgy3sz-python3.11-torch-2.2.1.drv^dev' from .drv file timed out after 3600 seconds
error: 1 dependencies of derivation '/nix/store/v0kw15mlilx74wl434zs324wd3niygc0-python3.11-wandb-0.16.0.drv' failed to build
error: 1 dependencies of derivation '/nix/store/mdnwc3sdmvawsvxbr03744k613b7hmk5-python3.11-spacy-loggers-1.0.5.drv' failed to build
error: 1 dependencies of derivation '/nix/store/n0y2wh2kgijrv3s6r4fywl18hynx5769-python3.11-spacy-3.7.3.drv' failed to build
error: 1 dependencies of derivation '/nix/store/kwldvyc2yij40iwmjhnd4n4z0zh42zjd-python3.11-en_core_web_sm-3.7.0.drv' failed to build
error: 1 dependencies of derivation '/nix/store/c1g3ysfr9dz9z564frd4gz4has0p3hyq-python3.11-spacy-lookups-data-1.0.5.drv' failed to build
error: 3 dependencies of derivation '/nix/store/hdhahcba2rad2f0q2dhjhk58apkk5z0w-python3.11-textnets-0.9.4.drv' failed to build

May be a load-related issue (or slow cross-compilation) in the Darwin build machine.

@GaetanLepage
Copy link
Contributor

Oh wait... I guess that it is a builder problem ^^

=========================== short test summary info ============================
FAILED tests/test_textnets.py::test_plot_layout - MemoryError: ("cairo returned CAIRO_STATUS_NO_MEMORY: b'out of memory'", 1)
FAILED tests/test_textnets.py::test_plot_projected - MemoryError: ("cairo returned CAIRO_STATUS_NO_MEMORY: b'out of memory'", 1)
FAILED tests/test_textnets.py::test_plot_backbone - MemoryError: ("cairo returned CAIRO_STATUS_NO_MEMORY: b'out of memory'", 1)
FAILED tests/test_textnets.py::test_plot_scaled - MemoryError: ("cairo returned CAIRO_STATUS_NO_MEMORY: b'out of memory'", 1)
FAILED tests/test_textnets.py::test_plot_filtered - MemoryError: ("cairo returned CAIRO_STATUS_NO_MEMORY: b'out of memory'", 1)
============ 5 failed, 25 passed, 1 deselected, 3 warnings in 4.94s ============

natsukium
natsukium approved these changes Mar 3, 2024
View reviewed changes
Copy link
Member

@natsukium natsukium left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for your awesome work!

@natsukium natsukium merged commit 0c6fd1b into NixOS:master Mar 3, 2024
22 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@natsukium natsukium natsukium approved these changes

@GaetanLepage GaetanLepage GaetanLepage approved these changes

@mmahut mmahut Awaiting requested review from mmahut

@RaghavSood RaghavSood Awaiting requested review from RaghavSood

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sarahec @GaetanLepage @natsukium