From f2547f02d64a83fbb30854c2a237fc5aeb8ef0e9 Mon Sep 17 00:00:00 2001 From: Bharat123Rox Date: Wed, 20 Mar 2019 07:43:19 +0530 Subject: [PATCH] Made changes suggested by @ines --- .github/CONTRIBUTOR_AGREEMENT.md | 8 +- .github/contributors/Bharat123rox.md | 106 +++++++++++++++++++++++++++ spacy/__init__.py | 9 +-- spacy/errors.py | 4 + 4 files changed, 117 insertions(+), 10 deletions(-) create mode 100644 .github/contributors/Bharat123rox.md diff --git a/.github/CONTRIBUTOR_AGREEMENT.md b/.github/CONTRIBUTOR_AGREEMENT.md index 5e2ad915b..da9f244eb 100644 --- a/.github/CONTRIBUTOR_AGREEMENT.md +++ b/.github/CONTRIBUTOR_AGREEMENT.md @@ -87,7 +87,7 @@ 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 + * [ ] 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 to my contributions. @@ -98,9 +98,9 @@ mark both statements: | Field | Entry | |------------------------------- | -------------------- | -| Name | Bharat Raghunathan | +| Name | | | Company name (if applicable) | | | Title or role (if applicable) | | -| Date | 19 - 03 - 2019 | -| GitHub username | Bharat123rox | +| Date | | +| GitHub username | | | Website (optional) | | diff --git a/.github/contributors/Bharat123rox.md b/.github/contributors/Bharat123rox.md new file mode 100644 index 000000000..5e2ad915b --- /dev/null +++ b/.github/contributors/Bharat123rox.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 GmbH](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: + + * [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 to 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 | Bharat Raghunathan | +| Company name (if applicable) | | +| Title or role (if applicable) | | +| Date | 19 - 03 - 2019 | +| GitHub username | Bharat123rox | +| Website (optional) | | diff --git a/spacy/__init__.py b/spacy/__init__.py index 726283e01..81604c4c2 100644 --- a/spacy/__init__.py +++ b/spacy/__init__.py @@ -12,14 +12,11 @@ from thinc.neural.util import prefer_gpu, require_gpu from .cli.info import info as cli_info from .glossary import explain from .about import __version__ -from .errors import Warnings, deprecation_warning +from .errors import Errors, Warnings, deprecation_warning from . import util -if __version__ >= '2.1.0' and sys.maxunicode <= 65535: - raise ValueError('''You are running a narrow unicode build, - which is incompatible with spacy >= 2.1.0, reinstall Python and use a - wide unicode build instead. You can also rebuild Python and - set the --enable-unicode=ucs4 flag.''') +if sys.maxunicode == 65535: + raise SystemError(Errors.E130) def load(name, **overrides): diff --git a/spacy/errors.py b/spacy/errors.py index 1fca7060b..82f17fea8 100644 --- a/spacy/errors.py +++ b/spacy/errors.py @@ -367,6 +367,10 @@ class Errors(object): "Instead, create a new Span object and specify the `label` keyword argument, " "for example:\nfrom spacy.tokens import Span\n" "span = Span(doc, start={start}, end={end}, label='{label}')") + E130 = ("You are running a narrow unicode build, " + "which is incompatible with spacy >= 2.1.0, reinstall Python and " + "use a wide unicode build instead. You can also rebuild Python " + "and set the --enable-unicode=ucs4 flag.") @add_codes