Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
python-version:
- "3.11"
- "3.12"
- "3.13"
- "3.14"
rust-version:
# RHEL 9.4 has rustc 1.75
- "1.75"
Expand Down Expand Up @@ -71,6 +73,8 @@ jobs:
python-version:
- "3.11"
- "3.12"
- "3.13"
- "3.14"
rust-version:
# RHEL 9.4 has rustc 1.75
- "1.75"
Expand All @@ -89,6 +93,10 @@ jobs:
# only run macOS tests on latest stable Python version
- os: macos-latest
python-version: "3.11"
- os: macos-latest
python-version: "3.12"
- os: macos-latest
python-version: "3.13"

steps:
- name: Get source
Expand Down
32 changes: 26 additions & 6 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,29 +33,49 @@ pull_request_rules:
- check-success=unit (3.11, 1.75, macos-latest)
- check-success=unit (3.12, 1.75, ubuntu-latest)
- check-success=unit (3.12, 1.75, macos-latest)
- check-success=unit (3.13, 1.75, ubuntu-latest)
- check-success=unit (3.13, 1.75, macos-latest)
- check-success=unit (3.14, 1.75, ubuntu-latest)
- check-success=unit (3.14, 1.75, macos-latest)

# MyPy type checking
- check-success=mypy

# E2E test suites (consolidated from individual tests)
# Python 3.11 - Ubuntu only (macOS excluded)
- check-success=e2e (3.11, 1.75, ci_bootstrap_parallel_suite, ubuntu-latest)
- check-success=e2e (3.11, 1.75, ci_bootstrap_suite, ubuntu-latest)
- check-success=e2e (3.11, 1.75, ci_build_suite, ubuntu-latest)
- check-success=e2e (3.11, 1.75, ci_config_suite, ubuntu-latest)
- check-success=e2e (3.11, 1.75, ci_specialized_suite, ubuntu-latest)
- check-success=e2e (3.11, 1.75, ci_workflow_suite, ubuntu-latest)
- check-success=e2e (3.12, 1.75, ci_bootstrap_parallel_suite, macos-latest)
# Python 3.12 - Ubuntu only (macOS excluded)
- check-success=e2e (3.12, 1.75, ci_bootstrap_parallel_suite, ubuntu-latest)
- check-success=e2e (3.12, 1.75, ci_bootstrap_suite, macos-latest)
- check-success=e2e (3.12, 1.75, ci_bootstrap_suite, ubuntu-latest)
- check-success=e2e (3.12, 1.75, ci_build_suite, macos-latest)
- check-success=e2e (3.12, 1.75, ci_build_suite, ubuntu-latest)
- check-success=e2e (3.12, 1.75, ci_config_suite, macos-latest)
- check-success=e2e (3.12, 1.75, ci_config_suite, ubuntu-latest)
- check-success=e2e (3.12, 1.75, ci_specialized_suite, macos-latest)
- check-success=e2e (3.12, 1.75, ci_specialized_suite, ubuntu-latest)
- check-success=e2e (3.12, 1.75, ci_workflow_suite, macos-latest)
- check-success=e2e (3.12, 1.75, ci_workflow_suite, ubuntu-latest)
# Python 3.13 - Ubuntu only (macOS excluded)
- check-success=e2e (3.13, 1.75, ci_bootstrap_parallel_suite, ubuntu-latest)
- check-success=e2e (3.13, 1.75, ci_bootstrap_suite, ubuntu-latest)
- check-success=e2e (3.13, 1.75, ci_build_suite, ubuntu-latest)
- check-success=e2e (3.13, 1.75, ci_config_suite, ubuntu-latest)
- check-success=e2e (3.13, 1.75, ci_specialized_suite, ubuntu-latest)
- check-success=e2e (3.13, 1.75, ci_workflow_suite, ubuntu-latest)
# Python 3.14 - Ubuntu + macOS (latest stable)
- check-success=e2e (3.14, 1.75, ci_bootstrap_parallel_suite, ubuntu-latest)
- check-success=e2e (3.14, 1.75, ci_bootstrap_parallel_suite, macos-latest)
- check-success=e2e (3.14, 1.75, ci_bootstrap_suite, ubuntu-latest)
- check-success=e2e (3.14, 1.75, ci_bootstrap_suite, macos-latest)
- check-success=e2e (3.14, 1.75, ci_build_suite, ubuntu-latest)
- check-success=e2e (3.14, 1.75, ci_build_suite, macos-latest)
- check-success=e2e (3.14, 1.75, ci_config_suite, ubuntu-latest)
- check-success=e2e (3.14, 1.75, ci_config_suite, macos-latest)
- check-success=e2e (3.14, 1.75, ci_specialized_suite, ubuntu-latest)
- check-success=e2e (3.14, 1.75, ci_specialized_suite, macos-latest)
- check-success=e2e (3.14, 1.75, ci_workflow_suite, ubuntu-latest)
- check-success=e2e (3.14, 1.75, ci_workflow_suite, macos-latest)

# At least 1 reviewer from maintainers
- and:
Expand Down
6 changes: 3 additions & 3 deletions e2e/download_sequence/simplejson-build-order.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "build-system",
"req": "flit_core<4,>=3.8",
"dist": "flit-core",
"version": "3.9.0",
"version": "3.10.1",
"why": [
[
"toplevel",
Expand All @@ -23,11 +23,11 @@
[
"build-system",
"flit_core<4,>=3.8",
"3.9.0"
"3.10.1"
]
],
"prebuilt": false,
"source_url": "https://files.pythonhosted.org/packages/c4/e6/c1ac50fe3eebb38a155155711e6e864e254ce4b6e17fe2429b4c4d5b9e80/flit_core-3.9.0.tar.gz#sha256=72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba",
"source_url": "https://files.pythonhosted.org/packages/d5/ae/09427bea9227a33ec834ed5461432752fd5d02b14f93dd68406c91684622/flit_core-3.10.1.tar.gz#sha256=66e5b87874a0d6e39691f0e22f09306736b633548670ad3c09ec9db03c5662f7",
"source_url_type": "sdist"
},
{
Expand Down
2 changes: 1 addition & 1 deletion e2e/test_download_sequence.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pass=true

# Check for output files
EXPECTED_FILES="
sdists-repo/downloads/flit_core-3.9.0.tar.gz
sdists-repo/downloads/flit_core-3.10.1.tar.gz
sdists-repo/downloads/setuptools-70.0.0.tar.gz
sdists-repo/downloads/simplejson-3.19.2.tar.gz
sdists-repo/downloads/wheel-0.43.0.tar.gz
Expand Down
6 changes: 3 additions & 3 deletions e2e/test_override.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fromager \
--wheels-repo="$OUTDIR/wheels-repo" \
--work-dir="$OUTDIR/work-dir" \
--patches-dir "$SCRIPTDIR/flit_core_patches" \
bootstrap 'flit_core==3.9.0'
bootstrap 'flit_core==3.10.1'

find "$OUTDIR/wheels-repo/simple/" -name '*.whl'

Expand All @@ -50,9 +50,9 @@ fi

# Check for output files
EXPECTED_FILES="
wheels-repo/downloads/flit_core-3.9.0-0-py3-none-any.whl
wheels-repo/downloads/flit_core-3.10.1-0-py3-none-any.whl

sdists-repo/downloads/flit_core-3.9.0.tar.gz
sdists-repo/downloads/flit_core-3.10.1.tar.gz
"

for f in $EXPECTED_FILES; do
Expand Down
4 changes: 2 additions & 2 deletions e2e/test_prebuilt_wheels_alt_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mkdir -p "$INIT"

# What are we building?
DIST="flit_core"
VERSION="3.9.0"
VERSION="3.10.1"

# Get the wheel we need from PyPI
fromager \
Expand Down Expand Up @@ -57,7 +57,7 @@ fromager \

# Ensure we have both expected wheels
EXPECTED_FILES="
wheels-repo/prebuilt/flit_core-3.9.0-0-py3-none-any.whl
wheels-repo/prebuilt/flit_core-3.10.1-0-py3-none-any.whl
wheels-repo/downloads/wheel-0.43.0-0-py3-none-any.whl
"

Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Utilities",
]
Expand Down Expand Up @@ -254,7 +255,7 @@ install-hooks = "pre-commit install"
pkglint = [
"python -m build",
"twine check dist/*.tar.gz dist/*.whl",
"check-python-versions --only pyproject.toml,.github/workflows/test.yml",
"check-python-versions --only pyproject.toml,.github/workflows/test.yaml",
]

[tool.hatch.envs.e2e]
Expand Down
Loading