Merge branch 'develop' of https://github.com/explosion/spaCy into develop

This commit is contained in:
Matthew Honnibal 2017-11-07 13:20:29 +01:00
commit bf1ec2965f
4 changed files with 7 additions and 6 deletions

View File

@ -7,7 +7,8 @@ This is a list of everyone who has made significant contributions to spaCy, in a
* Alexis Eidelman, [@AlexisEidelman](https://github.com/AlexisEidelman) * Alexis Eidelman, [@AlexisEidelman](https://github.com/AlexisEidelman)
* Andreas Grivas, [@andreasgrv](https://github.com/andreasgrv) * Andreas Grivas, [@andreasgrv](https://github.com/andreasgrv)
* Andrew Poliakov, [@pavlin99th](https://github.com/pavlin99th) * Andrew Poliakov, [@pavlin99th](https://github.com/pavlin99th)
* Aniruddha Adhikary [@aniruddha-adhikary](https://github.com/aniruddha-adhikary) * Aniruddha Adhikary, [@aniruddha-adhikary](https://github.com/aniruddha-adhikary)
* Anto Binish Kaspar, [@binishkaspar](https://github.com/binishkaspar)
* Ben Eyal, [@beneyal](https://github.com/beneyal) * Ben Eyal, [@beneyal](https://github.com/beneyal)
* Bhargav Srinivasa, [@bhargavvader](https://github.com/bhargavvader) * Bhargav Srinivasa, [@bhargavvader](https://github.com/bhargavvader)
* Bruno P. Kinoshita, [@kinow](https://github.com/kinow) * Bruno P. Kinoshita, [@kinow](https://github.com/kinow)
@ -47,6 +48,7 @@ This is a list of everyone who has made significant contributions to spaCy, in a
* Orion Montoya, [@mdcclv](https://github.com/mdcclv) * Orion Montoya, [@mdcclv](https://github.com/mdcclv)
* Paul O'Leary McCann, [@polm](https://github.com/polm) * Paul O'Leary McCann, [@polm](https://github.com/polm)
* Pokey Rule, [@pokey](https://github.com/pokey) * Pokey Rule, [@pokey](https://github.com/pokey)
* Ramanan Balakrishnan, [@ramananbalakrishnan](https://github.com/ramananbalakrishnan)
* Raphaël Bournhonesque, [@raphael0202](https://github.com/raphael0202) * Raphaël Bournhonesque, [@raphael0202](https://github.com/raphael0202)
* Rob van Nieuwpoort, [@RvanNieuwpoort](https://github.com/RvanNieuwpoort) * Rob van Nieuwpoort, [@RvanNieuwpoort](https://github.com/RvanNieuwpoort)
* Roman Inflianskas, [@rominf](https://github.com/rominf) * Roman Inflianskas, [@rominf](https://github.com/rominf)

View File

@ -2,14 +2,14 @@
# https://python-packaging-user-guide.readthedocs.org/en/latest/single_source_version/ # https://python-packaging-user-guide.readthedocs.org/en/latest/single_source_version/
# https://github.com/pypa/warehouse/blob/master/warehouse/__about__.py # https://github.com/pypa/warehouse/blob/master/warehouse/__about__.py
__title__ = 'spacy-nightly' __title__ = 'spacy'
__version__ = '2.0.0rc1' __version__ = '2.0.0'
__summary__ = 'Industrial-strength Natural Language Processing (NLP) with Python and Cython' __summary__ = 'Industrial-strength Natural Language Processing (NLP) with Python and Cython'
__uri__ = 'https://spacy.io' __uri__ = 'https://spacy.io'
__author__ = 'Explosion AI' __author__ = 'Explosion AI'
__email__ = 'contact@explosion.ai' __email__ = 'contact@explosion.ai'
__license__ = 'MIT' __license__ = 'MIT'
__release__ = True __release__ = False
__docs_models__ = 'https://spacy.io/usage/models' __docs_models__ = 'https://spacy.io/usage/models'
__download_url__ = 'https://github.com/explosion/spacy-models/releases/download' __download_url__ = 'https://github.com/explosion/spacy-models/releases/download'

View File

@ -14,7 +14,6 @@ p
| will be written out. To make the model more convenient to deploy, we | will be written out. To make the model more convenient to deploy, we
| recommend wrapping it as a Python package. | recommend wrapping it as a Python package.
+h(3, "models-generating") Generating a model package +h(3, "models-generating") Generating a model package
+infobox("Important note") +infobox("Important note")

View File

@ -14,7 +14,7 @@ p
+aside("Looking for the old docs?", "📖") +aside("Looking for the old docs?", "📖")
| To help you make the transition from v1.x to v2.0, we've uploaded the | To help you make the transition from v1.x to v2.0, we've uploaded the
| old website to #[strong #[+a("https://legacy.spacy.io") legacy.spacy.io]]. | old website to #[strong #[+a("https://legacy.spacy.io/docs") legacy.spacy.io]].
| Wherever possible, the new docs also include notes on features that have | Wherever possible, the new docs also include notes on features that have
| changed in v2.0, and features that were introduced in the new version. | changed in v2.0, and features that were introduced in the new version.