From 184e508d9c8db6fc89c60e5ec8e94324817259c9 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Wed, 11 Sep 2024 15:56:33 +0200 Subject: [PATCH 1/9] Update numpy pin --- pyproject.toml | 6 +++--- requirements.txt | 4 ++-- setup.cfg | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 07ffe1677..2c2221706 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,9 +5,9 @@ requires = [ "cymem>=2.0.2,<2.1.0", "preshed>=3.0.2,<3.1.0", "murmurhash>=0.28.0,<1.1.0", - "thinc>=8.2.2,<8.3.0", - "numpy>=1.15.0; python_version < '3.9'", - "numpy>=1.25.0; python_version >= '3.9'", + "thinc>=8.3.0,<8.4.0", + "numpy>=2.0.0,<2.1.0; python_version < '3.9'", + "numpy>=2.0.0,<2.1.0; python_version >= '3.9'", ] build-backend = "setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index 7e7144d53..b61715a8f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,8 +12,8 @@ catalogue>=2.0.6,<2.1.0 typer>=0.3.0,<1.0.0 weasel>=0.1.0,<0.5.0 # Third party dependencies -numpy>=1.15.0; python_version < "3.9" -numpy>=1.19.0; python_version >= "3.9" +numpy>=2.0.0; python_version < "3.9" +numpy>=2.0.0; python_version >= "3.9" requests>=2.13.0,<3.0.0 tqdm>=4.38.0,<5.0.0 pydantic>=1.7.4,!=1.8,!=1.8.1,<3.0.0 diff --git a/setup.cfg b/setup.cfg index 2917f67ed..1857accf5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,13 +36,13 @@ python_requires = >=3.7 # spaCy v4 setup_requires = cython>=0.25,<3.0 - numpy>=1.15.0; python_version < "3.9" - numpy>=1.19.0; python_version >= "3.9" + numpy>=2.0.0,<2.1.0; python_version < "3.9" + numpy>=2.0.0,<2.1.0; python_version >= "3.9" # We also need our Cython packages here to compile against cymem>=2.0.2,<2.1.0 preshed>=3.0.2,<3.1.0 murmurhash>=0.28.0,<1.1.0 - thinc>=8.2.2,<8.3.0 + thinc>=8.3.0,<8.4.0 install_requires = # Our libraries spacy-legacy>=3.0.11,<3.1.0 From c068e1de1ba69add6944155aa0b399c738dc6496 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Wed, 11 Sep 2024 15:57:52 +0200 Subject: [PATCH 2/9] Fix dependencies --- spacy/about.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spacy/about.py b/spacy/about.py index 23ef181eb..c9a3dba9a 100644 --- a/spacy/about.py +++ b/spacy/about.py @@ -1,5 +1,5 @@ # fmt: off __title__ = "spacy" -__version__ = "3.7.6" +__version__ = "3.7.7" __download_url__ = "https://github.com/explosion/spacy-models/releases/download" __compatibility__ = "https://raw.githubusercontent.com/explosion/spacy-models/master/compatibility.json" From 1869a197c96bb262441df61472d9a82869e742a7 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Wed, 11 Sep 2024 16:06:57 +0200 Subject: [PATCH 3/9] Try enabling macos-14 for arm builds --- .github/workflows/cibuildwheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index c5676ce49..d757180c9 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: # macos-13 is an intel runner, macos-14 is apple silicon - os: [ubuntu-latest, windows-latest, macos-13] + os: [ubuntu-latest, windows-latest, macos-13, macos-14] steps: - uses: actions/checkout@v4 From b427597fc8a5a001f6fb07af07d4c912c38ecd5f Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Wed, 11 Sep 2024 21:32:26 +0200 Subject: [PATCH 4/9] Set version to v3.8.0 --- spacy/about.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spacy/about.py b/spacy/about.py index c9a3dba9a..3ce6b5514 100644 --- a/spacy/about.py +++ b/spacy/about.py @@ -1,5 +1,5 @@ # fmt: off __title__ = "spacy" -__version__ = "3.7.7" +__version__ = "3.8.0" __download_url__ = "https://github.com/explosion/spacy-models/releases/download" __compatibility__ = "https://raw.githubusercontent.com/explosion/spacy-models/master/compatibility.json" From 69ecb85fad8db4f0e479478e61521353adc66133 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Fri, 13 Sep 2024 10:43:40 +0200 Subject: [PATCH 5/9] Set version to v3.8.1 --- spacy/about.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spacy/about.py b/spacy/about.py index 3ce6b5514..8266773b5 100644 --- a/spacy/about.py +++ b/spacy/about.py @@ -1,5 +1,5 @@ # fmt: off __title__ = "spacy" -__version__ = "3.8.0" +__version__ = "3.8.1" __download_url__ = "https://github.com/explosion/spacy-models/releases/download" __compatibility__ = "https://raw.githubusercontent.com/explosion/spacy-models/master/compatibility.json" From 419bfaf6e771a255ccc79275b899da71a06439bd Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Fri, 13 Sep 2024 10:44:48 +0200 Subject: [PATCH 6/9] Update cibuildwheel --- .github/workflows/cibuildwheel.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index d757180c9..df45822f9 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -18,10 +18,17 @@ jobs: steps: - uses: actions/checkout@v4 + # aarch64 (arm) is built via qemu emulation + # QEMU is sadly too slow. We need to wait for public ARM support + #- name: Set up QEMU + # if: runner.os == 'Linux' + # uses: docker/setup-qemu-action@v3 + # with: + # platforms: all - name: Build wheels uses: pypa/cibuildwheel@v2.19.1 env: - CIBW_SOME_OPTION: value + CIBW_ARCHS_LINUX: auto aarch64 with: package-dir: . output-dir: wheelhouse From 83b4015b36847aef65ecd1004863cfd924a7af6b Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Fri, 13 Sep 2024 12:35:50 +0200 Subject: [PATCH 7/9] Remove aarch --- .github/workflows/cibuildwheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index df45822f9..c1f5e716d 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -28,7 +28,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.19.1 env: - CIBW_ARCHS_LINUX: auto aarch64 + CIBW_ARCHS_LINUX: auto with: package-dir: . output-dir: wheelhouse From a0ce61f55abbe02f3dac134c35d9273a6889b10b Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Fri, 13 Sep 2024 14:21:03 +0200 Subject: [PATCH 8/9] Fix thinc pin --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 1857accf5..855b7e683 100644 --- a/setup.cfg +++ b/setup.cfg @@ -50,7 +50,7 @@ install_requires = murmurhash>=0.28.0,<1.1.0 cymem>=2.0.2,<2.1.0 preshed>=3.0.2,<3.1.0 - thinc>=8.2.2,<8.3.0 + thinc>=8.3.0,<8.4.0 wasabi>=0.9.1,<1.2.0 srsly>=2.4.3,<3.0.0 catalogue>=2.0.6,<2.1.0 From 3a635d2c94b7dc465ee4df8b33e5ad10d9f1481c Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Sat, 14 Sep 2024 00:12:49 +0200 Subject: [PATCH 9/9] Try skipping 686 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2c2221706..2edbadefc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ build-backend = "setuptools.build_meta" [tool.cibuildwheel] build = "*" -skip = "pp* cp36* cp37* cp38* *-win32" +skip = "pp* cp36* cp37* cp38* *-win32 *i686*" test-skip = "" free-threaded-support = false