diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 840b8e5f9..6dff0e185 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,7 +30,7 @@ jobs: - name: Configure Python version uses: actions/setup-python@v4 with: - python-version: "3.7" + python-version: "3.9" architecture: x64 - name: black @@ -60,10 +60,6 @@ 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" - os: windows-latest diff --git a/build-constraints.txt b/build-constraints.txt deleted file mode 100644 index b1cf596ca..000000000 --- a/build-constraints.txt +++ /dev/null @@ -1,6 +0,0 @@ -# build version constraints for use with wheelwright -numpy==1.15.0; python_version=='3.7' and platform_machine!='aarch64' -numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64' -numpy==1.17.3; python_version=='3.8' and platform_machine!='aarch64' -numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64' -numpy>=1.25.0; python_version>='3.9' diff --git a/pyproject.toml b/pyproject.toml index 336c0793c..f648b2301 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,8 +6,7 @@ requires = [ "preshed>=3.0.2,<3.1.0", "murmurhash>=0.28.0,<1.1.0", "thinc>=8.1.8,<8.3.0", - "numpy>=1.15.0; python_version < '3.9'", - "numpy>=1.25.0; python_version >= '3.9'", + "numpy>=1.25.0", ] build-backend = "setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index 3050624f9..08b5eaf5e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,8 +13,7 @@ typer>=0.3.0,<0.10.0 smart-open>=5.2.1,<7.0.0 weasel>=0.1.0,<0.4.0 # Third party dependencies -numpy>=1.15.0; python_version < "3.9" -numpy>=1.19.0; python_version >= "3.9" +numpy>=1.19.0 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 @@ -23,7 +22,6 @@ langcodes>=3.2.0,<4.0.0 # Official Python utilities setuptools packaging>=20.0 -typing_extensions>=3.7.4.1,<4.5.0; python_version < "3.8" # Development dependencies pre-commit>=2.13.0 cython>=0.25,<3.0 @@ -32,7 +30,7 @@ pytest-timeout>=1.3.0,<2.0.0 mock>=2.0.0,<3.0.0 flake8>=3.8.0,<6.0.0 hypothesis>=3.27.0,<7.0.0 -mypy>=1.5.0,<1.6.0; platform_machine != "aarch64" and python_version >= "3.8" +mypy>=1.5.0,<1.6.0; platform_machine != "aarch64" types-mock>=0.1.1 types-setuptools>=57.0.0 types-requests diff --git a/setup.cfg b/setup.cfg index ab9e39e0c..999facbbc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,18 +30,7 @@ project_urls = [options] zip_safe = false include_package_data = true -python_requires = >=3.7 -# NOTE: This section is superseded by pyproject.toml and will be removed in -# 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" - # 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.1.8,<8.3.0 +python_requires = >=3.9 install_requires = # Our libraries spacy-legacy>=3.0.11,<3.1.0 @@ -58,15 +47,13 @@ install_requires = typer>=0.3.0,<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" - numpy>=1.19.0; python_version >= "3.9" + numpy>=1.19.0 requests>=2.13.0,<3.0.0 pydantic>=1.7.4,!=1.8,!=1.8.1,<3.0.0 jinja2 # Official Python utilities setuptools packaging>=20.0 - typing_extensions>=3.7.4.1,<4.5.0; python_version < "3.8" langcodes>=3.2.0,<4.0.0 [options.entry_points] diff --git a/spacy/tests/package/test_requirements.py b/spacy/tests/package/test_requirements.py index ff07c5b45..f2bf3de61 100644 --- a/spacy/tests/package/test_requirements.py +++ b/spacy/tests/package/test_requirements.py @@ -5,6 +5,7 @@ from pathlib import Path def test_build_dependencies(): # Check that library requirements are pinned exactly the same across different setup files. libs_ignore_requirements = [ + "cython", "numpy", "pytest", "pytest-timeout",