Merge pull request #459 from DagsHub/chore/remove-cached-property

Infra: drop Python 3.7 polyfills

dagshub/common/api/repo.py

@@ -17,10 +17,7 @@
 from dagshub.common.util import multi_urljoin
 from functools import partial
 
-try:
-    from functools import cached_property
-except ImportError:
-    from cached_property import cached_property
+from functools import cached_property
 
 from typing import Optional, Tuple, Any, List, Union
 

dagshub/common/api/responses.py

@@ -2,10 +2,7 @@
 from pathlib import PurePosixPath
 from typing import Optional, Dict, List
 
-try:
-    from functools import cached_property
-except ImportError:
-    from cached_property import cached_property
+from functools import cached_property
 
 
 @dataclass

dagshub/common/download.py

@@ -10,10 +10,7 @@
 
 from dagshub.common import config
 
-try:
-    from typing import Literal
-except ImportError:
-    from typing_extensions import Literal
+from typing import Literal
 
 import re
 import rich.progress

dagshub/data_engine/client/data_client.py

@@ -28,10 +28,7 @@
 from dagshub.data_engine.model.errors import DataEngineGqlError
 from dagshub.data_engine.model.query_result import QueryResult
 
-try:
-    from functools import cached_property
-except ImportError:
-    from cached_property import cached_property
+from functools import cached_property
 
 if TYPE_CHECKING:
     from dagshub.data_engine.datasources import DatasourceState

dagshub/data_engine/model/datasource_state.py

@@ -11,10 +11,7 @@
 from dagshub.data_engine.model.errors import DatasourceAlreadyExistsError, DatasourceNotFoundError
 from dagshub.common.util import multi_urljoin
 
-try:
-    from functools import cached_property
-except ImportError:
-    from cached_property import cached_property
+from functools import cached_property
 
 logger = logging.getLogger(__name__)
 

dagshub/repo_bucket.py

@@ -1,7 +1,4 @@
-try:
-    from typing import Literal
-except ImportError:
-    from typing_extensions import Literal
+from typing import Literal
 
 from dagshub.common.api.repo import RepoAPI
 from dagshub.auth import get_token

dagshub/streaming/dataclasses.py

@@ -1,11 +1,7 @@
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Optional, TYPE_CHECKING
-
-try:
-    from functools import cached_property
-except ImportError:
-    from cached_property import cached_property
+from functools import cached_property
 
 if TYPE_CHECKING:
     from dagshub.streaming import DagsHubFilesystem
@@ -39,7 +35,9 @@ def __post_init__(self):
             for storage_schema in storage_schemas:
                 if str_path.startswith(f"{storage_schema}:/"):
                     str_path = str_path[len(storage_schema) + 2 :]
-                    self.relative_path = Path(".dagshub/storage") / storage_schema / str_path
+                    self.relative_path = (
+                        Path(".dagshub/storage") / storage_schema / str_path
+                    )
                     self.absolute_path = self.fs.project_root / self.relative_path
 
     @cached_property

dagshub/streaming/filesystem.py

@@ -7,7 +7,7 @@
 import subprocess
 import sys
 from configparser import ConfigParser
-from functools import wraps
+from functools import wraps, cached_property
 from multiprocessing import AuthenticationError
 from os import PathLike
 from pathlib import Path, PurePosixPath
@@ -31,10 +31,6 @@
 if PRE_PYTHON3_11:
     from pathlib import _NormalAccessor as _pathlib  # noqa: E402
 
-try:
-    from functools import cached_property
-except ImportError:
-    from cached_property import cached_property
 
 T = TypeVar("T")
 logger = logging.getLogger(__name__)

setup.py

@@ -1,4 +1,3 @@
-import sys
 import setuptools
 import os.path
 
@@ -50,13 +49,6 @@ def get_version(rel_path: str) -> str:
     "fuse": ["fusepy>=3"],
 }
 
-# Polyfills for Python 3.7
-if sys.version_info.major == 3 and sys.version_info.minor == 7:
-    install_requires += [
-        "cached-property==1.5.2",
-        "typing_extensions",
-    ]
-
 packages = setuptools.find_packages(exclude=["tests", "tests.*"])
 
 setuptools.setup(