Upgrade to Python 3.10 (facebookresearch#723)

Author: cbalioglu

.github/workflows/_build_wheels.yaml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         torch: ['2.2.0', '2.2.1', '2.2.2']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
         variant: ['cpu', 'cu118', 'cu121']
         sanitizers: ['nosan']
     with:
@@ -42,7 +42,7 @@ jobs:
       fail-fast: false
       matrix:
         torch: ['2.3.0', '2.3.1']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
         variant: ['cpu', 'cu118', 'cu121']
         sanitizers: ['nosan']
     with:
@@ -59,7 +59,7 @@ jobs:
       fail-fast: false
       matrix:
         torch: ['2.4.0']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
         variant: ['cpu', 'cu118', 'cu121']
         sanitizers: ['nosan']
         include:
@@ -93,7 +93,7 @@ jobs:
       fail-fast: false
       matrix:
         torch: ['2.4.0']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
     with:
       torch: ${{ matrix.torch }}
       py: ${{ matrix.py }}
@@ -107,7 +107,7 @@ jobs:
       fail-fast: false
       matrix:
         torch: ['2.4.0']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
         variant: ['cu121']
     with:
       torch: ${{ matrix.torch }}
@@ -125,7 +125,7 @@ jobs:
       fail-fast: false
       matrix:
         torch: ['2.4.0']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
     with:
       torch: ${{ matrix.torch }}
       py: ${{ matrix.py }}

.github/workflows/_publish.yaml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         torch: ['2.2.0', '2.2.1', '2.2.2']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
         variant: ['cpu', 'cu118', 'cu121']
       max-parallel: 1
     uses: ./.github/workflows/_publish_s3.yaml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       matrix:
         torch: ['2.3.0', '2.3.1']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
         variant: ['cpu', 'cu118', 'cu121']
       max-parallel: 1
     uses: ./.github/workflows/_publish_s3.yaml
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         torch: ['2.4.0']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
         variant: ['cpu', 'cu118', 'cu121']
       max-parallel: 1
     uses: ./.github/workflows/_publish_s3.yaml
@@ -68,7 +68,7 @@ jobs:
     strategy:
       matrix:
         torch: ['2.4.0']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
       max-parallel: 1
     uses: ./.github/workflows/_publish_s3.yaml
     with:
@@ -91,7 +91,7 @@ jobs:
     strategy:
       matrix:
         torch: ['2.4.0']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
         variant: ['cu121']
       max-parallel: 1
     with:
@@ -109,7 +109,7 @@ jobs:
     strategy:
       matrix:
         torch: ['2.4.0']
-        py: ['3.9', '3.10', '3.11', '3.12']
+        py: ['3.10', '3.11', '3.12']
       max-parallel: 1
     with:
       os: 'macos'

.github/workflows/ci_build_wheels.yaml

@@ -46,7 +46,7 @@ jobs:
 
           # Lowest Supported Version
           - torch: '2.2.0'
-            py: '3.9'
+            py: '3.10'
             variant: 'cpu'
             sanitizers: 'nosan'
             run_integration_tests: false
@@ -69,7 +69,7 @@ jobs:
 
           # Lowest Supported Version
           - torch: '2.2.0'
-            py: '3.9'
+            py: '3.10'
     with:
       torch: ${{ matrix.torch }}
       py: ${{ matrix.py }}

README.md

@@ -93,19 +93,19 @@ matrix shows the supported combinations.
     <tr>
       <td rowspan=3><code>HEAD</code></td>
       <td><code>2.4.0</code></td>
-      <td><code>&gt;=3.9</code>, <code>&lt;=3.12</code></td>
+      <td><code>&gt;=3.10</code>, <code>&lt;=3.12</code></td>
       <td><code>cpu</code>, <code>cu118</code>, <code>cu121</code></td>
       <td><code>x86_64</code></td>
     </tr>
     <tr>
       <td><code>2.3.0</code>, <code>2.3.1</code></td>
-      <td><code>&gt;=3.9</code>, <code>&lt;=3.12</code></td>
+      <td><code>&gt;=3.10</code>, <code>&lt;=3.12</code></td>
       <td><code>cpu</code>, <code>cu118</code>, <code>cu121</code></td>
       <td><code>x86_64</code></td>
     </tr>
     <tr>
       <td><code>2.2.0</code>, <code>2.2.1</code>, <code>2.2.2</code></td>
-      <td><code>&gt;=3.9</code>, <code>&lt;=3.12</code></td>
+      <td><code>&gt;=3.10</code>, <code>&lt;=3.12</code></td>
       <td><code>cpu</code>, <code>cu118</code>, <code>cu121</code></td>
       <td><code>x86_64</code></td>
     </tr>

native/python/setup.py

@@ -7,7 +7,7 @@
 from __future__ import annotations
 
 from os import path
-from typing import Final, Optional
+from typing import Final
 
 import torch
 from setuptools import Command, find_packages, setup
@@ -88,7 +88,7 @@ def run(self) -> None:
 
         self._cmake_install(component="python")
 
-    def _cmake_install(self, component: Optional[str] = None) -> None:
+    def _cmake_install(self, component: str | None = None) -> None:
         cmd = ["cmake", "--install", self.cmake_build_dir]
 
         if component:

native/python/src/fairseq2n/__init__.py

@@ -13,7 +13,6 @@
 from ctypes import CDLL, RTLD_GLOBAL
 from os import environ
 from pathlib import Path
-from typing import Optional
 
 from fairseq2n.config import (
     _CUDA_VERSION,
@@ -59,7 +58,7 @@ def supports_cuda() -> bool:
     return _SUPPORTS_CUDA
 
 
-def cuda_version() -> Optional[tuple[int, int]]:
+def cuda_version() -> tuple[int, int] | None:
     """Return the version of CUDA that fairseq2n supports.
 
     :returns:
@@ -124,7 +123,7 @@ def _load_sndfile() -> None:
     _libs.append(libsndfile)
 
 
-def _load_shared_library(lib_name: str) -> Optional[CDLL]:
+def _load_shared_library(lib_name: str) -> CDLL | None:
     # In Conda environments, we always expect native libraries to be part of the
     # environment, so we skip the default lookup rules of the dynamic linker.
     if not "CONDA_PREFIX" in environ:

pyproject.toml

@@ -21,7 +21,7 @@ disable_error_code = "type-abstract,typeddict-unknown-key"
 disallow_untyped_calls = false
 disallow_untyped_decorators = false
 files = "setup.py,src,tests"
-python_version = 3.9
+python_version = "3.10"
 show_error_codes = true
 show_error_context = true
 strict = true

setup.py

@@ -33,7 +33,6 @@
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
@@ -46,7 +45,7 @@
         "fairseq2.assets.cards": ["**/*.yaml"],
     },
     zip_safe=False,
-    python_requires=">=3.9",
+    python_requires=">=3.10",
     install_requires=[
         "editdistance~=0.8",
         "fairseq2n" + fairseq2n_version_spec,
@@ -62,7 +61,7 @@
         "tiktoken~=0.7",
         "torcheval~=0.0.6",
         "tqdm~=4.62",
-        "typing_extensions~=4.12;python_version<'3.10'",
+        "typing_extensions~=4.12",
     ],
     extras_require={
         "arrow": ["pyarrow>=13.0.0", "pandas~=2.0.0"],

src/fairseq2/assets/card.py

@@ -10,7 +10,7 @@
 import re
 from collections.abc import Mapping, MutableMapping, Set
 from pathlib import Path
-from typing import Any, Final, Optional, TypeVar, final
+from typing import Any, Final, TypeVar, final
 from urllib.parse import urlparse, urlunparse
 
 from fairseq2.assets.error import AssetError
@@ -25,10 +25,10 @@ class AssetCard:
 
     _name: str
     _metadata: MutableMapping[str, Any]
-    _base: Optional[AssetCard]
+    _base: AssetCard | None
 
     def __init__(
-        self, metadata: MutableMapping[str, Any], base: Optional[AssetCard] = None
+        self, metadata: MutableMapping[str, Any], base: AssetCard | None = None
     ) -> None:
         """
         :param metadata:
@@ -143,7 +143,7 @@ def metadata(self) -> Mapping[str, Any]:
         return self._metadata
 
     @property
-    def base(self) -> Optional[AssetCard]:
+    def base(self) -> AssetCard | None:
         """The card that this card derives from."""
         return self._base
 
@@ -187,7 +187,7 @@ def as_(
         type_hint: Any,
         *,
         allow_empty: bool = False,
-        value_converter: Optional[ValueConverter] = None,
+        value_converter: ValueConverter | None = None,
         set_empty: bool = False,
     ) -> Any:
         """Return the value of this field.
@@ -297,10 +297,10 @@ def as_filename(self) -> str:
     def get_as_(
         self,
         type_hint: Any,
-        default: Optional[T] = None,
+        default: T | None = None,
         *,
         allow_empty: bool = False,
-        value_converter: Optional[ValueConverter] = None,
+        value_converter: ValueConverter | None = None,
         set_empty: bool = False,
     ) -> Any:
         """Return the value of this field if it exists; otherwise, return ``default``.
@@ -331,7 +331,7 @@ def set(
         value: Any,
         *,
         type_hint: Any = None,
-        value_converter: Optional[ValueConverter] = None,
+        value_converter: ValueConverter | None = None,
     ) -> None:
         """Set the value of this field.
 

src/fairseq2/assets/download_manager.py

@@ -15,7 +15,7 @@
 from shutil import rmtree
 from tarfile import TarFile, is_tarfile
 from tempfile import NamedTemporaryFile
-from typing import Optional, final
+from typing import final
 from urllib.error import HTTPError, URLError
 from urllib.parse import unquote, urlparse
 from urllib.request import Request, urlopen
@@ -41,7 +41,7 @@ def download_checkpoint(
         uri: str,
         model_name: str,
         *,
-        shard_idx: Optional[int] = None,
+        shard_idx: int | None = None,
         force: bool = False,
         progress: bool = True,
     ) -> Path:
@@ -68,7 +68,7 @@ def download_tokenizer(
         uri: str,
         model_name: str,
         *,
-        tokenizer_name: Optional[str] = None,
+        tokenizer_name: str | None = None,
         force: bool = False,
         progress: bool = True,
     ) -> Path:
@@ -137,7 +137,7 @@ def download_checkpoint(
         uri: str,
         model_name: str,
         *,
-        shard_idx: Optional[int] = None,
+        shard_idx: int | None = None,
         force: bool = False,
         progress: bool = True,
     ) -> Path:
@@ -158,7 +158,7 @@ def download_tokenizer(
         uri: str,
         model_name: str,
         *,
-        tokenizer_name: Optional[str] = None,
+        tokenizer_name: str | None = None,
         force: bool = False,
         progress: bool = True,
     ) -> Path:
@@ -191,11 +191,11 @@ class _AssetDownloadOp:
     _cache_dir: Path
     _uri: str
     _uri_params: dict[str, str]
-    _asset_dir: Optional[Path]
+    _asset_dir: Path | None
     _display_name: str
     _force: bool
     _progress: bool
-    _shard_idx: Optional[int]
+    _shard_idx: int | None
 
     def __init__(
         self,
@@ -204,7 +204,7 @@ def __init__(
         display_name: str,
         force: bool,
         progress: bool,
-        shard_idx: Optional[int] = None,
+        shard_idx: int | None = None,
     ) -> None:
         self._cache_dir = cache_dir
         self._uri = uri
@@ -291,7 +291,7 @@ def _check_if_gated_asset(self) -> None:
                 f"The {self._display_name} is gated. Please visit {self._uri} to learn how to get access."
             )
 
-    def _try_uri_as_path(self) -> Optional[Path]:
+    def _try_uri_as_path(self) -> Path | None:
         if self._uri.startswith("file://"):
             return Path(unquote(self._uri[7:]))