From 199804da172d7b9f66511be92c271a495b7b9c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= Date: Thu, 18 Apr 2024 16:03:26 +0200 Subject: [PATCH] Remove support for Python versions prior to 3.9 --- .github/workflows/tests.yml | 11 +---------- build-constraints.txt | 4 ---- requirements.txt | 12 ++---------- setup.cfg | 12 ++---------- 4 files changed, 5 insertions(+), 34 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cd569bafa..623e079e0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,7 +23,7 @@ jobs: - name: Configure Python version uses: actions/setup-python@v4 with: - python-version: "3.7" + python-version: "3.9" architecture: x64 - name: black @@ -48,12 +48,6 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] python_version: ["3.12"] include: - - os: windows-2019 - python_version: "3.6" - - os: macos-latest - python_version: "3.7" - - os: ubuntu-latest - python_version: "3.8" - os: windows-latest python_version: "3.9" - os: macos-latest @@ -87,9 +81,6 @@ jobs: - name: Run mypy run: python -m mypy thinc --no-implicit-reexport - if: | - matrix.python_version != '3.6' && - matrix.python_version != '3.7' - name: Delete source directory run: rm -rf thinc diff --git a/build-constraints.txt b/build-constraints.txt index 5540d634d..033ce367f 100644 --- a/build-constraints.txt +++ b/build-constraints.txt @@ -1,6 +1,2 @@ # build version constraints for use with wheelwright + multibuild -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/requirements.txt b/requirements.txt index 3e3c9901e..ac1a0ffc5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,13 +10,8 @@ confection>=0.0.1,<1.0.0 ml_datasets>=0.2.0,<0.3.0; python_version < "3.11" # Third-party dependencies pydantic>=1.7.4,!=1.8,!=1.8.1,<3.0.0 -numpy>=1.15.0; python_version < "3.9" -numpy>=1.19.0; python_version >= "3.9" +numpy>=1.19.0 packaging>=20.0 -# Backports of modern Python features -dataclasses>=0.6,<1.0; python_version < "3.7" -typing_extensions>=3.7.4.1,<4.5.0; python_version < "3.8" -contextvars>=2.4,<3; python_version < "3.7" # Development dependencies cython>=0.25.0,<3.0 hypothesis>=3.27.0,<6.72.2 @@ -25,11 +20,8 @@ pytest-cov>=2.7.0,<5.0.0 coverage>=5.0.0,<8.0.0 mock>=2.0.0,<3.0.0 flake8>=3.5.0,<3.6.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-contextvars>=0.1.2; python_version < "3.7" -types-dataclasses>=0.1.3; python_version < "3.7" -importlib_resources; python_version < "3.7" # Executing notebook tests ipykernel>=5.1.4,<5.2.0 nbconvert>=5.6.1,<6.2.0 diff --git a/setup.cfg b/setup.cfg index fc154e629..456e6a77c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,9 +17,6 @@ classifiers = Operating System :: Microsoft :: Windows Programming Language :: Cython Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 @@ -29,7 +26,7 @@ classifiers = [options] zip_safe = false include_package_data = true -python_requires = >=3.6 +python_requires = >=3.9 setup_requires = cython>=0.25,<3.0 numpy>=1.15.0 @@ -50,14 +47,9 @@ install_requires = confection>=0.0.1,<1.0.0 # Third-party dependencies setuptools - numpy>=1.15.0; python_version < "3.9" - numpy>=1.19.0; python_version >= "3.9" + numpy>=1.19.0 pydantic>=1.7.4,!=1.8,!=1.8.1,<3.0.0 packaging>=20.0 - # Backports of modern Python features - dataclasses>=0.6,<1.0; python_version < "3.7" - typing_extensions>=3.7.4.1,<4.5.0; python_version < "3.8" - contextvars>=2.4,<3; python_version < "3.7" [options.entry_points] pytest_randomly.random_seeder =