make linting and tests work on multiple py versions

cloudpathlib/cloudpath.py

@@ -8,7 +8,6 @@
     PosixPath,
     PurePosixPath,
     WindowsPath,
-    _make_selector,
     _PathParents,
 )
 
@@ -46,8 +45,13 @@
 
 if sys.version_info >= (3, 12):
     from pathlib import posixpath as _posix_flavour  # type: ignore[attr-defined]
+    from pathlib import _make_selector  # type: ignore[attr-defined]
 else:
     from pathlib import _posix_flavour  # type: ignore[attr-defined]
+    from pathlib import _make_selector as _make_selector_pathlib  # type: ignore[attr-defined]
+
+    def _make_selector(pattern_parts, _flavour, case_sensitive=True):
+        return _make_selector_pathlib(tuple(pattern_parts), _flavour)
 
 
 from cloudpathlib.enums import FileCacheMode
@@ -730,7 +734,13 @@ def relative_to(self, other: Self, walk_up: bool = False) -> PurePosixPath:
             raise ValueError(
                 f"{self} is a {self.cloud_prefix} path, but {other} is a {other.cloud_prefix} path"
             )
-        return self._path.relative_to(other._path, walk_up=walk_up)  # type: ignore[call-arg]
+
+        kwargs = dict(walk_up=walk_up)
+
+        if sys.version_info < (3, 12):
+            kwargs.pop("walk_up")
+
+        return self._path.relative_to(other._path, **kwargs)  # type: ignore[call-arg]
 
     def is_relative_to(self, other: Self) -> bool:
         try:
@@ -748,7 +758,12 @@ def match(self, path_pattern: str, case_sensitive: Optional[bool] = None) -> boo
         if path_pattern.startswith(self.anchor + self.drive + "/"):
             path_pattern = path_pattern[len(self.anchor + self.drive + "/") :]
 
-        return self._dispatch_to_path("match", path_pattern, case_sensitive=case_sensitive)
+        kwargs = dict(case_sensitive=case_sensitive)
+
+        if sys.version_info < (3, 12):
+            kwargs.pop("case_sensitive")
+
+        return self._dispatch_to_path("match", path_pattern, **kwargs)
 
     @property
     def parent(self) -> Self:

tests/test_cloudpath_instantiation.py

@@ -121,7 +121,9 @@ def test_public_interface_is_superset(rig):
             # all parameters for Path method should be part of CloudPath signature
             for parameter in lp_signature.parameters:
                 # some parameters like _deprecated in Path.is_relative_to are not really part of the signature
-                if parameter.startswith("_"):
+                if parameter.startswith("_") or (
+                    name == "joinpath" and parameter in ["args", "pathsegments"]
+                ):  # handle arg name change in 3.12
                     continue
 
                 assert (
@@ -130,6 +132,12 @@ def test_public_interface_is_superset(rig):
 
             # extra parameters for CloudPath method should be optional with defaults
             for parameter, param_details in cp_signature.parameters.items():
+                if name == "joinpath" and parameter in [
+                    "args",
+                    "pathsegments",
+                ]:  # handle arg name change in 3.12
+                    continue
+
                 if parameter not in lp_signature.parameters:
                     assert (
                         param_details.default is not inspect.Parameter.empty