Merge branch 'master' into develop

This commit is contained in:
ines 2017-03-29 10:37:13 +02:00
commit 4759fd437d
5 changed files with 8 additions and 3 deletions

View File

@ -40,6 +40,7 @@ open-source software, released under the MIT license.
=================== === =================== ===
`Usage Workflows`_ How to use spaCy and its features. `Usage Workflows`_ How to use spaCy and its features.
`API Reference`_ The detailed reference for spaCy's API. `API Reference`_ The detailed reference for spaCy's API.
`Troubleshooting`_ Common problems and solutions for beginners.
`Tutorials`_ End-to-end examples, with code you can modify and run. `Tutorials`_ End-to-end examples, with code you can modify and run.
`Showcase & Demos`_ Demos, libraries and products from the spaCy community. `Showcase & Demos`_ Demos, libraries and products from the spaCy community.
`Contribute`_ How to contribute to the spaCy project and code base. `Contribute`_ How to contribute to the spaCy project and code base.
@ -47,6 +48,7 @@ open-source software, released under the MIT license.
.. _Usage Workflows: https://spacy.io/docs/usage/ .. _Usage Workflows: https://spacy.io/docs/usage/
.. _API Reference: https://spacy.io/docs/api/ .. _API Reference: https://spacy.io/docs/api/
.. _Troubleshooting: https://spacy.io/docs/usage/troubleshooting
.. _Tutorials: https://spacy.io/docs/usage/tutorials .. _Tutorials: https://spacy.io/docs/usage/tutorials
.. _Showcase & Demos: https://spacy.io/docs/usage/showcase .. _Showcase & Demos: https://spacy.io/docs/usage/showcase
.. _Contribute: https://github.com/explosion/spaCy/blob/master/CONTRIBUTING.md .. _Contribute: https://github.com/explosion/spaCy/blob/master/CONTRIBUTING.md
@ -100,7 +102,7 @@ Supports
==================== === ==================== ===
**Operating system** macOS / OS X, Linux, Windows (Cygwin, MinGW, Visual Studio) **Operating system** macOS / OS X, Linux, Windows (Cygwin, MinGW, Visual Studio)
**Python version** CPython 2.6, 2.7, 3.3, 3.4, 3.5. Only 64 bit. **Python version** CPython 2.6, 2.7, 3.3+. Only 64 bit.
**Package managers** `pip`_ (source packages only), `conda`_ (via ``conda-forge``) **Package managers** `pip`_ (source packages only), `conda`_ (via ``conda-forge``)
==================== === ==================== ===

View File

@ -35,6 +35,7 @@ PACKAGES = [
'spacy.sv', 'spacy.sv',
'spacy.fi', 'spacy.fi',
'spacy.bn', 'spacy.bn',
'spacy.he',
'spacy.en.lemmatizer', 'spacy.en.lemmatizer',
'spacy.language_data', 'spacy.language_data',
'spacy.serialize', 'spacy.serialize',

View File

@ -19,6 +19,7 @@ from . import nl
from . import sv from . import sv
from . import fi from . import fi
from . import bn from . import bn
from . import he
from .about import * from .about import *
@ -35,6 +36,7 @@ set_lang_class(nl.Dutch.lang, nl.Dutch)
set_lang_class(sv.Swedish.lang, sv.Swedish) set_lang_class(sv.Swedish.lang, sv.Swedish)
set_lang_class(fi.Finnish.lang, fi.Finnish) set_lang_class(fi.Finnish.lang, fi.Finnish)
set_lang_class(bn.Bengali.lang, bn.Bengali) set_lang_class(bn.Bengali.lang, bn.Bengali)
set_lang_class(he.Hebrew.lang, he.Hebrew)
def load(name, **overrides): def load(name, **overrides):

View File

@ -58,7 +58,7 @@ def create_dirs(package_path, force):
def create_file(file_path, contents): def create_file(file_path, contents):
file_path.touch() file_path.touch()
file_path.open('w').write(contents, encoding='utf-8') file_path.open('w', encoding='utf-8').write(contents)
def generate_meta(): def generate_meta():

View File

@ -147,7 +147,7 @@ p
+cell Visual Studio 2010 +cell Visual Studio 2010
+row +row
+cell Python 3.5 +cell Python 3.5+
+cell Visual Studio 2015 +cell Visual Studio 2015
+h(2, "tests") Run tests +h(2, "tests") Run tests