From 6e54360a3d068c2b85b45902f8885b8db043372f Mon Sep 17 00:00:00 2001 From: Adriane Boyd Date: Thu, 5 Oct 2023 08:50:22 +0200 Subject: [PATCH] Remove pathy dependency, update docs for cloudpathlib in Weasel (#13035) --- requirements.txt | 1 - setup.cfg | 1 - spacy/cli/_util.py | 4 ---- website/docs/api/cli.mdx | 6 +++--- website/docs/usage/projects.mdx | 6 +++--- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/requirements.txt b/requirements.txt index a8ba956a1..3050624f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,6 @@ wasabi>=0.9.1,<1.2.0 srsly>=2.4.3,<3.0.0 catalogue>=2.0.6,<2.1.0 typer>=0.3.0,<0.10.0 -pathy>=0.10.0 smart-open>=5.2.1,<7.0.0 weasel>=0.1.0,<0.4.0 # Third party dependencies diff --git a/setup.cfg b/setup.cfg index 75f2e3a15..ab9e39e0c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -56,7 +56,6 @@ install_requires = weasel>=0.1.0,<0.4.0 # Third-party dependencies typer>=0.3.0,<0.10.0 - pathy>=0.10.0 smart-open>=5.2.1,<7.0.0 tqdm>=4.38.0,<5.0.0 numpy>=1.15.0; python_version < "3.9" diff --git a/spacy/cli/_util.py b/spacy/cli/_util.py index bc6c53cd9..fa41e6a08 100644 --- a/spacy/cli/_util.py +++ b/spacy/cli/_util.py @@ -41,10 +41,6 @@ from ..util import ( run_command, ) -if TYPE_CHECKING: - from pathy import FluidPath # noqa: F401 - - SDIST_SUFFIX = ".tar.gz" WHEEL_SUFFIX = "-py3-none-any.whl" diff --git a/website/docs/api/cli.mdx b/website/docs/api/cli.mdx index 3ec0081c9..51cae960b 100644 --- a/website/docs/api/cli.mdx +++ b/website/docs/api/cli.mdx @@ -1544,9 +1544,9 @@ obsolete files is left up to you. Remotes can be defined in the `remotes` section of the [`project.yml`](/usage/projects#project-yml). Under the hood, spaCy uses -[`Pathy`](https://github.com/justindujardin/pathy) to communicate with the -remote storages, so you can use any protocol that `Pathy` supports, including -[S3](https://aws.amazon.com/s3/), +[`cloudpathlib`](https://cloudpathlib.drivendata.org) to communicate with the +remote storages, so you can use any protocol that `cloudpathlib` supports, +including [S3](https://aws.amazon.com/s3/), [Google Cloud Storage](https://cloud.google.com/storage), and the local filesystem, although you may need to install extra dependencies to use certain protocols. diff --git a/website/docs/usage/projects.mdx b/website/docs/usage/projects.mdx index f3cca8013..b089a7ab5 100644 --- a/website/docs/usage/projects.mdx +++ b/website/docs/usage/projects.mdx @@ -656,9 +656,9 @@ locally. You can list one or more remotes in the `remotes` section of your [`project.yml`](#project-yml) by mapping a string name to the URL of the storage. Under the hood, spaCy uses -[`Pathy`](https://github.com/justindujardin/pathy) to communicate with the -remote storages, so you can use any protocol that `Pathy` supports, including -[S3](https://aws.amazon.com/s3/), +[`cloudpathlib`](https://cloudpathlib.drivendata.org) to communicate with the +remote storages, so you can use any protocol that `cloudpathlib` supports, +including [S3](https://aws.amazon.com/s3/), [Google Cloud Storage](https://cloud.google.com/storage), and the local filesystem, although you may need to install extra dependencies to use certain protocols.