Skip to content

Avoid using the deprecated LooseVersion #16162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 21, 2022
Merged

Avoid using the deprecated LooseVersion #16162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42f11b8
Avoid using the deprecated `LooseVersion`
carmocca Dec 21, 2022
f69de92
Revert
carmocca Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/lightning_app/storage/path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
import os
import pathlib
import shutil
from distutils.version import LooseVersion
from platform import python_version
import sys
from time import sleep
from typing import Any, List, Optional, Sequence, TYPE_CHECKING, Union

Expand Down Expand Up @@ -54,7 +53,7 @@ def _from_parts(cls, args: Any, **__unused) -> "Path":
parts[0] = parts[0][len("lit://") :]
args = (_storage_root_dir(), *parts)

if LooseVersion(python_version()) < "3.10":
if (sys.version_info.major, sys.version_info.minor) < (3, 10):
__unused.setdefault("init", True)
new_path = super()._from_parts(args, **__unused)
else:
Expand Down
4 changes: 2 additions & 2 deletions src/pytorch_lightning/trainer/connectors/signal_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import pytorch_lightning as pl
from lightning_lite.plugins.environments import SLURMEnvironment
from lightning_lite.utilities.imports import _IS_WINDOWS
from pytorch_lightning.utilities.imports import _fault_tolerant_training
from pytorch_lightning.utilities.imports import _fault_tolerant_training, _PYTHON_GREATER_EQUAL_3_8_0
from pytorch_lightning.utilities.rank_zero import rank_zero_info

# copied from signal.pyi
Expand Down Expand Up @@ -135,7 +135,7 @@ def _valid_signals() -> Set[signal.Signals]:
Behaves identically to :func:`signals.valid_signals` in Python 3.8+ and implements the equivalent behavior for
older Python versions.
"""
if sys.version_info >= (3, 8):
if _PYTHON_GREATER_EQUAL_3_8_0:
return signal.valid_signals()
elif _IS_WINDOWS:
# supported signals on Windows: https://docs.python.org/3/library/signal.html#signal.signal
Expand Down
6 changes: 3 additions & 3 deletions src/pytorch_lightning/utilities/migration/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
import logging
import os
import sys
from distutils.version import LooseVersion
from types import ModuleType, TracebackType
from typing import Any, Dict, List, Optional, Tuple, Type

from lightning_utilities.core.rank_zero import rank_zero_warn
from packaging.version import Version

import pytorch_lightning as pl
from lightning_lite.utilities.imports import _IS_WINDOWS
Expand All @@ -38,7 +38,7 @@ def migrate_checkpoint(checkpoint: _CHECKPOINT) -> Tuple[_CHECKPOINT, Dict[str,
checkpoints and objects that do not support being deep-copied.
"""
ckpt_version = _get_version(checkpoint)
if LooseVersion(ckpt_version) > LooseVersion(pl.__version__):
if Version(ckpt_version) > Version(pl.__version__):
rank_zero_warn(
f"The loaded checkpoint was produced with Lightning v{ckpt_version}, which is newer than your current"
f" Lightning version: v{pl.__version__}",
Expand Down Expand Up @@ -141,4 +141,4 @@ def _set_legacy_version(checkpoint: _CHECKPOINT, version: str) -> None:

def _should_upgrade(checkpoint: _CHECKPOINT, target: str) -> bool:
"""Returns whether a checkpoint qualifies for an upgrade when the version is lower than the given target."""
return LooseVersion(_get_version(checkpoint)) < LooseVersion(target)
return Version(_get_version(checkpoint)) < Version(target)