From 83b5ddc7575b8efdb5c9728903597762d02490c3 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Mon, 24 Jun 2024 09:50:00 -0700 Subject: [PATCH] First pass updating misc files, informed by https://github.com/pybind/pybind11/pull/5177/commits --- .github/workflows/ci.yml | 7 ++----- include/pybind11/detail/common.h | 4 ++-- pybind11/__init__.py | 4 ++-- pyproject.toml | 2 +- setup.cfg | 3 +-- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3054d842a..a24ff8022 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -719,9 +719,9 @@ jobs: # This tests an "install" with the CMake tools install-classic: - name: "🐍 3.7 • Debian • x86 • Install" + name: "🐍 3.9 • Debian • x86 • Install" runs-on: ubuntu-latest - container: i386/debian:buster + container: i386/debian:bullseye steps: - uses: actions/checkout@v1 # v1 is required to run inside docker @@ -801,7 +801,6 @@ jobs: fail-fast: false matrix: python: - - '3.7' - '3.8' - '3.9' - '3.10' @@ -819,8 +818,6 @@ jobs: args: -DCMAKE_CXX_STANDARD=20 - python: '3.8' args: -DCMAKE_CXX_STANDARD=17 - - python: '3.7' - args: -DCMAKE_CXX_STANDARD=14 name: "🐍 ${{ matrix.python }} • MSVC 2019 • x86 ${{ matrix.args }}" diff --git a/include/pybind11/detail/common.h b/include/pybind11/detail/common.h index 698421d84..f27827f65 100644 --- a/include/pybind11/detail/common.h +++ b/include/pybind11/detail/common.h @@ -272,8 +272,8 @@ PYBIND11_WARNING_DISABLE_MSVC(4505) #endif #include -#if PY_VERSION_HEX < 0x03070000 -# error "PYTHON < 3.7 IS UNSUPPORTED. pybind11 v2.12 was the last to support Python 3.6." +#if PY_VERSION_HEX < 0x03080000 +# error "PYTHON < 3.8 IS UNSUPPORTED. pybind11 v2.13 was the last to support Python 3.7." #endif #include #include diff --git a/pybind11/__init__.py b/pybind11/__init__.py index b14660cae..99408ea2c 100644 --- a/pybind11/__init__.py +++ b/pybind11/__init__.py @@ -2,8 +2,8 @@ from __future__ import annotations import sys -if sys.version_info < (3, 7): # noqa: UP036 - msg = "pybind11 does not support Python < 3.7. v2.12 was the last release supporting Python 3.6." +if sys.version_info < (3, 8): + msg = "pybind11 does not support Python < 3.8. v2.13 was the last release supporting Python 3.7." raise ImportError(msg) diff --git a/pyproject.toml b/pyproject.toml index 71e7f5617..64f70ae8a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ ignore_missing_imports = true [tool.pylint] -master.py-version = "3.7" +master.py-version = "3.8" reports.output-format = "colorized" messages_control.disable = [ "design", diff --git a/setup.cfg b/setup.cfg index 79d75d0cd..b8d874661 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,7 +14,6 @@ classifiers = Topic :: Utilities Programming Language :: C++ Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 @@ -38,5 +37,5 @@ project_urls = Chat = https://gitter.im/pybind/Lobby [options] -python_requires = >=3.7 +python_requires = >=3.8 zip_safe = False