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

Merge main into develop #13282

Merged
merged 5 commits into from
Jan 30, 2024
Merged

Merge main into develop #13282

merged 5 commits into from
Jan 30, 2024

Conversation

danieldk
Copy link
Contributor

Description

Merge main into develop.

Types of change

Maintenance

Checklist

  • I confirm that I have the right to submit this contribution under the project's MIT license.
  • I ran the tests, and all new and existing tests passed.
  • My changes don't require a change to the documentation, or if they do, I've added all required information.

svlandeg and others added 3 commits January 26, 2024 10:58
@svlandeg
Clarify vocab docs (explosion#13273)
7496e03 
* add line to ensure that apple is in fact in the vocab

* add that the vocab may be empty
@svlandeg
Clarify data_path loading for apply CLI command (explosion#13272)
68b85ea 
* attempt to clarify additional annotations on .spacy file

* suggestion by Daniël

* pipeline instead of pipe
@evornov
add custom code support to CLI speed benchmark (explosion#13247)
00e938a 
* add custom code support to CLI speed benchmark

* sort imports

* better copying for warmup docs
@danieldk danieldk added the meta Meta topics, e.g. repo organisation and issue management label Jan 29, 2024
@danieldk
Extension serialization attr tests: add teardown (explosion#13284)
68d7841 
The doc/token extension serialization tests add extensions that are not
serializable with pickle. This didn't cause issues before due to the
implicit run order of tests. However, test ordering has changed with
pytest 8.0.0, leading to failed tests in test_language.

Update the fixtures in the extension serialization tests to do proper
teardown and remove the extensions.
@danieldk
Merge remote-tracking branch 'upstream/master' into maintenance/merge…
a364746 
…-main-into-develop-20240129
@danieldk danieldk force-pushed the maintenance/merge-main-into-develop-20240129 branch from 7d83e77 to a364746 Compare January 29, 2024 13:31
@svlandeg svlandeg merged commit c32c128 into explosion:develop Jan 30, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
meta Meta topics, e.g. repo organisation and issue management
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@danieldk @svlandeg @evornov