Merge branch 'master' of ssh://github.com/explosion/spaCy

.github/CONTRIBUTOR_AGREEMENT.md

@@ -0,0 +1,106 @@
+# spaCy contributor agreement
+
+This spaCy Contributor Agreement (**"SCA"**) is based on the
+[Oracle Contributor Agreement](http://www.oracle.com/technetwork/oca-405177.pdf).
+The SCA applies to any contribution that you make to any product or project
+managed by us (the **"project"**), and sets out the intellectual property rights
+you grant to us in the contributed materials. The term **"us"** shall mean
+[ExplosionAI UG (haftungsbeschränkt)](https://explosion.ai/legal). The term
+**"you"** shall mean the person or entity identified below.
+
+If you agree to be bound by these terms, fill in the information requested
+below and include the filled-in version with your first pull request, under the
+folder [`.github/contributors/`](/.github/contributors/). The name of the file
+should be your GitHub username, with the extension `.md`. For example, the user
+example_user would create the file `.github/contributors/example_user.md`.
+
+Read this agreement carefully before signing. These terms and conditions
+constitute a binding legal agreement.
+
+## Contributor Agreement
+
+1. The term "contribution" or "contributed materials" means any source code,
+object code, patch, tool, sample, graphic, specification, manual,
+documentation, or any other material posted or submitted by you to the project.
+
+2. With respect to any worldwide copyrights, or copyright applications and
+registrations, in your contribution:
+
+    * you hereby assign to us joint ownership, and to the extent that such
+    assignment is or becomes invalid, ineffective or unenforceable, you hereby
+    grant to us a perpetual, irrevocable, non-exclusive, worldwide, no-charge,
+    royalty-free, unrestricted license to exercise all rights under those
+    copyrights. This includes, at our option, the right to sublicense these same
+    rights to third parties through multiple levels of sublicensees or other
+    licensing arrangements;
+
+    * you agree that each of us can do all things in relation to your
+    contribution as if each of us were the sole owners, and if one of us makes
+    a derivative work of your contribution, the one who makes the derivative
+    work (or has it made will be the sole owner of that derivative work;
+
+    * you agree that you will not assert any moral rights in your contribution
+    against us, our licensees or transferees;
+
+    * you agree that we may register a copyright in your contribution and
+    exercise all ownership rights associated with it; and
+
+    * you agree that neither of us has any duty to consult with, obtain the
+    consent of, pay or render an accounting to the other for any use or
+    distribution of your contribution.
+
+3. With respect to any patents you own, or that you can license without payment
+to any third party, you hereby grant to us a perpetual, irrevocable,
+non-exclusive, worldwide, no-charge, royalty-free license to:
+
+    * make, have made, use, sell, offer to sell, import, and otherwise transfer
+    your contribution in whole or in part, alone or in combination with or
+    included in any product, work or materials arising out of the project to
+    which your contribution was submitted, and
+
+    * at our option, to sublicense these same rights to third parties through
+    multiple levels of sublicensees or other licensing arrangements.
+
+4. Except as set out above, you keep all right, title, and interest in your
+contribution. The rights that you grant to us under these terms are effective
+on the date you first submitted a contribution to us, even if your submission
+took place before the date you sign these terms.
+
+5. You covenant, represent, warrant and agree that:
+
+    * Each contribution that you submit is and shall be an original work of
+    authorship and you can legally grant the rights set out in this SCA;
+
+    * to the best of your knowledge, each contribution will not violate any
+    third party's copyrights, trademarks, patents, or other intellectual
+    property rights; and
+
+    * each contribution shall be in compliance with U.S. export control laws and
+    other applicable export and import laws. You agree to notify us if you
+    become aware of any circumstance which would make any of the foregoing
+    representations inaccurate in any respect. We may publicly disclose your 
+    participation in the project, including the fact that you have signed the SCA.
+
+6. This SCA is governed by the laws of the State of California and applicable
+U.S. Federal law. Any choice of law rules will not apply.
+
+7. Please place an “x” on one of the applicable statement below. Please do NOT
+mark both statements:
+
+    * [ ] I am signing on behalf of myself as an individual and no other person
+    or entity, including my employer, has or will have rights with respect my
+    contributions.
+
+    * [ ] I am signing on behalf of my employer or a legal entity and I have the
+    actual authority to contractually bind that entity.
+
+## Contributor Details
+
+| Field                          | Entry                |
+|------------------------------- | -------------------- |
+| Name                           |                      |
+| Company name (if applicable)   |                      |
+| Title or role (if applicable)  |                      |
+| Date                           |                      |
+| GitHub username                |                      |
+| Website (optional)             |                      |

.github/contributors/NSchrading.md

@@ -0,0 +1,98 @@
+# Syllogism contributor agreement
+
+This Syllogism Contributor Agreement (**"SCA"**) is based on the
+[Oracle Contributor Agreement](http://www.oracle.com/technetwork/oca-405177.pdf).
+The SCA applies to any contribution that you make to any product or project
+managed by us (the **"project"**), and sets out the intellectual property rights
+you grant to us in the contributed materials. The term **"us"** shall mean
+Syllogism Co. The term **"you"** shall mean the person or entity identified
+below.
+
+## Contributor Agreement
+
+1. The term "contribution" or "contributed materials" means any source code,
+object code, patch, tool, sample, graphic, specification, manual,
+documentation, or any other material posted or submitted by you to the project.
+
+2. With respect to any worldwide copyrights, or copyright applications and
+registrations, in your contribution:
+
+    * you hereby assign to us joint ownership, and to the extent that such
+    assignment is or becomes invalid, ineffective or unenforceable, you hereby
+    grant to us a perpetual, irrevocable, non-exclusive, worldwide, no-charge,
+    royalty-free, unrestricted license to exercise all rights under those
+    copyrights. This includes, at our option, the right to sublicense these same
+    rights to third parties through multiple levels of sublicensees or other
+    licensing arrangements;
+
+    * you agree that each of us can do all things in relation to your
+    contribution as if each of us were the sole owners, and if one of us makes
+    a derivative work of your contribution, the one who makes the derivative
+    work (or has it made will be the sole owner of that derivative work;
+
+    * you agree that you will not assert any moral rights in your contribution
+    against us, our licensees or transferees;
+
+    * you agree that we may register a copyright in your contribution and
+    exercise all ownership rights associated with it; and
+
+    * you agree that neither of us has any duty to consult with, obtain the
+    consent of, pay or render an accounting to the other for any use or
+    distribution of your contribution.
+
+3. With respect to any patents you own, or that you can license without payment
+to any third party, you hereby grant to us a perpetual, irrevocable,
+non-exclusive, worldwide, no-charge, royalty-free license to:
+
+    * make, have made, use, sell, offer to sell, import, and otherwise transfer
+    your contribution in whole or in part, alone or in combination with or
+    included in any product, work or materials arising out of the project to
+    which your contribution was submitted, and
+
+    * at our option, to sublicense these same rights to third parties through
+    multiple levels of sublicensees or other licensing arrangements.
+
+4. Except as set out above, you keep all right, title, and interest in your
+contribution. The rights that you grant to us under these terms are effective
+on the date you first submitted a contribution to us, even if your submission
+took place before the date you sign these terms.
+
+5. You covenant, represent, warrant and agree that:
+
+    * Each contribution that you submit is and shall be an original work of
+    authorship and you can legally grant the rights set out in this SCA;
+
+    * to the best of your knowledge, each contribution will not violate any
+    third party's copyrights, trademarks, patents, or other intellectual
+    property rights; and
+
+    * each contribution shall be in compliance with U.S. export control laws and
+    other applicable export and import laws. You agree to notify us if you
+    become aware of any circumstance which would make any of the foregoing
+    representations inaccurate in any respect. Syllogism Co. may publicly
+    disclose your participation in the project, including the fact that you have
+    signed the SCA.
+
+6. This SCA is governed by the laws of the State of California and applicable
+U.S. Federal law. Any choice of law rules will not apply.
+
+7. Please place an “x” on one of the applicable statement below. Please do NOT
+mark both statements:
+
+    * [x] I am signing on behalf of myself as an individual and no other person
+    or entity, including my employer, has or will have rights with respect my
+    contributions.
+
+    * [ ] I am signing on behalf of my employer or a legal entity and I have the
+    actual authority to contractually bind that entity.
+
+## Contributor Details
+
+| Field                          | Entry                |
+|------------------------------- | -------------------- |
+| Name                           | J Nicolas Schrading  |
+| Company's name (if applicable) |                      |
+| Title or Role (if applicable)  |                      |
+| Date                           | 2015-08-24           |
+| GitHub username                | NSchrading           |
+| Website (optional)             | nicschrading.com     |

.github/contributors/chrisdubois.md

@@ -0,0 +1,98 @@
+# Syllogism contributor agreement
+
+This Syllogism Contributor Agreement (**"SCA"**) is based on the
+[Oracle Contributor Agreement](http://www.oracle.com/technetwork/oca-405177.pdf).
+The SCA applies to any contribution that you make to any product or project
+managed by us (the **"project"**), and sets out the intellectual property rights
+you grant to us in the contributed materials. The term **"us"** shall mean
+Syllogism Co. The term **"you"** shall mean the person or entity identified
+below.
+
+## Contributor Agreement
+
+1. The term "contribution" or "contributed materials" means any source code,
+object code, patch, tool, sample, graphic, specification, manual,
+documentation, or any other material posted or submitted by you to the project.
+
+2. With respect to any worldwide copyrights, or copyright applications and
+registrations, in your contribution:
+
+    * you hereby assign to us joint ownership, and to the extent that such
+    assignment is or becomes invalid, ineffective or unenforceable, you hereby
+    grant to us a perpetual, irrevocable, non-exclusive, worldwide, no-charge,
+    royalty-free, unrestricted license to exercise all rights under those
+    copyrights. This includes, at our option, the right to sublicense these same
+    rights to third parties through multiple levels of sublicensees or other
+    licensing arrangements;
+
+    * you agree that each of us can do all things in relation to your
+    contribution as if each of us were the sole owners, and if one of us makes
+    a derivative work of your contribution, the one who makes the derivative
+    work (or has it made will be the sole owner of that derivative work;
+
+    * you agree that you will not assert any moral rights in your contribution
+    against us, our licensees or transferees;
+
+    * you agree that we may register a copyright in your contribution and
+    exercise all ownership rights associated with it; and
+
+    * you agree that neither of us has any duty to consult with, obtain the
+    consent of, pay or render an accounting to the other for any use or
+    distribution of your contribution.
+
+3. With respect to any patents you own, or that you can license without payment
+to any third party, you hereby grant to us a perpetual, irrevocable,
+non-exclusive, worldwide, no-charge, royalty-free license to:
+
+    * make, have made, use, sell, offer to sell, import, and otherwise transfer
+    your contribution in whole or in part, alone or in combination with or
+    included in any product, work or materials arising out of the project to
+    which your contribution was submitted, and
+
+    * at our option, to sublicense these same rights to third parties through
+    multiple levels of sublicensees or other licensing arrangements.
+
+4. Except as set out above, you keep all right, title, and interest in your
+contribution. The rights that you grant to us under these terms are effective
+on the date you first submitted a contribution to us, even if your submission
+took place before the date you sign these terms.
+
+5. You covenant, represent, warrant and agree that:
+
+    * Each contribution that you submit is and shall be an original work of
+    authorship and you can legally grant the rights set out in this SCA;
+
+    * to the best of your knowledge, each contribution will not violate any
+    third party's copyrights, trademarks, patents, or other intellectual
+    property rights; and
+
+    * each contribution shall be in compliance with U.S. export control laws and
+    other applicable export and import laws. You agree to notify us if you
+    become aware of any circumstance which would make any of the foregoing
+    representations inaccurate in any respect. Syllogism Co. may publicly
+    disclose your participation in the project, including the fact that you have
+    signed the SCA.
+
+6. This SCA is governed by the laws of the State of California and applicable
+U.S. Federal law. Any choice of law rules will not apply.
+
+7. Please place an “x” on one of the applicable statement below. Please do NOT
+mark both statements:
+
+    * [x] I am signing on behalf of myself as an individual and no other person
+    or entity, including my employer, has or will have rights with respect my
+    contributions.
+
+    * [ ] I am signing on behalf of my employer or a legal entity and I have the
+    actual authority to contractually bind that entity.
+
+## Contributor Details
+
+| Field                          | Entry                |
+|------------------------------- | -------------------- |
+| Name                           | Chris DuBois         |
+| Company's name (if applicable) |                      |
+| Title or Role (if applicable)  |                      |
+| Date                           | 2015.10.07           |
+| GitHub username                | chrisdubois          |
+| Website (optional)             |                      |

.github/contributors/suchow.md

@@ -0,0 +1,98 @@
+# Syllogism contributor agreement
+
+This Syllogism Contributor Agreement (**"SCA"**) is based on the
+[Oracle Contributor Agreement](http://www.oracle.com/technetwork/oca-405177.pdf).
+The SCA applies to any contribution that you make to any product or project
+managed by us (the **"project"**), and sets out the intellectual property rights
+you grant to us in the contributed materials. The term **"us"** shall mean
+Syllogism Co. The term **"you"** shall mean the person or entity identified
+below.
+
+## Contributor Agreement
+
+1. The term "contribution" or "contributed materials" means any source code,
+object code, patch, tool, sample, graphic, specification, manual,
+documentation, or any other material posted or submitted by you to the project.
+
+2. With respect to any worldwide copyrights, or copyright applications and
+registrations, in your contribution:
+
+    * you hereby assign to us joint ownership, and to the extent that such
+    assignment is or becomes invalid, ineffective or unenforceable, you hereby
+    grant to us a perpetual, irrevocable, non-exclusive, worldwide, no-charge,
+    royalty-free, unrestricted license to exercise all rights under those
+    copyrights. This includes, at our option, the right to sublicense these same
+    rights to third parties through multiple levels of sublicensees or other
+    licensing arrangements;
+
+    * you agree that each of us can do all things in relation to your
+    contribution as if each of us were the sole owners, and if one of us makes
+    a derivative work of your contribution, the one who makes the derivative
+    work (or has it made will be the sole owner of that derivative work;
+
+    * you agree that you will not assert any moral rights in your contribution
+    against us, our licensees or transferees;
+
+    * you agree that we may register a copyright in your contribution and
+    exercise all ownership rights associated with it; and
+
+    * you agree that neither of us has any duty to consult with, obtain the
+    consent of, pay or render an accounting to the other for any use or
+    distribution of your contribution.
+
+3. With respect to any patents you own, or that you can license without payment
+to any third party, you hereby grant to us a perpetual, irrevocable,
+non-exclusive, worldwide, no-charge, royalty-free license to:
+
+    * make, have made, use, sell, offer to sell, import, and otherwise transfer
+    your contribution in whole or in part, alone or in combination with or
+    included in any product, work or materials arising out of the project to
+    which your contribution was submitted, and
+
+    * at our option, to sublicense these same rights to third parties through
+    multiple levels of sublicensees or other licensing arrangements.
+
+4. Except as set out above, you keep all right, title, and interest in your
+contribution. The rights that you grant to us under these terms are effective
+on the date you first submitted a contribution to us, even if your submission
+took place before the date you sign these terms.
+
+5. You covenant, represent, warrant and agree that:
+
+    * Each contribution that you submit is and shall be an original work of
+    authorship and you can legally grant the rights set out in this SCA;
+
+    * to the best of your knowledge, each contribution will not violate any
+    third party's copyrights, trademarks, patents, or other intellectual
+    property rights; and
+
+    * each contribution shall be in compliance with U.S. export control laws and
+    other applicable export and import laws. You agree to notify us if you
+    become aware of any circumstance which would make any of the foregoing
+    representations inaccurate in any respect. Syllogism Co. may publicly
+    disclose your participation in the project, including the fact that you have
+    signed the SCA.
+
+6. This SCA is governed by the laws of the State of California and applicable
+U.S. Federal law. Any choice of law rules will not apply.
+
+7. Please place an “x” on one of the applicable statement below. Please do NOT
+mark both statements:
+
+    * [x] I am signing on behalf of myself as an individual and no other person
+    or entity, including my employer, has or will have rights with respect my
+    contributions.
+
+    * [ ] I am signing on behalf of my employer or a legal entity and I have the
+    actual authority to contractually bind that entity.
+
+## Contributor Details
+
+| Field                          | Entry                |
+|------------------------------- | -------------------- |
+| Name                           | Jordan Suchow        |
+| Company's name (if applicable) |                      |
+| Title or Role (if applicable)  |                      |
+| Date                           | 2015-04-19           |
+| GitHub username                | suchow               |
+| Website (optional)             | http://suchow.io     |

.github/contributors/vsolovyov.md

@@ -0,0 +1,98 @@
+# Syllogism contributor agreement
+
+This Syllogism Contributor Agreement (**"SCA"**) is based on the
+[Oracle Contributor Agreement](http://www.oracle.com/technetwork/oca-405177.pdf).
+The SCA applies to any contribution that you make to any product or project
+managed by us (the **"project"**), and sets out the intellectual property rights
+you grant to us in the contributed materials. The term **"us"** shall mean
+Syllogism Co. The term **"you"** shall mean the person or entity identified
+below.
+
+## Contributor Agreement
+
+1. The term "contribution" or "contributed materials" means any source code,
+object code, patch, tool, sample, graphic, specification, manual,
+documentation, or any other material posted or submitted by you to the project.
+
+2. With respect to any worldwide copyrights, or copyright applications and
+registrations, in your contribution:
+
+    * you hereby assign to us joint ownership, and to the extent that such
+    assignment is or becomes invalid, ineffective or unenforceable, you hereby
+    grant to us a perpetual, irrevocable, non-exclusive, worldwide, no-charge,
+    royalty-free, unrestricted license to exercise all rights under those
+    copyrights. This includes, at our option, the right to sublicense these same
+    rights to third parties through multiple levels of sublicensees or other
+    licensing arrangements;
+
+    * you agree that each of us can do all things in relation to your
+    contribution as if each of us were the sole owners, and if one of us makes
+    a derivative work of your contribution, the one who makes the derivative
+    work (or has it made will be the sole owner of that derivative work;
+
+    * you agree that you will not assert any moral rights in your contribution
+    against us, our licensees or transferees;
+
+    * you agree that we may register a copyright in your contribution and
+    exercise all ownership rights associated with it; and
+
+    * you agree that neither of us has any duty to consult with, obtain the
+    consent of, pay or render an accounting to the other for any use or
+    distribution of your contribution.
+
+3. With respect to any patents you own, or that you can license without payment
+to any third party, you hereby grant to us a perpetual, irrevocable,
+non-exclusive, worldwide, no-charge, royalty-free license to:
+
+    * make, have made, use, sell, offer to sell, import, and otherwise transfer
+    your contribution in whole or in part, alone or in combination with or
+    included in any product, work or materials arising out of the project to
+    which your contribution was submitted, and
+
+    * at our option, to sublicense these same rights to third parties through
+    multiple levels of sublicensees or other licensing arrangements.
+
+4. Except as set out above, you keep all right, title, and interest in your
+contribution. The rights that you grant to us under these terms are effective
+on the date you first submitted a contribution to us, even if your submission
+took place before the date you sign these terms.
+
+5. You covenant, represent, warrant and agree that:
+
+    * Each contribution that you submit is and shall be an original work of
+    authorship and you can legally grant the rights set out in this SCA;
+
+    * to the best of your knowledge, each contribution will not violate any
+    third party's copyrights, trademarks, patents, or other intellectual
+    property rights; and
+
+    * each contribution shall be in compliance with U.S. export control laws and
+    other applicable export and import laws. You agree to notify us if you
+    become aware of any circumstance which would make any of the foregoing
+    representations inaccurate in any respect. Syllogism Co. may publicly
+    disclose your participation in the project, including the fact that you have
+    signed the SCA.
+
+6. This SCA is governed by the laws of the State of California and applicable
+U.S. Federal law. Any choice of law rules will not apply.
+
+7. Please place an “x” on one of the applicable statement below. Please do NOT
+mark both statements:
+
+    * [x] I am signing on behalf of myself as an individual and no other person
+    or entity, including my employer, has or will have rights with respect my
+    contributions.
+
+    * [ ] I am signing on behalf of my employer or a legal entity and I have the
+    actual authority to contractually bind that entity.
+
+## Contributor Details
+
+| Field                          | Entry                |
+|------------------------------- | -------------------- |
+| Name                           | Vsevolod Solovyov    |
+| Company's name (if applicable) |                      |
+| Title or Role (if applicable)  |                      |
+| Date                           | 2015-08-24           |
+| GitHub username                | vsolovyov            |
+| Website (optional)             |                      |

CONTRIBUTING.md

@@ -20,6 +20,10 @@ If you're looking for help with your code, consider posting a question on [Stack
 
 When opening an issue, use a descriptive title and include your environment (operating system, Python version, spaCy version). Our [issue template](https://github.com/explosion/spaCy/issues/new) helps you remember the most important details to include.
 
+If you've discovered a bug, you can also submit a [regression test](#fixing-bugs) straight away. When you're opening an issue to report the bug, simply refer to your pull request in the issue body.
+
+### Issue labels
+
 We use the following system to tag our issues:
 
 | Issue label | Description |
@@ -49,6 +53,11 @@ Coming soon.
 
 Coming soon.
 
+### Contributor agreement
+
+If you've made a substantial contribution to spaCy, you should fill in the [spaCy contributor agreement](.github/CONTRIBUTOR_AGREEMENT.md) to ensure that your contribution can be used across the project. If you agree to be bound by the terms of the agreement, fill in the [template]((.github/CONTRIBUTOR_AGREEMENT.md)) and include it with your pull request, or sumit it separately to [`.github/contributors/`](/.github/contributors). The name of the file should be your GitHub username, with the extension `.md`. For example, the user
+example_user would create the file `.github/contributors/example_user.md`.
+
 
 ### Fixing bugs
 

CONTRIBUTORS.md

@@ -6,6 +6,7 @@ This is a list of everyone who has made significant contributions to spaCy, in a
 * Andreas Grivas, [@andreasgrv](https://github.com/andreasgrv)
 * Chris DuBois, [@chrisdubois](https://github.com/chrisdubois)
 * Christoph Schwienheer, [@chssch](https://github.com/chssch)
+* Dmytro Sadovnychyi, [@sadovnychyi](https://github.com/sadovnychyi)
 * Henning Peters, [@henningpeters](https://github.com/henningpeters)
 * Ines Montani, [@ines](https://github.com/ines)
 * J Nicolas Schrading, [@NSchrading](https://github.com/NSchrading)
@@ -16,6 +17,7 @@ This is a list of everyone who has made significant contributions to spaCy, in a
 * Maxim Samsonov, [@maxirmx](https://github.com/maxirmx)
 * Oleg Zd, [@olegzd](https://github.com/olegzd)
 * Sam Bozek, [@sambozek](https://github.com/sambozek)
+* Tiago Rodrigues, [@TiagoMRodrigues](https://github.com/TiagoMRodrigues)
 * Vsevolod Solovyov, [@vsolovyov](https://github.com/vsolovyov)
 * Wah Loon Keng, [@kengz](https://github.com/kengz)
 * Wolfgang Seeker, [@wbwseeker](https://github.com/wbwseeker)

spacy/matcher.pyx

@@ -492,7 +492,7 @@ cdef class PhraseMatcher:
         abstract_patterns = []
         for length in range(1, max_length):
             abstract_patterns.append([{tag: True} for tag in get_bilou(length)])
-        self.matcher.add('Candidate', 'MWE', {}, abstract_patterns)
+        self.matcher.add('Candidate', 'MWE', {}, abstract_patterns, acceptor=self.accept_match)
 
     def add(self, Doc tokens):
         cdef int length = tokens.length
@@ -512,7 +512,7 @@ cdef class PhraseMatcher:
 
     def __call__(self, Doc doc):
         matches = []
-        for label, start, end in self.matcher(doc, acceptor=self.accept_match):
+        for ent_id, label, start, end in self.matcher(doc):
             cand = doc[start : end]
             start = cand[0].idx
             end = cand[-1].idx + len(cand[-1])
@@ -526,7 +526,7 @@ cdef class PhraseMatcher:
             self(doc)
             yield doc
 
-    def accept_match(self, Doc doc, int label, int start, int end):
+    def accept_match(self, Doc doc, int ent_id, int label, int start, int end):
         assert (end - start) < self.max_length
         cdef int i, j
         for i in range(self.max_length):
@@ -535,6 +535,6 @@ cdef class PhraseMatcher:
             self._phrase_key[i] = doc.c[j].lex.orth
         cdef hash_t key = hash64(self._phrase_key, self.max_length * sizeof(attr_t), 0)
         if self.phrase_ids.get(key):
-            return True
+            return (ent_id, label, start, end)
         else:
             return False

spacy/tests/spans/test_merge.py

@@ -52,6 +52,13 @@ def test_np_merges(EN):
         merged = tokens.merge(start, end, label, lemma, label)
         assert merged != None, (start, end, label, lemma) 
 
+
+    tokens = EN(u'One test with entities like New York City so the ents list is not void')
+
+    for span in tokens.ents:
+        merged = span.merge()
+        assert merged != None, (span.start, span.end, span.label_, span.lemma_) 
+
 @pytest.mark.models
 def test_entity_merge(EN):
     tokens = EN(u'Stewart Lee is a stand up comedian who lives in England and loves Joe Pasquale.\n')

spacy/tests/test_matcher.py

@@ -87,6 +87,13 @@ def test_match_zero_plus(matcher):
     assert len(matcher(doc)) == 1
 
 
+def test_phrase_matcher():
+    vocab = Vocab(lex_attr_getters=English.Defaults.lex_attr_getters)
+    matcher = PhraseMatcher(vocab, [Doc(vocab, words='Google Now'.split())])
+    doc = Doc(vocab, words=['I', 'like', 'Google', 'Now', 'best'])
+    assert len(matcher(doc)) == 1
+
+
 #@pytest.mark.models
 #def test_match_preserved(EN):
 #    patterns = {

spacy/tokens/span.pyx

@@ -99,7 +99,7 @@ cdef class Span:
             token (Token):
                 The newly merged token.
         """
-        self.doc.merge(self.start_char, self.end_char, *args, **attributes)
+        return self.doc.merge(self.start_char, self.end_char, *args, **attributes)
 
     def similarity(self, other):
         '''Make a semantic similarity estimate. The default estimate is cosine

website/_data.json

@@ -25,7 +25,7 @@
         ]
     },
 
-    "robots": {
+    "robots.txt": {
         "layout": false
     },
 

website/_harp.json

@@ -11,7 +11,12 @@
         "COMPANY": "Explosion AI",
         "COMPANY_URL": "https://explosion.ai",
         "DEMOS_URL": "https://demos.explosion.ai",
+
         "SPACY_VERSION": "1.2",
+        "LATEST_NEWS": {
+            "url": "https://explosion.ai/blog/spacy-user-survey",
+            "title": "The results of the spaCy user survey"
+        },
 
         "SOCIAL": {
             "twitter": "spacy_io",
@@ -47,7 +52,7 @@
             }
         },
 
-        "V_CSS": "1.8",
+        "V_CSS": "1.9",
         "V_JS": "1.0",
         "DEFAULT_SYNTAX" : "python",
         "ANALYTICS": "UA-58931649-1",

website/_includes/_footer.jade

@@ -11,7 +11,7 @@ footer.o-footer.u-text.u-border-dotted
 
                     each url, item in group
                         li
-                            +a(url)(target=url.includes("http") ? "_blank" : "")=item
+                            +a(url)(target=url.includes("http") ? "_blank" : false)=item
 
         if SECTION != "docs"
             +grid-col("quarter")

website/_includes/_mixins.jade

@@ -20,7 +20,7 @@ mixin h(level, id)
               info: https://mathiasbynens.github.io/rel-noopener/
 
 mixin a(url, trusted)
-    a(href=url target="_blank" rel=(!trusted) ? "noopener nofollow" : "")&attributes(attributes)
+    a(href=url target="_blank" rel=!trusted ? "noopener nofollow" : false)&attributes(attributes)
         block
 
 //- Source link (with added icon for "code")
@@ -72,7 +72,7 @@ mixin aside-code(label, language)
                see assets/css/_components/_buttons.sass
 
 mixin button(url, trusted, ...style)
-    a.c-button.u-text-label(href=url class=prefixArgs(style, "c-button") role="button" target="_blank" rel=(!trusted) ? "noopener nofollow" : "")&attributes(attributes)
+    a.c-button.u-text-label(href=url class=prefixArgs(style, "c-button") role="button" target="_blank" rel=!trusted ? "noopener nofollow" : false)&attributes(attributes)
         block
 
 
@@ -133,7 +133,7 @@ mixin tag()
 
 mixin list(type, start)
     if type
-        ol.c-list.o-block.u-text(class="c-list--#{type}" style=(start === 0 || start) ? "counter-reset: li #{(start - 1)}" : "")&attributes(attributes)
+        ol.c-list.o-block.u-text(class="c-list--#{type}" style=(start === 0 || start) ? "counter-reset: li #{(start - 1)}" : false)&attributes(attributes)
             block
 
     else

website/_includes/_navigation.jade

@@ -2,7 +2,7 @@
 
 include _mixins
 
-nav.c-nav.u-text.js-nav(class=landing ? "c-nav--theme" : "")
+nav.c-nav.u-text.js-nav(class=landing ? "c-nav--theme" : false)
     a(href='/') #[+logo]
 
     if SUBSECTION != "index"
@@ -11,7 +11,7 @@ nav.c-nav.u-text.js-nav(class=landing ? "c-nav--theme" : "")
     ul.c-nav__menu
         each url, item in NAVIGATION
             li.c-nav__menu__item
-                a(href=url target=url.includes("http") ? "_blank" : "")=item
+                a(href=url target=url.includes("http") ? "_blank" : false)=item
 
         li.c-nav__menu__item
             +a(gh("spaCy"))(aria-label="GitHub").u-hidden-xs #[+icon("github", 20)]

website/_includes/_sidebar.jade

@@ -9,5 +9,5 @@ menu.c-sidebar.js-sidebar.u-text
                 li.u-text-label.u-color-subtle=menu
 
                 each url, item in items
-                    li(class=(CURRENT == url || (CURRENT == "index" && url == "./")) ? "is-active" : "")
+                    li(class=(CURRENT == url || (CURRENT == "index" && url == "./")) ? "is-active" : false)
-                        +a(url)(target=url.includes("http") ? "_blank" : "")=item
+                        +a(url)(target=url.includes("http") ? "_blank" : false)=item

website/assets/css/_base/_utilities.sass

@@ -39,6 +39,7 @@
 
     &.u-text-tag--spaced
         margin-left: 0.75em
+        margin-right: 0.5em
 
 
 //- Headings

website/docs/usage/_data.json

@@ -84,6 +84,11 @@
                 "author": "Wah Loon Keng",
                 "description": "Expose spaCy NLP text parsing to Node.js (and other languages) via Socket.IO."
             },
+            "spacy-api-docker": {
+                "url": "https://github.com/jgontrum/spacy-api-docker",
+                "author": "Johannes Gontrum",
+                "description": "spaCy accessed by a REST API, wrapped in a Docker container."
+            },
             "textacy": {
                 "url": "https://github.com/chartbeat-labs/textacy",
                 "author": " Burton DeWilde (Chartbeat)",

website/docs/usage/dependency-parse.jade

@@ -28,9 +28,10 @@ p
 
 p
     |  The best way to understand spaCy's dependency parser is interactively,
-    |  through the displacy visualizer. If you want to know how to write rules
+    |  through the #[+a(DEMOS_URL + "/displacy", true) displaCy visualizer]. If
-    |  that hook into some type of syntactic construction, just plug the
+    |  you want to know how to write rules that hook into some type of syntactic
-    |  sentence into the visualizer and see how spaCy annotates it.
+    |  construction, just plug the sentence into the visualizer and see how
+    |  spaCy annotates it.
 
 +h(2, "navigating") Navigating the parse tree
 

website/docs/usage/index.jade

@@ -69,6 +69,11 @@ p
     |  including the so-called "Command Line Tools". macOS and OS X ship with
     |  Python and git preinstalled.
 
+p
+    |  To compile spaCy with multi-threading support on macOS / OS X,
+    |  #[+a("https://github.com/explosion/spaCy/issues/267") see here].
+
+
 +h(3, "source-windows") Windows
 
 p

website/index.jade

@@ -59,6 +59,9 @@ include _includes/_mixins
         strong.u-text-label.u-color-subtle #[+icon("code", 18)] Latest release:
         |  v#{SPACY_VERSION}
 
+    if LATEST_NEWS
+        +a(LATEST_NEWS.url) #[+tag.o-icon New!] #{LATEST_NEWS.title}
+
 .o-content
     +grid
         +grid-col("two-thirds")