Skip to content

Commit 90a8aef

Browse files
authored
Revert "feat: drop Python 3.8 (#1004)" (#1060)
This reverts commit e3afd2d. Signed-off-by: Henry Schreiner <henryfs@princeton.edu>
1 parent 264f457 commit 90a8aef

14 files changed

Lines changed: 38 additions & 45 deletions

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ jobs:
2323
matrix:
2424
os: [ubuntu-latest, windows-latest, macos-latest]
2525
python-version:
26-
- "3.9"
27-
- "3.11"
26+
- "3.8"
27+
- "3.10"
28+
- "3.13"
2829
- "3.14"
2930
include:
3031
- os: ubuntu-22.04

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
24+
from typing import TYPE_CHECKING, Any, Callable, Literal, Sequence
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, Sequence
33+
from collections.abc import Iterable
3434

3535
from nox._option_set import NoxOptions
3636

nox/_parametrize.py

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

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

2221
if TYPE_CHECKING:
2322
from collections.abc import Callable, Sequence

nox/_resolver.py

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

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

2120
__all__ = ["CycleError", "lazy_stable_topo_sort"]
2221

nox/_typing.py

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

1515
from __future__ import annotations
1616

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

2019
__all__ = ["Python"]
2120

nox/manifest.py

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

2322
from nox._decorators import Call, Func
2423
from nox._resolver import CycleError, lazy_stable_topo_sort

nox/tasks.py

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

2524
from colorlog.escape_codes import parse_colors
2625

nox/tox_to_nox.py

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

2929
import jinja2
3030

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

34-
from importlib.resources import files
3536

3637
__all__ = ["main"]
3738

noxfile.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,6 @@ def _check_python_version(session: nox.Session) -> None:
191191
python=[
192192
*ALL_PYTHONS,
193193
"pypy-3.11",
194-
"3.13t",
195-
"3.14t",
196194
],
197195
default=False,
198196
)
@@ -205,6 +203,7 @@ def github_actions_default_tests(session: nox.Session) -> None:
205203
@nox.session(
206204
python=[
207205
*ALL_PYTHONS,
206+
"pypy3.8",
208207
"pypy3.9",
209208
"pypy3.10",
210209
"pypy3.11",

pyproject.toml

Lines changed: 4 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 = "me@thea.codes" },
2020
]
21-
requires-python = ">=3.9"
21+
requires-python = ">=3.8"
2222
classifiers = [
2323
"Development Status :: 5 - Production/Stable",
2424
"Environment :: Console",
@@ -29,6 +29,7 @@ classifiers = [
2929
"Operating System :: Unix",
3030
"Programming Language :: Python",
3131
"Programming Language :: Python :: 3 :: Only",
32+
"Programming Language :: Python :: 3.8",
3233
"Programming Language :: Python :: 3.9",
3334
"Programming Language :: Python :: 3.10",
3435
"Programming Language :: Python :: 3.11",
@@ -52,6 +53,7 @@ optional-dependencies.pbs = [
5253
"pbs-installer[all]>=2025.1.6",
5354
]
5455
optional-dependencies.tox-to-nox = [
56+
"importlib-resources; python_version<'3.9'",
5557
"jinja2",
5658
"tox>=4",
5759
]
@@ -70,7 +72,7 @@ dev = [
7072
{ include-group = "test" },
7173
]
7274
test = [
73-
"coverage[toml]>=7.10.3",
75+
"coverage[toml]>=7.2",
7476
"pytest>=7.4; python_version>='3.12'",
7577
"pytest>=7; python_version<'3.12'",
7678
"pytest-cov>=3",
@@ -132,9 +134,7 @@ markers = [
132134
]
133135

134136
[tool.coverage]
135-
run.core = "sysmon"
136137
run.branch = true
137-
run.patch = [ "subprocess" ]
138138
run.relative_files = true
139139
run.source_pkgs = [ "nox" ]
140140
run.disable_warnings = [

0 commit comments

Comments
 (0)