From a61a1d43cf9573a9a7b6d6199732b5cc921f1135 Mon Sep 17 00:00:00 2001 From: DomHudson <10864294+DomHudson@users.noreply.github.com> Date: Mon, 30 Sep 2024 16:45:50 +0100 Subject: [PATCH 1/8] [Documentation] Replace broken URL in _serialization.mdx (#13641) --- website/docs/usage/101/_serialization.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/usage/101/_serialization.mdx b/website/docs/usage/101/_serialization.mdx index ce34ea6e9..d58c068eb 100644 --- a/website/docs/usage/101/_serialization.mdx +++ b/website/docs/usage/101/_serialization.mdx @@ -4,7 +4,7 @@ progress** – for example, everything that's in your `nlp` object. This means you'll have to translate its contents and structure into a format that can be saved, like a file or a byte string. This process is called serialization. spaCy comes with **built-in serialization methods** and supports the -[Pickle protocol](https://www.diveinto.org/python3/serializing.html#dump). +[Pickle protocol](https://docs.python.org/3/library/pickle.html). > #### What's pickle? > From dd47fbb45f2e4121ba2342c4b521118beaec954f Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 1 Oct 2024 22:24:25 +0200 Subject: [PATCH 2/8] Remove 'apple' extra --- .github/workflows/tests.yml | 5 ----- setup.cfg | 2 -- 2 files changed, 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0188606c0..8ee046240 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -177,8 +177,3 @@ jobs: python -m pytest --pyargs spacy -W error if: "!(startsWith(matrix.os, 'macos') && matrix.python_version == '3.11')" - - name: "Run CPU tests with thinc-apple-ops" - run: | - python -m pip install 'spacy[apple]' - python -m pytest --pyargs spacy - if: startsWith(matrix.os, 'macos') && matrix.python_version == '3.11' diff --git a/setup.cfg b/setup.cfg index 855b7e683..7b9bd7b28 100644 --- a/setup.cfg +++ b/setup.cfg @@ -115,8 +115,6 @@ cuda12x = cupy-cuda12x>=11.5.0,<13.0.0 cuda-autodetect = cupy-wheel>=11.0.0,<13.0.0 -apple = - thinc-apple-ops>=0.1.0.dev0,<1.0.0 # Language tokenizers with external dependencies ja = sudachipy>=0.5.2,!=0.6.1 From 29232ad3b5ca5a19858fce1af1dd258fc181c91e Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 1 Oct 2024 22:51:09 +0200 Subject: [PATCH 3/8] Upd tests workflow --- .github/workflows/tests.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8ee046240..b546fe1b8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,7 @@ jobs: - name: Configure Python version uses: actions/setup-python@v4 with: - python-version: "3.7" + python-version: "3.10" - name: black run: | @@ -61,12 +61,8 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] python_version: ["3.12"] include: - - os: windows-latest - python_version: "3.7" - - os: macos-latest - python_version: "3.8" - os: ubuntu-latest - python_version: "3.9" + python_version: "3.10" - os: windows-latest python_version: "3.10" - os: macos-latest From 5196366af56dbea18494e69abef93bf67b2f28de Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 1 Oct 2024 22:53:11 +0200 Subject: [PATCH 4/8] Upd tests workflow --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b546fe1b8..219c2196d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -59,7 +59,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python_version: ["3.12"] + python_version: ["3.10"] include: - os: ubuntu-latest python_version: "3.10" From 77177d0216af47cefed53e1860ebf3c17d87fa8f Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 1 Oct 2024 22:54:12 +0200 Subject: [PATCH 5/8] Upd tests workflow --- .github/workflows/tests.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 219c2196d..1ccc04f4f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -60,13 +60,6 @@ jobs: matrix: os: [ubuntu-latest, windows-latest, macos-latest] python_version: ["3.10"] - include: - - os: ubuntu-latest - python_version: "3.10" - - os: windows-latest - python_version: "3.10" - - os: macos-latest - python_version: "3.11" runs-on: ${{ matrix.os }} From 08705f5a8c3f4edc6fe55275a310e9af7cfd4316 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 1 Oct 2024 22:57:25 +0200 Subject: [PATCH 6/8] Upd tests --- .github/workflows/tests.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1ccc04f4f..f5896fbec 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,6 @@ on: - "*.md" - "*.mdx" - "website/**" - - ".github/workflows/**" pull_request: types: [opened, synchronize, reopened, edited] paths-ignore: @@ -58,9 +57,17 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - python_version: ["3.10"] - + os: [ubuntu-latest, windows-latest, macos-13] + python_version: ["3.12"] + include: + - os: windows-latest + python_version: "3.9" + - os: macos-13 + python_version: "3.10" + - os: ubuntu-latest + python_version: "3.11" + - os: windows-latest + python_version: "3.11" runs-on: ${{ matrix.os }} steps: From 411b70f5f3b1bd5c7f6affbc36b4ddb7eaaed4d6 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 1 Oct 2024 23:46:54 +0200 Subject: [PATCH 7/8] Upd requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b61715a8f..9f01c215f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ spacy-legacy>=3.0.11,<3.1.0 spacy-loggers>=1.0.0,<2.0.0 cymem>=2.0.2,<2.1.0 preshed>=3.0.2,<3.1.0 -thinc>=8.2.2,<8.3.0 +thinc>=9.0.0,<10.0.0 ml_datasets>=0.2.0,<0.3.0 murmurhash>=0.28.0,<1.1.0 wasabi>=0.9.1,<1.2.0 From 5230754986e2d73c46cd409efc1bed9a590a011f Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 1 Oct 2024 23:49:17 +0200 Subject: [PATCH 8/8] Fix thinc dependncy --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2edbadefc..5ee6894de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = [ "cymem>=2.0.2,<2.1.0", "preshed>=3.0.2,<3.1.0", "murmurhash>=0.28.0,<1.1.0", - "thinc>=8.3.0,<8.4.0", + "thinc>=9.1.0,<10.0.0", "numpy>=2.0.0,<2.1.0; python_version < '3.9'", "numpy>=2.0.0,<2.1.0; python_version >= '3.9'", ]