Skip to content

Commit e3afd2d

Browse files
henryiiihenryiii
authored
feat: drop Python 3.8 (#1004)
* feat: drop Python 3.8 Signed-off-by: Henry Schreiner <[email protected]> * coverage: patch subprocess Signed-off-by: Henry Schreiner <[email protected]> * Update coverage version in pyproject.toml --------- Signed-off-by: Henry Schreiner <[email protected]>
1 parent 0eee2e4 commit e3afd2d

14 files changed

Lines changed: 45 additions & 39 deletions

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ jobs:
2323
matrix:
2424
os: [ubuntu-latest, windows-latest, macos-latest]
2525
python-version:
26-
- "3.8"
27-
- "3.10"
28-
- "3.13"
26+
- "3.9"
27+
- "3.11"
2928
- "3.14"
3029
include:
3130
- os: ubuntu-22.04
@@ -53,7 +52,7 @@ jobs:
5352
uses: astral-sh/setup-uv@v7
5453
- name: Set up Miniconda
5554
uses: conda-incubator/setup-miniconda@v3
56-
if: matrix.python-version == '3.13'
55+
if: matrix.python-version == '3.11'
5756
with:
5857
auto-update-conda: true
5958
python-version: ${{ matrix.python-version }}

‎nox/_options.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import itertools
2222
import os
2323
import sys
24-
from typing import TYPE_CHECKING, Any, Callable, Literal, Sequence
24+
from typing import TYPE_CHECKING, Any, Callable, Literal
2525

2626
import argcomplete
2727

@@ -30,7 +30,7 @@
3030
from nox.virtualenv import ALL_VENVS
3131

3232
if TYPE_CHECKING:
33-
from collections.abc import Iterable
33+
from collections.abc import Iterable, Sequence
3434

3535
from nox._option_set import NoxOptions
3636

‎nox/_parametrize.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
import functools
1818
import itertools
19-
from typing import TYPE_CHECKING, Any, Iterable, Union
19+
from collections.abc import Iterable
20+
from typing import TYPE_CHECKING, Any, Union
2021

2122
if TYPE_CHECKING:
2223
from collections.abc import Callable, Sequence

‎nox/_resolver.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
from __future__ import annotations
1616

1717
import itertools
18-
from typing import Hashable, Iterable, Iterator, Mapping, TypeVar
18+
from collections.abc import Hashable, Iterable, Iterator, Mapping
19+
from typing import TypeVar
1920

2021
__all__ = ["CycleError", "lazy_stable_topo_sort"]
2122

‎nox/_typing.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414

1515
from __future__ import annotations
1616

17-
from typing import Sequence, Union
17+
from collections.abc import Sequence
18+
from typing import Union
1819

1920
__all__ = ["Python"]
2021

‎nox/manifest.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
import ast
1818
import itertools
1919
import operator
20-
from typing import TYPE_CHECKING, Any, Mapping, cast
20+
from collections.abc import Mapping
21+
from typing import TYPE_CHECKING, Any, cast
2122

2223
from nox._decorators import Call, Func
2324
from nox._resolver import CycleError, lazy_stable_topo_sort

‎nox/tasks.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
import json
2020
import os
2121
import sys
22-
from typing import TYPE_CHECKING, Sequence, TypeVar
22+
from collections.abc import Sequence
23+
from typing import TYPE_CHECKING, TypeVar
2324

2425
from colorlog.escape_codes import parse_colors
2526

‎nox/tox_to_nox.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424
from configparser import ConfigParser
2525
from pathlib import Path
2626
from subprocess import check_output
27-
from typing import Any, Iterable
27+
from typing import TYPE_CHECKING, Any
2828

2929
import jinja2
3030

31-
if sys.version_info < (3, 9):
32-
from importlib_resources import files
33-
else:
34-
from importlib.resources import files
31+
if TYPE_CHECKING:
32+
from collections.abc import Iterable
3533

34+
from importlib.resources import files
3635

3736
__all__ = ["main"]
3837

‎noxfile.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ def _check_python_version(session: nox.Session) -> None:
191191
python=[
192192
*ALL_PYTHONS,
193193
"pypy-3.11",
194+
"3.13t",
195+
"3.14t",
194196
],
195197
default=False,
196198
)
@@ -203,7 +205,6 @@ def github_actions_default_tests(session: nox.Session) -> None:
203205
@nox.session(
204206
python=[
205207
*ALL_PYTHONS,
206-
"pypy3.8",
207208
"pypy3.9",
208209
"pypy3.10",
209210
"pypy3.11",

‎pyproject.toml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ license = "Apache-2.0"
1818
authors = [
1919
{ name = "Alethea Katherine Flowers", email = "[email protected]" },
2020
]
21-
requires-python = ">=3.8"
21+
requires-python = ">=3.9"
2222
classifiers = [
2323
"Development Status :: 5 - Production/Stable",
2424
"Environment :: Console",
@@ -29,7 +29,6 @@ classifiers = [
2929
"Operating System :: Unix",
3030
"Programming Language :: Python",
3131
"Programming Language :: Python :: 3 :: Only",
32-
"Programming Language :: Python :: 3.8",
3332
"Programming Language :: Python :: 3.9",
3433
"Programming Language :: Python :: 3.10",
3534
"Programming Language :: Python :: 3.11",
@@ -54,7 +53,6 @@ optional-dependencies.pbs = [
5453
"pbs-installer[all]>=2025.1.6",
5554
]
5655
optional-dependencies.tox_to_nox = [
57-
"importlib-resources; python_version<'3.9'",
5856
"jinja2",
5957
"tox>=4",
6058
]
@@ -73,7 +71,7 @@ dev = [
7371
{ include-group = "test" },
7472
]
7573
test = [
76-
"coverage[toml]>=7.2",
74+
"coverage[toml]>=7.10.3",
7775
"pytest>=7.4; python_version>='3.12'",
7876
"pytest>=7; python_version<'3.12'",
7977
"pytest-cov>=3",
@@ -158,6 +156,7 @@ markers = [
158156

159157
[tool.coverage]
160158
run.branch = true
159+
run.patch = [ "subprocess" ]
161160
run.relative_files = true
162161
run.source_pkgs = [ "nox" ]
163162
run.disable_warnings = [

0 commit comments

Comments
 (0)