Skip to content

Commit 8ebd737

Browse files
authored
Merge pull request #122 from rsb-23/version-updates
Dropped support for py3.8 and added for py3.14, per support policy.
2 parents e2403a2 + 4157b4d commit 8ebd737

6 files changed

Lines changed: 18 additions & 24 deletions

File tree

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
12-
- uses: actions/setup-python@v5.1.1
12+
- uses: actions/setup-python@v6
1313
with:
14-
python-version: 3.9
14+
python-version: "3.10"
1515
cache: 'pip'
1616

1717
- name: Install dependencies

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ jobs:
55
runs-on: ubuntu-latest
66
strategy:
77
matrix:
8-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
8+
python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13', '3.14' ]
99
steps:
1010
- uses: actions/checkout@v4
1111
- name: Setup Python ${{ matrix.python-version }}
12-
uses: actions/setup-python@v5
12+
uses: actions/setup-python@v6
1313
with:
1414
python-version: ${{ matrix.python-version }}
1515
- name: Install Requirements

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
repos:
22
- repo: https://github.com/PyCQA/isort
3-
rev: 5.13.2
3+
rev: 7.0.0
44
hooks:
55
- id: isort
66

77
- repo: https://github.com/psf/black
8-
rev: 24.10.0
8+
rev: 25.9.0
99
hooks:
1010
- id: black
1111

1212
- repo: https://github.com/pre-commit/pre-commit-hooks
13-
rev: v5.0.0
13+
rev: v6.0.0
1414
hooks:
1515
- id: check-yaml
1616
- id: check-toml
@@ -19,7 +19,7 @@ repos:
1919
args: [ -b, main, -b, master ]
2020

2121
- repo: https://github.com/PyCQA/flake8
22-
rev: 7.1.1
22+
rev: 7.3.0
2323
hooks:
2424
- id: flake8
2525
additional_dependencies: [ flake8-pyproject ]

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies = [
1111
"python-dateutil >= 2.7.0; python_version >= '3.10'",
1212
"pytz >= 2019.1",
1313
]
14-
requires-python = ">= 3.8"
14+
requires-python = ">= 3.9"
1515
authors = [
1616
{name = "Jeffrey Harris", email = "jeffrey@osafoundation.org"},
1717
]
@@ -29,12 +29,12 @@ classifiers = [
2929
"Operating System :: OS Independent",
3030
"Programming Language :: Python",
3131
"Programming Language :: Python :: 3",
32-
"Programming Language :: Python :: 3.8",
3332
"Programming Language :: Python :: 3.9",
3433
"Programming Language :: Python :: 3.10",
3534
"Programming Language :: Python :: 3.11",
3635
"Programming Language :: Python :: 3.12",
3736
"Programming Language :: Python :: 3.13",
37+
"Programming Language :: Python :: 3.14",
3838
"Topic :: Text Processing",
3939
]
4040

@@ -97,7 +97,7 @@ multi_line_output = 3
9797

9898
[tool.tox]
9999
requires = ["tox>=4.19"]
100-
env_list = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
100+
env_list = ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
101101

102102
[tool.tox.env_run_base]
103103
description = "Run test under {base_python}"

tests/test_cli.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import subprocess
2-
from typing import List
32

43

54
class Cli:
65
ics_diff = "ics_diff"
76
change_tz = "change_tz"
87

98

10-
def run_cli_tool(toolname: str, args: List[str]):
9+
def run_cli_tool(toolname: str, args: list[str]):
1110
return subprocess.run([toolname] + args, capture_output=True, text=True, check=False)
1211

1312

tests/test_icalendar.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
import datetime
22
import io
33
import re
4+
import zoneinfo
45

56
import dateutil
67
import pytest
78

89
import vobject
910

10-
# Only available from CPython 3.9 onwards
11-
try:
12-
import zoneinfo
13-
except ImportError:
14-
pass
15-
16-
1711
timezones = (
1812
"BEGIN:VTIMEZONE\r\n"
1913
"TZID:US/Pacific\r\n"
@@ -552,10 +546,11 @@ def test_omits_dst_offset():
552546
tz = dateutil.tz.gettz("America/New_York")
553547
assert tz is not None
554548
_timezones.append(tz)
555-
if "zoneinfo" in globals():
556-
tz = zoneinfo.ZoneInfo("America/New_York")
557-
assert tz is not None
558-
_timezones.append(tz)
549+
550+
# zoneinfo
551+
tz = zoneinfo.ZoneInfo("America/New_York")
552+
assert tz is not None
553+
_timezones.append(tz)
559554

560555
for tz in _timezones:
561556
dt = datetime.datetime(2020, 1, 1)

0 commit comments

Comments
 (0)