diff --git a/.github/workflows/ci-pytorch-test-conda.yml b/.github/workflows/ci-pytorch-test-conda.yml index 80502c5ed991f..25f7422cbca6a 100644 --- a/.github/workflows/ci-pytorch-test-conda.yml +++ b/.github/workflows/ci-pytorch-test-conda.yml @@ -67,8 +67,7 @@ jobs: # adjust versions according installed Torch version python ./requirements/pytorch/adjust-versions.py requirements/pytorch/extra.txt python ./requirements/pytorch/adjust-versions.py requirements/pytorch/examples.txt - pip install -r requirements/pytorch/devel.txt --find-links https://download.pytorch.org/whl/torch_stable.html - pip install -r requirements/pytorch/strategies.txt + pip install -r requirements/pytorch/devel.txt -r requirements/pytorch/strategies.txt --find-links https://download.pytorch.org/whl/torch_stable.html # set a per-test timeout of 2.5 minutes to fail sooner; this aids with hanging tests pip install pytest-timeout pip list diff --git a/src/pytorch_lightning/CHANGELOG.md b/src/pytorch_lightning/CHANGELOG.md index 52cc98ca84106..f00b5f309d373 100644 --- a/src/pytorch_lightning/CHANGELOG.md +++ b/src/pytorch_lightning/CHANGELOG.md @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). + +## [1.7.7] - 2022-09-?? + +### Fixed + +- Fixed the availability check for the neptune-client package ([#14714](https://github.com/Lightning-AI/lightning/pull/14714)) + + ## [1.7.6] - 2022-09-13 ### Changed diff --git a/src/pytorch_lightning/loggers/neptune.py b/src/pytorch_lightning/loggers/neptune.py index c9b438fd7c732..146209a9ba207 100644 --- a/src/pytorch_lightning/loggers/neptune.py +++ b/src/pytorch_lightning/loggers/neptune.py @@ -20,6 +20,7 @@ ] import logging +import operator import os import warnings from argparse import Namespace @@ -33,13 +34,14 @@ from pytorch_lightning import __version__ from pytorch_lightning.callbacks import Checkpoint from pytorch_lightning.loggers.logger import Logger, rank_zero_experiment -from pytorch_lightning.utilities.imports import _RequirementAvailable +from pytorch_lightning.utilities.imports import _compare_version, _module_available from pytorch_lightning.utilities.logger import _add_prefix, _convert_params, _sanitize_callable_params from pytorch_lightning.utilities.model_summary import ModelSummary from pytorch_lightning.utilities.rank_zero import rank_zero_only -_NEPTUNE_AVAILABLE = _RequirementAvailable("neptune-client") -_NEPTUNE_GREATER_EQUAL_0_9 = _RequirementAvailable("neptune-client>=0.9.0") +# Note: Do not use RequirementCache. See: https://github.com/Lightning-AI/lightning/issues/14695 +_NEPTUNE_AVAILABLE = _module_available("neptune") +_NEPTUNE_GREATER_EQUAL_0_9 = _compare_version("neptune", operator.ge, "0.9.0") if _NEPTUNE_AVAILABLE and _NEPTUNE_GREATER_EQUAL_0_9: