From 1a2c2f7d7f50ae499e435142f2b254c317bb4000 Mon Sep 17 00:00:00 2001 From: Adam Binford Date: Mon, 29 Jan 2018 14:25:21 -0500 Subject: [PATCH 1/2] Fixed auto linking after download and added simple test to check --- .github/contributors/Kimahriman.md | 106 +++++++++++++++++++++++ spacy/cli/download.py | 2 +- spacy/tests/regression/test_issue1904.py | 8 ++ 3 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 .github/contributors/Kimahriman.md create mode 100644 spacy/tests/regression/test_issue1904.py diff --git a/.github/contributors/Kimahriman.md b/.github/contributors/Kimahriman.md new file mode 100644 index 000000000..19744e7bd --- /dev/null +++ b/.github/contributors/Kimahriman.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: + + * [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 | Adam Binford | +| Company name (if applicable) | | +| Title or role (if applicable) | | +| Date | 1/29/2018 | +| GitHub username | Kimahriman | +| Website (optional) | | diff --git a/spacy/cli/download.py b/spacy/cli/download.py index 16eeeb638..656635f79 100644 --- a/spacy/cli/download.py +++ b/spacy/cli/download.py @@ -41,7 +41,7 @@ def download(model, direct=False): # package, which fails if model was just installed via # subprocess package_path = get_package_path(model_name) - link(None, model_name, model, force=True, + link(model_name, model, force=True, model_path=package_path) except: # Dirty, but since spacy.download and the auto-linking is diff --git a/spacy/tests/regression/test_issue1904.py b/spacy/tests/regression/test_issue1904.py new file mode 100644 index 000000000..9f0d1df37 --- /dev/null +++ b/spacy/tests/regression/test_issue1904.py @@ -0,0 +1,8 @@ +from __future__ import unicode_literals + +from ... cli import download + +def test_issue1904(capsys): + download('en') + out, err = capsys.readouterr() + assert "Linking successful" in out \ No newline at end of file From 9238749aaf4d84c2dcf1a66d611ed30ba8468c7a Mon Sep 17 00:00:00 2001 From: Adam Binford Date: Mon, 29 Jan 2018 14:48:20 -0500 Subject: [PATCH 2/2] Removed test to avoid network requests --- spacy/tests/regression/test_issue1904.py | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 spacy/tests/regression/test_issue1904.py diff --git a/spacy/tests/regression/test_issue1904.py b/spacy/tests/regression/test_issue1904.py deleted file mode 100644 index 9f0d1df37..000000000 --- a/spacy/tests/regression/test_issue1904.py +++ /dev/null @@ -1,8 +0,0 @@ -from __future__ import unicode_literals - -from ... cli import download - -def test_issue1904(capsys): - download('en') - out, err = capsys.readouterr() - assert "Linking successful" in out \ No newline at end of file