Merge pull request #66 from mrc-ide/python-pi

Update Python version

Author: plietar

.github/workflows/test.yml

@@ -16,13 +16,13 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: ubuntu-latest,  py: '3.9'}
           - {os: ubuntu-latest,  py: '3.10'}
           - {os: ubuntu-latest,  py: '3.11'}
           - {os: ubuntu-latest,  py: '3.12'}
           - {os: ubuntu-latest,  py: '3.13'}
-          - {os: macos-latest,   py: '3.13'}
-          - {os: windows-latest, py: '3.13'}
+          - {os: ubuntu-latest,  py: '3.14'}
+          - {os: macos-latest,   py: '3.14'}
+          - {os: windows-latest, py: '3.14'}
 
     steps:
       - uses: actions/checkout@v3

pyproject.toml

@@ -16,12 +16,11 @@ authors = [
 classifiers = [
   "Development Status :: 4 - Beta",
   "Programming Language :: Python",
-  "Programming Language :: Python :: 3.8",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "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",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
@@ -79,7 +78,7 @@ generate-docs = [
 ]
 
 [[tool.hatch.envs.all.matrix]]
-python = ["3.9", "3.10", "3.11", "3.12", "3.13"]
+python = ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
 [tool.hatch.envs.lint]
 extra-dependencies = [
@@ -109,6 +108,7 @@ skip-string-normalization = true
 
 [tool.ruff]
 line-length = 120
+target-version = "py310"
 
 [tool.ruff.lint]
 select = [

src/pyorderly/core.py

@@ -3,7 +3,6 @@
 from dataclasses import dataclass
 from pathlib import Path
 from types import SimpleNamespace
-from typing import Union
 
 from dataclasses_json import dataclass_json
 
@@ -26,7 +25,7 @@ class Artefact:
 class Description:
     display: str
     long: str
-    custom: dict[str, Union[str, int, bool]]
+    custom: dict[str, str | int | bool]
 
     @staticmethod
     def empty():
@@ -112,7 +111,7 @@ def resource(files):
 
 
 def shared_resource(
-    files: Union[str, list[str], dict[str, str]],
+    files: str | list[str] | dict[str, str],
 ) -> dict[str, str]:
     """Copy shared resources into a packet directory.
 

src/pyorderly/current.py

@@ -1,7 +1,6 @@
 import os
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional
 
 from pyorderly.outpack.packet import Packet
 from pyorderly.outpack.root import OutpackRoot, root_open
@@ -19,7 +18,7 @@ def __init__(self):
 @dataclass
 class OrderlyContext:
     # The active packet, if one is running
-    packet: Optional[Packet]
+    packet: Packet | None
     # the path to the packet running directory. This is a pathlib Path object
     path: Path
     # the path to the packet source
@@ -33,7 +32,7 @@ class OrderlyContext:
     # Special orderly custom metadata
     orderly: OrderlyCustomMetadata
     # Options used when searching for dependencies
-    search_options: Optional[SearchOptions]
+    search_options: SearchOptions | None
 
     @staticmethod
     def from_packet(packet, path_src, search_options=None):

src/pyorderly/outpack/config.py

@@ -1,6 +1,5 @@
 import os.path
 from dataclasses import dataclass, field
-from typing import Optional
 
 from dataclasses_json import config, dataclass_json
 
@@ -37,7 +36,7 @@ def _decode_location_dict(d):
 @dataclass
 class ConfigCore:
     hash_algorithm: str
-    path_archive: Optional[str]
+    path_archive: str | None
     use_file_store: bool
     require_complete_tree: bool
 

src/pyorderly/outpack/location.py

@@ -1,7 +1,7 @@
 import collections
 import shutil
 from pathlib import PurePath
-from typing import Union
+from typing import TypeAlias
 
 from pyorderly.outpack.config import Location, update_config
 from pyorderly.outpack.location_driver import LocationDriver
@@ -17,7 +17,7 @@
     LOCATION_RESERVED_NAME,
 )
 
-LocationSelector = Union[None, str, list[str]]
+LocationSelector: TypeAlias = None | str | list[str]
 
 
 def outpack_location_list(root=None, *, locate=True):

src/pyorderly/outpack/location_packit.py

@@ -1,6 +1,5 @@
 import functools
 import re
-from typing import Optional
 from urllib.parse import urljoin
 
 from pyorderly.outpack.location_http import (
@@ -19,7 +18,7 @@
 # - It should check for expiry of tokens and/or check for authentication errors
 #   and purge offending tokens from it.
 @functools.cache
-def packit_authorisation(url: str, token: Optional[str]) -> dict[str, str]:
+def packit_authorisation(url: str, token: str | None) -> dict[str, str]:
     # If a non-Github token is provided, we assume it is a native Packit token
     # and use that directly.
     if token is not None:
@@ -45,7 +44,7 @@ def packit_authorisation(url: str, token: Optional[str]) -> dict[str, str]:
 
 
 def outpack_location_packit(
-    url: str, token: Optional[str] = None
+    url: str, token: str | None = None
 ) -> OutpackLocationHTTP:
     if not url.endswith("/"):
         url += "/"

src/pyorderly/outpack/location_pull.py

@@ -4,7 +4,6 @@
 from collections.abc import Generator
 from contextlib import contextmanager
 from dataclasses import dataclass
-from typing import Optional, Union
 
 import humanize
 
@@ -136,11 +135,11 @@ def _mark_all_known(
 
 
 def outpack_location_pull_packet(
-    ids: Union[str, list[str]],
+    ids: str | list[str],
     *,
-    options: Optional[SearchOptions] = None,
-    recursive: Optional[bool] = None,
-    root: Union[str, OutpackRoot, None] = None,
+    options: SearchOptions | None = None,
+    recursive: bool | None = None,
+    root: str | OutpackRoot | None = None,
     locate: bool = True,
 ):
     root = root_open(root, locate=locate)
@@ -356,9 +355,9 @@ class PullPlanPackets:
 
 def location_build_pull_plan(
     packet_ids: list[str],
-    locations: Optional[list[str]],
+    locations: list[str] | None,
     *,
-    files: Optional[dict[str, list[str]]] = None,
+    files: dict[str, list[str]] | None = None,
     recursive: bool,
     root: OutpackRoot,
 ) -> LocationPullPlan:
@@ -432,7 +431,7 @@ def _location_build_pull_plan_packets(
 
 
 def _location_build_pull_plan_location(
-    packets: PullPlanPackets, locations: Optional[list[str]], root: OutpackRoot
+    packets: PullPlanPackets, locations: list[str] | None, root: OutpackRoot
 ) -> list[str]:
     location_names = location_resolve_valid(
         locations,

src/pyorderly/outpack/location_push.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Union
 
 from pyorderly.outpack.location import (
     _find_all_dependencies,
@@ -19,10 +18,10 @@ class LocationPushPlan:
 
 
 def outpack_location_push(
-    ids: Union[str, list[str]],
+    ids: str | list[str],
     location: str,
     *,
-    root: Union[str, OutpackRoot, None] = None,
+    root: str | OutpackRoot | None = None,
     locate: bool = True,
 ):
     root = root_open(root, locate=locate)

src/pyorderly/outpack/metadata.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional, Union
+from typing import TypeAlias
 
 from dataclasses_json import DataClassJsonMixin
 
@@ -51,7 +51,7 @@ def files_from_dict(files):
         return [{"here": h, "there": t} for h, t, in files.items()]
 
 
-Parameters = dict[str, Union[bool, int, float, str]]
+Parameters: TypeAlias = dict[str, bool | int | float | str]
 
 
 @dataclass
@@ -63,8 +63,8 @@ class MetadataCore(DataClassJsonMixin):
     time: dict[str, float]
     files: list[PacketFile]
     depends: list[PacketDepends]
-    git: Optional[GitInfo]
-    custom: Optional[dict]
+    git: GitInfo | None
+    custom: dict | None
 
     def file_hash(self, name):
         for x in self.files: