Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop 3.8 support #1604

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Drop 3.8 support #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d12b6fe
initial pass in config files and such
sydney-runkle Jan 21, 2025
f25c048
import fixes
sydney-runkle Jan 21, 2025
feef1b4
new generic syntax
sydney-runkle Jan 21, 2025
97f0989
remove unrelated test
sydney-runkle Jan 21, 2025
61e20e0
fix self schema build
sydney-runkle Jan 21, 2025
7ba7714
fix Type[ -> type[
sydney-runkle Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/check_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"""
Check the version in Cargo.toml matches the version from `GITHUB_REF` environment variable.
"""

import os
import re
import sys
Expand All @@ -18,7 +19,7 @@ def main() -> int:
if version_ref:
version = re.sub('^refs/tags/v*', '', version_ref.lower())
else:
print(f'✖ "GITHUB_REF" env variables not found')
print('✖ "GITHUB_REF" env variables not found')
return 1

# convert from python pre-release version to rust pre-release version
Expand Down
25 changes: 9 additions & 16 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ jobs:
fail-fast: false
matrix:
python-version:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
Expand Down Expand Up @@ -403,15 +402,15 @@ jobs:
- os: linux
manylinux: auto
target: armv7
interpreter: 3.8 3.9 3.10 3.11 3.12 3.13
interpreter: 3.9 3.10 3.11 3.12 3.13
- os: linux
manylinux: auto
target: ppc64le
interpreter: 3.8 3.9 3.10 3.11 3.12 3.13
interpreter: 3.9 3.10 3.11 3.12 3.13
- os: linux
manylinux: auto
target: s390x
interpreter: 3.8 3.9 3.10 3.11 3.12 3.13
interpreter: 3.9 3.10 3.11 3.12 3.13
- os: linux
manylinux: auto
target: x86_64
Expand All @@ -435,7 +434,7 @@ jobs:
target: x86_64
- os: macos
target: aarch64
interpreter: 3.8 3.9 pypy3.9 pypy3.10
interpreter: 3.9 pypy3.9 pypy3.10

# windows;
# x86_64 pypy builds are not PGO optimized
Expand All @@ -447,7 +446,7 @@ jobs:
- os: windows
target: i686
python-architecture: x86
interpreter: 3.8 3.9 3.10 3.11 3.12 3.13
interpreter: 3.9 3.10 3.11 3.12 3.13
- os: windows
target: aarch64
interpreter: 3.11 3.12 3.13
Expand Down Expand Up @@ -477,10 +476,8 @@ jobs:
with:
target: ${{ matrix.target }}
manylinux: ${{ matrix.manylinux }}
args: --release --out dist --interpreter ${{ matrix.interpreter || '3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10' }}
# Limit windows builds to 1.77 to keep Windows 7 support.
# FIXME: Unpin when Python 3.8 support is dropped. (3.9 requires Windows 10)
rust-toolchain: ${{ (matrix.os == 'windows' && '1.77') || 'stable' }}
args: --release --out dist --interpreter ${{ matrix.interpreter || '3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10' }}
rust-toolchain: stable
docker-options: -e CI

- run: ${{ (matrix.os == 'windows' && 'dir') || 'ls -lh' }} dist/
Expand All @@ -500,7 +497,7 @@ jobs:
fail-fast: false
matrix:
os: [linux, windows, macos]
interpreter: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
interpreter: ['3.9', '3.10', '3.11', '3.12', '3.13']
include:
# standard runners with override for macos arm
- os: linux
Expand All @@ -512,8 +509,6 @@ jobs:
runs-on: macos-latest-xlarge
exclude:
# macos arm only supported from 3.10 and up
- os: macos
interpreter: '3.8'
- os: macos
interpreter: '3.9'

Expand All @@ -531,9 +526,7 @@ jobs:
uses: dtolnay/rust-toolchain@master
with:
components: llvm-tools
# Limit windows builds to 1.77 to keep Windows 7 support.
# FIXME: Unpin when Python 3.8 support is dropped. (3.9 requires Windows 10)
toolchain: ${{ (matrix.os == 'windows' && '1.77') || 'stable' }}
toolchain: stable

- name: Build PGO wheel
id: pgo-wheel
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ except ValidationError as e:

You'll need rust stable [installed](https://rustup.rs/), or rust nightly if you want to generate accurate coverage.

With rust and python 3.8+ installed, compiling pydantic-core should be possible with roughly the following:
With rust and python 3.9+ installed, compiling pydantic-core should be possible with roughly the following:

```bash
# clone this repo or your fork
Expand Down
26 changes: 12 additions & 14 deletions generate_self_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
from collections.abc import Callable
from datetime import date, datetime, time, timedelta
from pathlib import Path
from typing import TYPE_CHECKING, Any, Dict, ForwardRef, List, Pattern, Set, Type, Union
from typing import TYPE_CHECKING, Any, ForwardRef, Pattern, Union

from typing_extensions import TypedDict, get_args, get_origin, is_typeddict

TypingUnionType = Type[Union[str, int]]
TypingUnionType = type[Union[str, int]]

try:
from types import UnionType as TypesUnionType
Expand Down Expand Up @@ -69,17 +69,17 @@ def get_schema(obj: Any, definitions: dict[str, core_schema.CoreSchema]) -> core
expected = all_literal_values(obj)
assert expected, f'literal "expected" cannot be empty, obj={obj}'
return {'type': 'literal', 'expected': expected}
elif issubclass(origin, List):
elif issubclass(origin, list):
return {'type': 'list', 'items_schema': get_schema(obj.__args__[0], definitions)}
elif issubclass(origin, Set):
elif issubclass(origin, set):
return {'type': 'set', 'items_schema': get_schema(obj.__args__[0], definitions)}
elif issubclass(origin, Dict):
elif issubclass(origin, dict):
return {
'type': 'dict',
'keys_schema': get_schema(obj.__args__[0], definitions),
'values_schema': get_schema(obj.__args__[1], definitions),
}
elif issubclass(origin, Type):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this right?

Copy link
Member

@Viicos Viicos Jan 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if this is documented in Python, but typing.* aliases define __subclasscheck__ so this works as expected. Still, using the builtin type is way cleaner.

elif issubclass(origin, type):
# can't really use 'is-instance' since this is used for the class_ parameter of 'is-instance' validators
return {'type': 'any'}
elif origin in (Pattern, re.Pattern):
Expand All @@ -90,7 +90,7 @@ def get_schema(obj: Any, definitions: dict[str, core_schema.CoreSchema]) -> core
raise TypeError(f'Unknown type: {obj!r}')


def tagged_union(std_union_schema: Dict[str, Any], discriminator_key: str, ref: str | None = None) -> Dict[str, Any]:
def tagged_union(std_union_schema: dict[str, Any], discriminator_key: str, ref: str | None = None) -> dict[str, Any]:
"""
Build a tagged union schema from a standard union schema.
"""
Expand Down Expand Up @@ -134,13 +134,13 @@ def type_dict_schema( # noqa: C901
if 'CoreSchema' == fr_arg or re.search('[^a-zA-Z]CoreSchema', fr_arg):
if fr_arg == 'CoreSchema':
schema = schema_ref_validator
elif fr_arg == 'List[CoreSchema]':
elif fr_arg == 'list[CoreSchema]':
schema = {'type': 'list', 'items_schema': schema_ref_validator}
elif fr_arg == 'Dict[str, CoreSchema]':
elif fr_arg == 'dict[str, CoreSchema]':
schema = {'type': 'dict', 'keys_schema': {'type': 'str'}, 'values_schema': schema_ref_validator}
elif fr_arg == 'Dict[Hashable, CoreSchema]':
elif fr_arg == 'dict[Hashable, CoreSchema]':
schema = {'type': 'dict', 'keys_schema': {'type': 'any'}, 'values_schema': schema_ref_validator}
elif fr_arg == 'List[Union[CoreSchema, Tuple[CoreSchema, str]]]':
elif fr_arg == 'list[Union[CoreSchema, tuple[CoreSchema, str]]]':
schema = {
'type': 'list',
'items_schema': {
Expand Down Expand Up @@ -193,9 +193,7 @@ def all_literal_values(type_: type[core_schema.Literal]) -> list[any]:


def eval_forward_ref(type_: Any) -> Any:
if sys.version_info < (3, 9):
return type_._evaluate(core_schema.__dict__, None)
elif sys.version_info < (3, 12, 4):
if sys.version_info < (3, 12, 4):
return type_._evaluate(core_schema.__dict__, None, recursive_guard=set())
else:
return type_._evaluate(core_schema.__dict__, None, type_params=set(), recursive_guard=set())
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build-backend = 'maturin'
[project]
name = 'pydantic_core'
description = "Core functionality for Pydantic validation and serialization"
requires-python = '>=3.8'
requires-python = '>=3.9'
authors = [
{name = 'Samuel Colvin', email = '[email protected]'}
]
Expand All @@ -17,7 +17,6 @@ classifiers = [
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
Expand Down Expand Up @@ -101,6 +100,7 @@ features = ["pyo3/extension-module"]

[tool.ruff]
line-length = 120
target-version = 'py39'

[tool.ruff.lint]
extend-select = ['Q', 'RUF100', 'C90', 'I']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add pyupgrade?

Expand Down
Loading
Loading