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

python3Packages.spacy: fix build #91152

Merged
merged 4 commits into from
Jun 21, 2020
Merged

python3Packages.spacy: fix build #91152

merged 4 commits into from
Jun 21, 2020
+24 −31

Conversation

danieldk
Copy link
Contributor

Motivation for this change

spaCy does not build anymore after the recent merge of staging. These changes fix the build.

Building spaCy with Python 2 does not work anymore due to the srsly bump. @FRidh maybe we should remove Python 2 support for spaCy altoghether? I saw that you kept around the old version of catalogue. But maintaining two versions of catalogue and srsly is probably not worth the effort.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@danieldk
python3Packages.srsly: disable on Python older than 3.6

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
e2e115c 
Also add an import check.
@danieldk danieldk requested review from FRidh and jonringer as code owners June 20, 2020 09:37
@ofborg ofborg bot requested review from aptlin and aborsu June 20, 2020 09:45
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Jun 20, 2020
@FRidh
Copy link
Member

FRidh commented Jun 20, 2020

But maintaining two versions of catalogue and srsly is probably not worth the effort.

If not used elsewhere, feel free to drop them

@danieldk
Copy link
Contributor Author

If not used elsewhere, feel free to drop them

Ack. I have added a commit dropping the old version of catalogue.

danieldk added 3 commits June 20, 2020 20:47
@danieldk
python3Packages.thinc: relax catalogue, plac, and srsly constraints

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
e6b1c9b 
Also add an import check.
@danieldk
python3Packages.spacy: relax catalogue, plac, and srsly versions

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
916330f 
Also add an import check.
@danieldk
python2Packages.catalogue: remove

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
be79367
@danieldk danieldk requested a review from jonringer June 20, 2020 18:48
@danieldk
Copy link
Contributor Author

@jonringer thanks for the suggested changes! I have updated the PR.

@FRidh FRidh merged commit 71ace42 into NixOS:master Jun 21, 2020
@danieldk danieldk deleted the spacy-fixes branch August 17, 2020 06:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh

@aptlin aptlin

@aborsu aborsu

@jonringer jonringer

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@danieldk @FRidh @jonringer