REF: run pyupgrade with Python 3.10+

pyproj/_crs.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Iterable
-from typing import Any, NamedTuple, Optional, Union
+from typing import Any, NamedTuple, Optional
 
 from pyproj.crs.enums import CoordinateOperationType
 from pyproj.enums import ProjVersion, WktVersion
@@ -34,9 +34,9 @@ class Base:
     def scope(self) -> str: ...
     def to_wkt(
         self,
-        version: Union[WktVersion, str] = WktVersion.WKT2_2019,
+        version: WktVersion | str = WktVersion.WKT2_2019,
         pretty: bool = False,
-        output_axis_rule: Optional[bool] = None,
+        output_axis_rule: bool | None = None,
     ) -> str: ...
     def to_json(self, pretty: bool = False, indentation: int = 2) -> str: ...
     def to_json_dict(self) -> dict: ...
@@ -55,28 +55,26 @@ class Ellipsoid(_CRSParts):
     is_semi_minor_computed: float
     inverse_flattening: float
     @staticmethod
-    def from_authority(auth_name: str, code: Union[int, str]) -> "Ellipsoid": ...
+    def from_authority(auth_name: str, code: int | str) -> "Ellipsoid": ...
     @staticmethod
-    def from_epsg(code: Union[int, str]) -> "Ellipsoid": ...
+    def from_epsg(code: int | str) -> "Ellipsoid": ...
     @staticmethod
     def from_string(ellipsoid_string: str) -> "Ellipsoid": ...
     @staticmethod
     def from_json_dict(ellipsoid_dict: dict) -> "Ellipsoid": ...
     @staticmethod
     def from_json(ellipsoid_json_str: str) -> "Ellipsoid": ...
     @staticmethod
-    def from_name(
-        ellipsoid_name: str, auth_name: Optional[str] = None
-    ) -> "Ellipsoid": ...
+    def from_name(ellipsoid_name: str, auth_name: str | None = None) -> "Ellipsoid": ...
 
 class PrimeMeridian(_CRSParts):
     longitude: float
     unit_conversion_factor: str
     unit_name: str
     @staticmethod
-    def from_authority(auth_name: str, code: Union[int, str]) -> "PrimeMeridian": ...
+    def from_authority(auth_name: str, code: int | str) -> "PrimeMeridian": ...
     @staticmethod
-    def from_epsg(code: Union[int, str]) -> "PrimeMeridian": ...
+    def from_epsg(code: int | str) -> "PrimeMeridian": ...
     @staticmethod
     def from_string(prime_meridian_string: str) -> "PrimeMeridian": ...
     @staticmethod
@@ -85,27 +83,27 @@ class PrimeMeridian(_CRSParts):
     def from_json(prime_meridian_json_str: str) -> "PrimeMeridian": ...
     @staticmethod
     def from_name(
-        prime_meridian_name: str, auth_name: Optional[str] = None
+        prime_meridian_name: str, auth_name: str | None = None
     ) -> "PrimeMeridian": ...
 
 class Datum(_CRSParts):
     type_name: str
     @property
-    def ellipsoid(self) -> Optional[Ellipsoid]: ...
+    def ellipsoid(self) -> Ellipsoid | None: ...
     @property
-    def prime_meridian(self) -> Optional[PrimeMeridian]: ...
+    def prime_meridian(self) -> PrimeMeridian | None: ...
     @staticmethod
-    def from_authority(auth_name: str, code: Union[int, str]) -> "Datum": ...
+    def from_authority(auth_name: str, code: int | str) -> "Datum": ...
     @staticmethod
-    def from_epsg(code: Union[int, str]) -> "Datum": ...
+    def from_epsg(code: int | str) -> "Datum": ...
     @staticmethod
     def from_string(datum_string: str) -> "Datum": ...
     @staticmethod
     def from_json_dict(datum_dict: dict) -> "Datum": ...
     @staticmethod
     def from_json(datum_json_str: str) -> "Datum": ...
     @staticmethod
-    def from_name(datum_name: str, auth_name: Optional[str] = None) -> "Datum": ...
+    def from_name(datum_name: str, auth_name: str | None = None) -> "Datum": ...
 
 class CoordinateSystem(_CRSParts):
     def __init__(self) -> None: ...
@@ -156,35 +154,31 @@ class CoordinateOperation(_CRSParts):
     @property
     def grids(self) -> Iterable[Grid]: ...
     @property
-    def area_of_use(self) -> Optional[AreaOfUse]: ...
+    def area_of_use(self) -> AreaOfUse | None: ...
     @property
     def towgs84(self) -> Iterable[float]: ...
     @property
     def operations(self) -> tuple["CoordinateOperation"]: ...
     def __init__(self) -> None: ...
     def __repr__(self) -> str: ...
     @staticmethod
-    def from_authority(
-        auth_name: str, code: Union[int, str]
-    ) -> "CoordinateOperation": ...
+    def from_authority(auth_name: str, code: int | str) -> "CoordinateOperation": ...
     @staticmethod
-    def from_epsg(code: Union[int, str]) -> "CoordinateOperation": ...
+    def from_epsg(code: int | str) -> "CoordinateOperation": ...
     @staticmethod
     def from_string(ellipsoid_string: str) -> "CoordinateOperation": ...
     @staticmethod
     def from_json_dict(ellipsoid_dict: dict) -> "CoordinateOperation": ...
     @staticmethod
     def from_json(ellipsoid_json_str: str) -> "CoordinateOperation": ...
-    def to_proj4(
-        self, version: Union[ProjVersion, int] = ProjVersion.PROJ_5
-    ) -> str: ...
+    def to_proj4(self, version: ProjVersion | int = ProjVersion.PROJ_5) -> str: ...
     @staticmethod
     def from_name(
         coordinate_operation_name: str,
-        auth_name: Optional[str] = None,
-        coordinate_operation_type: Union[
-            CoordinateOperationType, str
-        ] = CoordinateOperationType.CONVERSION,
+        auth_name: str | None = None,
+        coordinate_operation_type: (
+            CoordinateOperationType | str
+        ) = CoordinateOperationType.CONVERSION,
     ) -> "CoordinateOperation": ...
 
 class AuthorityMatchInfo(NamedTuple):
@@ -197,15 +191,15 @@ class _CRS(Base):
     type_name: str
     def __init__(self, proj_string: str) -> None: ...
     @property
-    def ellipsoid(self) -> Optional[Ellipsoid]: ...
+    def ellipsoid(self) -> Ellipsoid | None: ...
     @property
-    def area_of_use(self) -> Optional[AreaOfUse]: ...
+    def area_of_use(self) -> AreaOfUse | None: ...
     @property
     def axis_info(self) -> list[Axis]: ...
     @property
-    def prime_meridian(self) -> Optional[PrimeMeridian]: ...
+    def prime_meridian(self) -> PrimeMeridian | None: ...
     @property
-    def datum(self) -> Optional[Datum]: ...
+    def datum(self) -> Datum | None: ...
     @property
     def sub_crs_list(self) -> Iterable["_CRS"]: ...
     @property
@@ -215,21 +209,17 @@ class _CRS(Base):
     @property
     def geodetic_crs(self) -> Optional["_CRS"]: ...
     @property
-    def coordinate_system(self) -> Optional[CoordinateSystem]: ...
+    def coordinate_system(self) -> CoordinateSystem | None: ...
     @property
-    def coordinate_operation(self) -> Optional[CoordinateOperation]: ...
-    def to_proj4(
-        self, version: Union[ProjVersion, int] = ProjVersion.PROJ_5
-    ) -> str: ...
-    def to_epsg(self, min_confidence: int = 70) -> Optional[int]: ...
-    def to_authority(
-        self, auth_name: Optional[str] = None, min_confidence: int = 70
-    ): ...
+    def coordinate_operation(self) -> CoordinateOperation | None: ...
+    def to_proj4(self, version: ProjVersion | int = ProjVersion.PROJ_5) -> str: ...
+    def to_epsg(self, min_confidence: int = 70) -> int | None: ...
+    def to_authority(self, auth_name: str | None = None, min_confidence: int = 70): ...
     def list_authority(
-        self, auth_name: Optional[str] = None, min_confidence: int = 70
+        self, auth_name: str | None = None, min_confidence: int = 70
     ) -> list[AuthorityMatchInfo]: ...
-    def to_3d(self, name: Optional[str] = None) -> "_CRS": ...
-    def to_2d(self, name: Optional[str] = None) -> "_CRS": ...
+    def to_3d(self, name: str | None = None) -> "_CRS": ...
+    def to_2d(self, name: str | None = None) -> "_CRS": ...
     @property
     def is_geographic(self) -> bool: ...
     @property

pyproj/_crs.pyx

@@ -2776,7 +2776,7 @@ cdef class _CRS(Base):
 
         Returns
         -------
-        Optional[int]:
+        int | None:
             The best matching EPSG code matching the confidence level.
         """
         auth_info = self.to_authority(

pyproj/_datadir.pyi

@@ -1,8 +1,6 @@
-from typing import Optional
-
 def _pyproj_global_context_initialize() -> None: ...
 def get_user_data_dir(create: bool = False) -> str: ...
 def _global_context_set_data_dir() -> None: ...
-def set_use_global_context(active: Optional[bool] = None) -> None: ...
+def set_use_global_context(active: bool | None = None) -> None: ...
 def _clear_proj_error() -> None: ...
 def _get_proj_error() -> str: ...

pyproj/_network.pyi

@@ -1,5 +1,3 @@
-from typing import Optional
-
-def set_network_enabled(active: Optional[bool] = None) -> None: ...
+def set_network_enabled(active: bool | None = None) -> None: ...
 def is_network_enabled() -> bool: ...
 def _set_ca_bundle_path(ca_bundle_path: str) -> None: ...

pyproj/_transformer.pyi

@@ -1,6 +1,6 @@
 import numbers
 from array import array
-from typing import Any, NamedTuple, Optional, Union
+from typing import Any, NamedTuple
 
 from pyproj._crs import _CRS, AreaOfUse, Base, CoordinateOperation
 from pyproj.enums import ProjVersion, TransformDirection
@@ -37,9 +37,9 @@ class _TransformerGroup:
         crs_from: str,
         crs_to: str,
         always_xy: bool,
-        area_of_interest: Optional[AreaOfInterest],
-        authority: Optional[str],
-        accuracy: Optional[float],
+        area_of_interest: AreaOfInterest | None,
+        authority: str | None,
+        accuracy: float | None,
         allow_ballpark: bool,
         allow_superseded: bool,
     ) -> None: ...
@@ -62,30 +62,30 @@ class _Transformer(Base):
     @property
     def area_of_use(self) -> AreaOfUse: ...
     @property
-    def source_crs(self) -> Optional[_CRS]: ...
+    def source_crs(self) -> _CRS | None: ...
     @property
-    def target_crs(self) -> Optional[_CRS]: ...
+    def target_crs(self) -> _CRS | None: ...
     @property
-    def operations(self) -> Union[tuple[CoordinateOperation], None]: ...
+    def operations(self) -> tuple[CoordinateOperation] | None: ...
     def get_last_used_operation(self) -> _Transformer: ...
     @property
     def is_network_enabled(self) -> bool: ...
     def to_proj4(
         self,
-        version: Union[ProjVersion, str] = ProjVersion.PROJ_5,
+        version: ProjVersion | str = ProjVersion.PROJ_5,
         pretty: bool = False,
     ) -> str: ...
     @staticmethod
     def from_crs(
         crs_from: bytes,
         crs_to: bytes,
         always_xy: bool = False,
-        area_of_interest: Optional[AreaOfInterest] = None,
-        authority: Optional[str] = None,
-        accuracy: Optional[str] = None,
-        allow_ballpark: Optional[bool] = None,
+        area_of_interest: AreaOfInterest | None = None,
+        authority: str | None = None,
+        accuracy: str | None = None,
+        allow_ballpark: bool | None = None,
         force_over: bool = False,
-        only_best: Optional[bool] = None,
+        only_best: bool | None = None,
     ) -> "_Transformer": ...
     @staticmethod
     def from_pipeline(proj_pipeline: bytes) -> "_Transformer": ...
@@ -95,7 +95,7 @@ class _Transformer(Base):
         iny: Any,
         inz: Any,
         intime: Any,
-        direction: Union[TransformDirection, str],
+        direction: TransformDirection | str,
         radians: bool,
         errcheck: bool,
     ) -> None: ...
@@ -105,7 +105,7 @@ class _Transformer(Base):
         iny: numbers.Real,
         inz: numbers.Real,
         intime: numbers.Real,
-        direction: Union[TransformDirection, str],
+        direction: TransformDirection | str,
         radians: bool,
         errcheck: bool,
     ) -> None: ...
@@ -114,7 +114,7 @@ class _Transformer(Base):
         stride: int,
         inseq: array[float],
         switch: bool,
-        direction: Union[TransformDirection, str],
+        direction: TransformDirection | str,
         time_3rd: bool,
         radians: bool,
         errcheck: bool,
@@ -128,7 +128,7 @@ class _Transformer(Base):
         densify_pts: int = 21,
         radians: bool = False,
         errcheck: bool = False,
-        direction: Union[TransformDirection, str] = TransformDirection.FORWARD,
+        direction: TransformDirection | str = TransformDirection.FORWARD,
     ) -> tuple[float, float, float, float]: ...
     def _get_factors(
         self, longitude: Any, latitude: Any, radians: bool, errcheck: bool

pyproj/_transformer.pyx

@@ -403,7 +403,7 @@ cdef class _Transformer(Base):
 
         Returns
         -------
-        Optional[_CRS]:
+        _CRS | None:
             The source CRS of a CoordinateOperation.
         """
         if self._source_crs is not None:
@@ -431,7 +431,7 @@ cdef class _Transformer(Base):
 
         Returns
         -------
-        Optional[_CRS]:
+        _CRS | None:
             The target CRS of a CoordinateOperation.
         """
         if self._target_crs is not None:

pyproj/aoi.py

@@ -2,7 +2,7 @@
 This module contains the structures related to areas of interest.
 """
 from dataclasses import dataclass
-from typing import NamedTuple, Optional, Union
+from typing import NamedTuple, Union
 
 from pyproj.utils import is_null
 
@@ -53,7 +53,7 @@ class AreaOfUse(NamedTuple):
     #: North bound of area of use.
     north: float
     #: Name of area of use.
-    name: Optional[str] = None
+    name: str | None = None
 
     @property
     def bounds(self) -> tuple[float, float, float, float]:

pyproj/crs/coordinate_system.py

@@ -2,8 +2,6 @@
 This module is for building coordinate systems to be used when
 building a CRS.
 """
-from typing import Union
-
 from pyproj._crs import CoordinateSystem
 from pyproj.crs.enums import (
     Cartesian2DCSAxis,
@@ -63,7 +61,7 @@ class Ellipsoidal2DCS(CoordinateSystem):
 
     def __new__(
         cls,
-        axis: Union[Ellipsoidal2DCSAxis, str] = Ellipsoidal2DCSAxis.LONGITUDE_LATITUDE,
+        axis: Ellipsoidal2DCSAxis | str = Ellipsoidal2DCSAxis.LONGITUDE_LATITUDE,
     ):
         """
         Parameters
@@ -134,9 +132,9 @@ class Ellipsoidal3DCS(CoordinateSystem):
 
     def __new__(
         cls,
-        axis: Union[
-            Ellipsoidal3DCSAxis, str
-        ] = Ellipsoidal3DCSAxis.LONGITUDE_LATITUDE_HEIGHT,
+        axis: (
+            Ellipsoidal3DCSAxis | str
+        ) = Ellipsoidal3DCSAxis.LONGITUDE_LATITUDE_HEIGHT,
     ):
         """
         Parameters
@@ -282,7 +280,7 @@ class Cartesian2DCS(CoordinateSystem):
     """
 
     def __new__(
-        cls, axis: Union[Cartesian2DCSAxis, str] = Cartesian2DCSAxis.EASTING_NORTHING
+        cls, axis: Cartesian2DCSAxis | str = Cartesian2DCSAxis.EASTING_NORTHING
     ):
         """
         Parameters
@@ -365,7 +363,7 @@ class VerticalCS(CoordinateSystem):
     This generates an Vertical Coordinate System
     """
 
-    def __new__(cls, axis: Union[VerticalCSAxis, str] = VerticalCSAxis.GRAVITY_HEIGHT):
+    def __new__(cls, axis: VerticalCSAxis | str = VerticalCSAxis.GRAVITY_HEIGHT):
         """
         Parameters
         ----------