From b02db6724797c8bca5958d10e2c1aa4a96030ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Wed, 1 Jul 2020 20:20:04 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=E2=9E=95=20Add=20shellingham=20for=20autom?= =?UTF-8?q?atic=20shell=20detection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and update Typer pinning --- requirements.txt | 3 ++- setup.cfg | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index e67f481fb..e76bd376d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,8 @@ murmurhash>=0.28.0,<1.1.0 wasabi>=0.7.0,<1.1.0 srsly>=2.1.0,<3.0.0 catalogue>=0.0.7,<1.1.0 -typer>=0.3.0,<1.0.0 +typer>=0.3.0,<0.4.0 +shellingham>=1.3.0,<1.4.0 # Third party dependencies numpy>=1.15.0 requests>=2.13.0,<3.0.0 diff --git a/setup.cfg b/setup.cfg index 09f43247f..2a44a51fb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,7 +47,8 @@ install_requires = wasabi>=0.7.0,<1.1.0 srsly>=2.1.0,<3.0.0 catalogue>=0.0.7,<1.1.0 - typer>=0.3.0,<1.0.0 + typer>=0.3.0,<0.4.0 + shellingham>=1.3.0,<1.4.0 # Third-party dependencies tqdm>=4.38.0,<5.0.0 numpy>=1.15.0 From 764499246e6fa1e26ae5f5b740438d1f74d5de3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Wed, 1 Jul 2020 20:21:05 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=94=A7=20Update=20spacy=20CLI=20scrip?= =?UTF-8?q?t=20entrypoint=20to=20support=20completion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/spacy | 2 -- setup.cfg | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 bin/spacy diff --git a/bin/spacy b/bin/spacy deleted file mode 100644 index 11359669c..000000000 --- a/bin/spacy +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -python -m spacy "$@" diff --git a/setup.cfg b/setup.cfg index 2a44a51fb..ac63992c1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,8 +25,6 @@ classifiers = [options] zip_safe = false include_package_data = true -scripts = - bin/spacy python_requires = >=3.6 setup_requires = wheel @@ -59,6 +57,10 @@ install_requires = packaging importlib_metadata>=0.20; python_version < "3.8" +[options.entry_points] +console_scripts = + spacy = spacy.cli:app + [options.extras_require] lookups = spacy_lookups_data>=0.3.2,<0.4.0 From b985cc402565f236c060fad87b0221bce1d07d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Wed, 1 Jul 2020 20:57:21 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=93=84=20Add=20spaCy=20Contributor=20?= =?UTF-8?q?Agreement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/contributors/tiangolo.md | 106 +++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 .github/contributors/tiangolo.md diff --git a/.github/contributors/tiangolo.md b/.github/contributors/tiangolo.md new file mode 100644 index 000000000..5fd253fe9 --- /dev/null +++ b/.github/contributors/tiangolo.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: + + * [ ] 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 | Sebastián Ramírez | +| Company name (if applicable) | | +| Title or role (if applicable) | | +| Date | 2020-07-01 | +| GitHub username | tiangolo | +| Website (optional) | | From b0f425971eebef7974f73400409a1650a1437dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Wed, 1 Jul 2020 21:47:50 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=E2=9E=96=20Remove=20shellingham=20from=20d?= =?UTF-8?q?ependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 1 - setup.cfg | 1 - 2 files changed, 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index e76bd376d..763ae79c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,6 @@ wasabi>=0.7.0,<1.1.0 srsly>=2.1.0,<3.0.0 catalogue>=0.0.7,<1.1.0 typer>=0.3.0,<0.4.0 -shellingham>=1.3.0,<1.4.0 # Third party dependencies numpy>=1.15.0 requests>=2.13.0,<3.0.0 diff --git a/setup.cfg b/setup.cfg index ac63992c1..3f1d16ab9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -46,7 +46,6 @@ install_requires = srsly>=2.1.0,<3.0.0 catalogue>=0.0.7,<1.1.0 typer>=0.3.0,<0.4.0 - shellingham>=1.3.0,<1.4.0 # Third-party dependencies tqdm>=4.38.0,<5.0.0 numpy>=1.15.0