From 1987f3f784ca3f701868a402069a773dd7a4f352 Mon Sep 17 00:00:00 2001 From: Paul O'Leary McCann Date: Fri, 13 Jul 2018 17:55:14 +0900 Subject: [PATCH 1/4] Add Japanese lemmas (#2543) This info was already available from Mecab, forgot to add it before. --- spacy/lang/ja/__init__.py | 1 + spacy/tests/conftest.py | 7 ++++++- spacy/tests/lang/ja/test_lemma.py | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 spacy/tests/lang/ja/test_lemma.py diff --git a/spacy/lang/ja/__init__.py b/spacy/lang/ja/__init__.py index 08b9de758..b8553559a 100644 --- a/spacy/lang/ja/__init__.py +++ b/spacy/lang/ja/__init__.py @@ -82,6 +82,7 @@ class JapaneseTokenizer(object): for token, dtoken in zip(doc, dtokens): token._.mecab_tag = dtoken.pos token.tag_ = resolve_pos(dtoken) + token.lemma_ = dtoken.lemma return doc # add dummy methods for to_bytes, from_bytes, to_disk and from_disk to diff --git a/spacy/tests/conftest.py b/spacy/tests/conftest.py index b4dff4d22..ce2618970 100644 --- a/spacy/tests/conftest.py +++ b/spacy/tests/conftest.py @@ -49,6 +49,11 @@ def RU(request): pymorphy = pytest.importorskip('pymorphy2') return util.get_lang_class('ru')() +@pytest.fixture() +def JA(request): + mecab = pytest.importorskip("MeCab") + return util.get_lang_class('ja')() + #@pytest.fixture(params=_languages) #def tokenizer(request): @@ -142,7 +147,7 @@ def da_tokenizer(): @pytest.fixture def ja_tokenizer(): - janome = pytest.importorskip("MeCab") + mecab = pytest.importorskip("MeCab") return util.get_lang_class('ja').Defaults.create_tokenizer() @pytest.fixture diff --git a/spacy/tests/lang/ja/test_lemma.py b/spacy/tests/lang/ja/test_lemma.py new file mode 100644 index 000000000..9730b8b78 --- /dev/null +++ b/spacy/tests/lang/ja/test_lemma.py @@ -0,0 +1,18 @@ +# coding: utf-8 +from __future__ import unicode_literals + +import pytest + +LEMMAS = ( + ('新しく', '新しい'), + ('赤く', '赤い'), + ('すごく', '凄い'), + ('いただきました', '頂く'), + ('なった', '成る')) + +@pytest.mark.parametrize('word,lemma', LEMMAS) +def test_japanese_lemmas(JA, word, lemma): + test_lemma = JA(word)[0].lemma_ + assert test_lemma == lemma + + From f35980f86521b14febb2a39fc662e0dcbbb8ef46 Mon Sep 17 00:00:00 2001 From: Tero K Date: Sun, 15 Jul 2018 10:50:27 +0300 Subject: [PATCH 2/4] Enhancement/lang fi examples (#2547) * Added a file with examples in finnish * added contributor agreement --- .github/contributors/tjkemp.md | 106 +++++++++++++++++++++++++++++++++ spacy/lang/fi/examples.py | 21 +++++++ 2 files changed, 127 insertions(+) create mode 100644 .github/contributors/tjkemp.md create mode 100644 spacy/lang/fi/examples.py diff --git a/.github/contributors/tjkemp.md b/.github/contributors/tjkemp.md new file mode 100644 index 000000000..669da94f6 --- /dev/null +++ b/.github/contributors/tjkemp.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 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 | Tero Kemppi | +| Company name (if applicable) | | +| Title or role (if applicable) | | +| Date | 14-07-2018 | +| GitHub username | tjkemp | +| Website (optional) | | diff --git a/spacy/lang/fi/examples.py b/spacy/lang/fi/examples.py new file mode 100644 index 000000000..3bc18517e --- /dev/null +++ b/spacy/lang/fi/examples.py @@ -0,0 +1,21 @@ +# coding: utf8 +from __future__ import unicode_literals + + +""" +Example sentences to test spaCy and its language models. + +>>> from spacy.lang.fi.examples import sentences +>>> docs = nlp.pipe(sentences) +""" + + +sentences = [ + "Itseajavat autot siirtävät vakuutusvastuun autojen valmistajille", + "San Francisco harkitsee toimitusrobottien liikkumisen kieltämistä jalkakäytävillä", + "Lontoo on suuri kaupunki Yhdistyneessä Kuningaskunnassa.", + "Missä sinä olet?", + "Mikä on Yhdysvaltojen pääkaupunki?", + "Kuka on Suomen presidentti?", + "Milloin Sauli Niinistö on syntynyt?" +] From 61ef0739b8cede7bf87076f41fa1a2395ff52da2 Mon Sep 17 00:00:00 2001 From: Paul O'Leary McCann Date: Tue, 17 Jul 2018 17:12:48 +0900 Subject: [PATCH 3/4] Add Japanese stop words. (#2549) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List created by taking the 2000 top words from a Wikipedia dump and removing everything that wasn't hiragana. Tried going through kanji words and deciding what to keep but there were too many obvious non-stopwords (東京 was in the top 500) and many other words where it wasn't clear if they should be included or not. --- spacy/lang/ja/stop_words.py | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 spacy/lang/ja/stop_words.py diff --git a/spacy/lang/ja/stop_words.py b/spacy/lang/ja/stop_words.py new file mode 100644 index 000000000..a3df4f6ac --- /dev/null +++ b/spacy/lang/ja/stop_words.py @@ -0,0 +1,49 @@ +# coding: utf8 +from __future__ import unicode_literals + +# This list was created by taking the top 2000 words from a Wikipedia dump and +# filtering out everything that wasn't hiragana. ー (one) was also added. +# Considered keeping some non-hiragana words but too many place names were +# present. +STOP_WORDS = set(""" +あ あっ あまり あり ある あるいは あれ +い いい いう いく いずれ いっ いつ いる いわ +うち +え +お おい おけ および おら おり +か かけ かつ かつて かなり から が +き きっかけ +くる くん +こ こう ここ こと この これ ご ごと +さ さらに さん +し しか しかし しまう しまっ しよう +す すぐ すべて する ず +せ せい せる +そう そこ そして その それ それぞれ +た たい ただし たち ため たら たり だ だけ だっ +ち ちゃん +つ つい つけ つつ +て で でき できる です +と とき ところ とっ とも どう +な ない なお なかっ ながら なく なけれ なし なっ など なら なり なる +に にて +ぬ +ね +の のち のみ +は はじめ ば +ひと +ぶり +へ べき +ほか ほとんど ほど ほぼ +ま ます また まで まま +み +も もう もっ もと もの +や やっ +よ よう よく よっ より よる よれ +ら らしい られ られる +る +れ れる +を +ん +一 +""".split()) From 19a5ef1c58b1344bbda7ff6589951906f4ead721 Mon Sep 17 00:00:00 2001 From: Xiang Ji Date: Wed, 18 Jul 2018 10:31:24 +0200 Subject: [PATCH 4/4] Fix venv command examples (#2560) [ci skip] * Fix venv command examples The documentation refers to `venv`, which is native to Python3. However, the command examples are as if they were still `virtualenv`, which is a package independent of `venv`: - It doesn't need to be installed via `pip`. In fact `pip install venv` would return an error. - The correct way to invoke `venv` is `python3 -m venv`, not `venv`, which would return command not found. See https://docs.python.org/3/library/venv.html I suspect the documentation simply replaced all occurrences of `virtualenv` with `venv`. However they are different modules and are used differently. * Update comment [ci skip] --- .github/contributors/x-ji.md | 106 ++++++++++++++++++++++ CONTRIBUTING.md | 4 +- README.rst | 8 +- website/usage/_install/_instructions.jade | 6 +- website/usage/_install/_quickstart.jade | 2 +- 5 files changed, 116 insertions(+), 10 deletions(-) create mode 100644 .github/contributors/x-ji.md diff --git a/.github/contributors/x-ji.md b/.github/contributors/x-ji.md new file mode 100644 index 000000000..14dd9641f --- /dev/null +++ b/.github/contributors/x-ji.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 | Xiang Ji | +| Company name (if applicable) | | +| Title or role (if applicable) | | +| Date | 07 July 2018 | +| GitHub username | x-ji | +| Website (optional) | | diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6f5890cde..d7fab9c0b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -138,11 +138,11 @@ files, a compiler, [pip](https://pip.pypa.io/en/latest/installing/), [git](https://git-scm.com) installed. The compiler is usually the trickiest part. ``` -python -m pip install -U pip venv +python -m pip install -U pip git clone https://github.com/explosion/spaCy cd spaCy -venv .env +python -m venv .env source .env/bin/activate export PYTHONPATH=`pwd` pip install -r requirements.txt diff --git a/README.rst b/README.rst index 98c880a04..eadf1f018 100644 --- a/README.rst +++ b/README.rst @@ -133,7 +133,7 @@ environment to avoid modifying system state: .. code:: bash - venv .env + python -m venv .env source .env/bin/activate pip install spacy @@ -255,12 +255,12 @@ details. .. code:: bash - # make sure you are using recent pip/virtualenv versions - python -m pip install -U pip venv + # make sure you are using the latest pip + python -m pip install -U pip git clone https://github.com/explosion/spaCy cd spaCy - venv .env + python -m venv .env source .env/bin/activate export PYTHONPATH=`pwd` pip install -r requirements.txt diff --git a/website/usage/_install/_instructions.jade b/website/usage/_install/_instructions.jade index 677c9d176..b738b99c6 100644 --- a/website/usage/_install/_instructions.jade +++ b/website/usage/_install/_instructions.jade @@ -23,7 +23,7 @@ p | virtual environment to avoid modifying system state: +code(false, "bash"). - venv .env + python -m venv .env source .env/bin/activate pip install spacy @@ -121,11 +121,11 @@ p | #[a(href="#source-windows") Windows] for details. +code(false, "bash"). - python -m pip install -U pip venv # update pip & virtualenv + python -m pip install -U pip # update pip git clone #{gh("spaCy")} # clone spaCy cd spaCy # navigate into directory - venv .env # create environment in .env + python -m venv .env # create environment in .env source .env/bin/activate # activate virtual environment export PYTHONPATH=`pwd` # set Python path to spaCy directory pip install -r requirements.txt # install all requirements diff --git a/website/usage/_install/_quickstart.jade b/website/usage/_install/_quickstart.jade index 976e7d4ad..ceab484d5 100644 --- a/website/usage/_install/_quickstart.jade +++ b/website/usage/_install/_quickstart.jade @@ -6,7 +6,7 @@ +qs({config: 'venv', python: 2}) python -m pip install -U virtualenv +qs({config: 'venv', python: 3}) python -m pip install -U venv +qs({config: 'venv', python: 2}) virtualenv .env - +qs({config: 'venv', python: 3}) venv .env + +qs({config: 'venv', python: 3}) python -m venv .env +qs({config: 'venv', os: 'mac'}) source .env/bin/activate +qs({config: 'venv', os: 'linux'}) source .env/bin/activate +qs({config: 'venv', os: 'windows'}) .env\Scripts\activate