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.

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

Matcher support for Span as well as Doc #5113

Merged
merged 8 commits into from
Apr 15, 2020

Conversation

paoloq
Copy link
Contributor

@paoloq paoloq commented Mar 6, 2020

Description

Matcher support for searching on a Span, as well as a Doc. Fixes #5056
Missing of an appropriate error message at line 228 in matcher.pxy

Types of change

Enhancement/feature for the Matcher.

Checklist

  • I have submitted the spaCy Contributor Agreement.
  • 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.

@paoloq paoloq changed the title Matcher span Matcher support for Span as well as Doc Mar 6, 2020
@svlandeg svlandeg added the feat / matcher Feature: Token, phrase and dependency matcher label Mar 6, 2020
spacy/matcher/matcher.pyx Outdated Show resolved Hide resolved
@explosion-bot
Copy link
Collaborator

Hi @paoloq, thanks for your pull request! 👍 It looks like you haven't filled in the spaCy Contributor Agreement (SCA) yet. The agreement ensures that we can use your contribution across the project. Once you've filled in the template, put it in the .github/contributors directory and add it to this pull request. If your pull request targets a branch that's not master, for example develop, make sure to submit the Contributor Agreement to the master branch. Thanks a lot!

If you've already included the Contributor Agreement in your pull request above, you can ignore this message.

@svlandeg svlandeg added the enhancement Feature requests and improvements label Mar 6, 2020
@svlandeg
Copy link
Member

Hi @paoloq : apologies for the late follow-up. Could you merge the latest version of master into this branch and resolve the conflicts? Your contributor agreement is there now twice, and a different PR made some edits to test_matcher_api: just need to make sure that both PRs are kept intact.

Let me know if you need help merging!

@honnibal honnibal merged commit 1ca32d8 into explosion:master Apr 15, 2020
@svlandeg
Copy link
Member

Thanks a lot for your contribution! It's now merged, and will be included in the next release of spaCy, probably 2.3 (or otherwise 3.0) 👍

@paoloq paoloq deleted the matcher_span branch April 15, 2020 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Feature requests and improvements feat / matcher Feature: Token, phrase and dependency matcher
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Matcher support for searching on a Span, as well as a Doc
4 participants