From b6a198481bb5d206b3571977808c1527afb66bd1 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 2 Feb 2021 20:26:17 +1100 Subject: [PATCH 1/7] Set version to v3.0.0 --- spacy/about.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spacy/about.py b/spacy/about.py index debd63d33..1787c2fcc 100644 --- a/spacy/about.py +++ b/spacy/about.py @@ -1,6 +1,6 @@ # fmt: off __title__ = "spacy" -__version__ = "3.0.1.dev0" +__version__ = "3.0.1" __download_url__ = "https://github.com/explosion/spacy-models/releases/download" __compatibility__ = "https://raw.githubusercontent.com/explosion/spacy-models/master/compatibility.json" __projects__ = "https://github.com/explosion/projects" From 91a3cab1cab71d1ca8136b61c56e7bfb5f44b0f6 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 2 Feb 2021 20:46:56 +1100 Subject: [PATCH 2/7] Require spacy-transformers 1.0.1 for v3.0.1 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index bbe80b76b..6f8572381 100644 --- a/setup.cfg +++ b/setup.cfg @@ -68,7 +68,7 @@ console_scripts = lookups = spacy_lookups_data>=1.0.0,<1.1.0 transformers = - spacy_transformers>=1.0.0,<1.1.0 + spacy_transformers>=1.0.1,<1.1.0 ray = spacy_ray>=0.1.0,<1.0.0 cuda = From f852af2acff3afd5b797b4a893f08cbd4bc3963c Mon Sep 17 00:00:00 2001 From: svlandeg Date: Tue, 2 Feb 2021 19:47:12 +0100 Subject: [PATCH 3/7] add capture arg --- spacy/cli/project/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spacy/cli/project/run.py b/spacy/cli/project/run.py index 28ac3c24e..17c881595 100644 --- a/spacy/cli/project/run.py +++ b/spacy/cli/project/run.py @@ -66,7 +66,7 @@ def project_run( if subcommand in workflows: msg.info(f"Running workflow '{subcommand}'") for cmd in workflows[subcommand]: - project_run(project_dir, cmd, force=force, dry=dry) + project_run(project_dir, cmd, force=force, dry=dry, capture=capture) else: cmd = commands[subcommand] for dep in cmd.get("deps", []): From 809f6282f2f5148291ef2259aff6ead7fde88fb0 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Wed, 3 Feb 2021 12:48:25 +1100 Subject: [PATCH 4/7] Update README.md [ci skip] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9bdb83bae..9a314ae44 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ open-source software, released under the MIT license. [![Python wheels](https://img.shields.io/badge/wheels-%E2%9C%93-4c1.svg?longCache=true&style=flat-square&logo=python&logoColor=white)](https://github.com/explosion/wheelwright/releases) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square)](https://github.com/ambv/black)
-[![PyPi downloads](https://img.shields.io/pypi/dm/spacy?style=flat-square&logo=pypi&logoColor=white)](https://pypi.org/project/spacy/) -[![Conda downloads](https://img.shields.io/conda/dn/conda-forge/spacy?style=flat-square&logo=conda-forge&logoColor=white)](https://anaconda.org/conda-forge/spacy) +[![PyPi downloads](https://static.pepy.tech/personalized-badge/spacy?period=total&units=international_system&left_color=grey&right_color=orange&left_text=pip%20downloads)](https://pypi.org/project/spacy/) +[![Conda downloads](https://img.shields.io/conda/dn/conda-forge/spacy?label=conda%20downloads)](https://anaconda.org/conda-forge/spacy) [![spaCy on Twitter](https://img.shields.io/twitter/follow/spacy_io.svg?style=social&label=Follow)](https://twitter.com/spacy_io) ## 📖 Documentation From 2cdfcd2d190d22d60728beb690e073fa6a509c95 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Wed, 3 Feb 2021 12:48:31 +1100 Subject: [PATCH 5/7] Update naming [ci skip] --- website/docs/usage/training.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/usage/training.md b/website/docs/usage/training.md index 72ac50d95..ab3f9c4fd 100644 --- a/website/docs/usage/training.md +++ b/website/docs/usage/training.md @@ -940,7 +940,7 @@ import spacy from spacy.tokens import Doc @spacy.registry.architectures("custom_neural_network.v1") -def MyModel(output_width: int) -> Model[List[Doc], List[Floats2d]]: +def custom_neural_network(output_width: int) -> Model[List[Doc], List[Floats2d]]: return create_model(output_width) ``` From 94929c2b98cd7b3d7a0d069340ac50cb5c0782d2 Mon Sep 17 00:00:00 2001 From: svlandeg Date: Wed, 3 Feb 2021 13:10:22 +0100 Subject: [PATCH 6/7] small doc fixes --- website/docs/api/cli.md | 4 ++-- website/docs/api/top-level.md | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/website/docs/api/cli.md b/website/docs/api/cli.md index ee70f85b5..e8be0f79c 100644 --- a/website/docs/api/cli.md +++ b/website/docs/api/cli.md @@ -237,11 +237,11 @@ $ python -m spacy init labels [config_path] [output_path] [--code] [--verbose] [ | `config_path` | Path to [training config](/api/data-formats#config) file containing all settings and hyperparameters. If `-`, the data will be [read from stdin](/usage/training#config-stdin). ~~Union[Path, str] \(positional)~~ | | `output_path` | Output directory for the label files. Will create one JSON file per component. ~~Path (positional)~~ | | `--code`, `-c` | Path to Python file with additional code to be imported. Allows [registering custom functions](/usage/training#custom-functions) for new architectures. ~~Optional[Path] \(option)~~ | -| `--verbose`, `-V` | Show more detailed messages during training. ~~bool (flag)~~ | +| `--verbose`, `-V` | Show more detailed messages for debugging purposes. ~~bool (flag)~~ | | `--gpu-id`, `-g` | GPU ID or `-1` for CPU. Defaults to `-1`. ~~int (option)~~ | | `--help`, `-h` | Show help message and available arguments. ~~bool (flag)~~ | | overrides | Config parameters to override. Should be options starting with `--` that correspond to the config section and value to override, e.g. `--paths.train ./train.spacy`. ~~Any (option/flag)~~ | -| **CREATES** | The best trained pipeline and the final checkpoint (if training is terminated). | +| **CREATES** | The label files. | ## convert {#convert tag="command"} diff --git a/website/docs/api/top-level.md b/website/docs/api/top-level.md index 09a64f9e3..e025aebe5 100644 --- a/website/docs/api/top-level.md +++ b/website/docs/api/top-level.md @@ -173,10 +173,9 @@ and _before_ loading any pipelines. ### spacy.require_cpu {#spacy.require_cpu tag="function" new="3.0.0"} -Allocate data and perform operations on CPU. -If data has already been allocated on GPU, it will not -be moved. Ideally, this function should be called right after importing spaCy -and _before_ loading any pipelines. +Allocate data and perform operations on CPU. If data has already been allocated +on GPU, it will not be moved. Ideally, this function should be called right +after importing spaCy and _before_ loading any pipelines. > #### Example > @@ -186,9 +185,9 @@ and _before_ loading any pipelines. > nlp = spacy.load("en_core_web_sm") > ``` -| Name | Description | -| ----------- | ------------------------------------------------ | -| **RETURNS** | `True` ~~bool~~ | +| Name | Description | +| ----------- | --------------- | +| **RETURNS** | `True` ~~bool~~ | ## displaCy {#displacy source="spacy/displacy"} @@ -545,7 +544,7 @@ label sets. | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `path` | The path to the labels file generated with [`init labels`](/api/cli#init-labels). ~~Path~~ | | `require` | Whether to require the file to exist. If set to `False` and the labels file doesn't exist, the loader will return `None` and the `initialize` method will extract the labels from the data. Defaults to `False`. ~~bool~~ | -| **CREATES** | The | +| **CREATES** | The list of labels | ### Corpus readers {#corpus-readers source="spacy/training/corpus.py" new="3"} From 7cda5605a074b6c87c1d86f7c43ce08f49a09fa1 Mon Sep 17 00:00:00 2001 From: svlandeg Date: Wed, 3 Feb 2021 13:13:58 +0100 Subject: [PATCH 7/7] add type --- website/docs/api/top-level.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/api/top-level.md b/website/docs/api/top-level.md index e025aebe5..3a2c65553 100644 --- a/website/docs/api/top-level.md +++ b/website/docs/api/top-level.md @@ -544,7 +544,7 @@ label sets. | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `path` | The path to the labels file generated with [`init labels`](/api/cli#init-labels). ~~Path~~ | | `require` | Whether to require the file to exist. If set to `False` and the labels file doesn't exist, the loader will return `None` and the `initialize` method will extract the labels from the data. Defaults to `False`. ~~bool~~ | -| **CREATES** | The list of labels | +| **CREATES** | The list of labels. ~~List[str]~~ | ### Corpus readers {#corpus-readers source="spacy/training/corpus.py" new="3"}