From 9b72836f112b65c8853139bf1df06c8cad027bda Mon Sep 17 00:00:00 2001 From: Martino Sorbaro Date: Mon, 27 Jun 2022 19:46:08 +0200 Subject: [PATCH 1/4] modified python version check to accommodate for legacy version styles --- src/pytorch_lightning/utilities/imports.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/utilities/imports.py b/src/pytorch_lightning/utilities/imports.py index 4055ba03f8ebe..6fbeda8a7c600 100644 --- a/src/pytorch_lightning/utilities/imports.py +++ b/src/pytorch_lightning/utilities/imports.py @@ -123,7 +123,7 @@ def __repr__(self) -> str: _IS_WINDOWS = platform.system() == "Windows" _IS_INTERACTIVE = hasattr(sys, "ps1") # https://stackoverflow.com/a/64523765 -_PYTHON_GREATER_EQUAL_3_8_0 = Version(platform.python_version()) >= Version("3.8.0") +_PYTHON_GREATER_EQUAL_3_8_0 = (sys.version_info.major, sys.version_info.minor) >= (3, 8) _TORCH_GREATER_EQUAL_1_9_1 = _compare_version("torch", operator.ge, "1.9.1") _TORCH_GREATER_EQUAL_1_10 = _compare_version("torch", operator.ge, "1.10.0") _TORCH_LESSER_EQUAL_1_10_2 = _compare_version("torch", operator.le, "1.10.2") From c782a8ab22a964c6046918ec22e880555c033a62 Mon Sep 17 00:00:00 2001 From: Martino Sorbaro Date: Mon, 27 Jun 2022 21:49:44 +0200 Subject: [PATCH 2/4] Updated changelog --- src/pytorch_lightning/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/CHANGELOG.md b/src/pytorch_lightning/CHANGELOG.md index 314fa55a61f98..e9df308cebeb9 100644 --- a/src/pytorch_lightning/CHANGELOG.md +++ b/src/pytorch_lightning/CHANGELOG.md @@ -270,7 +270,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Fixed `estimated_stepping_batches` requiring distributed comms in `configure_optimizers` for the `DeepSpeedStrategy` ([#13350](https://github.com/PyTorchLightning/pytorch-lightning/pull/13350)) -- +- Fixed bug with Python version check that prevented use with development versions of Python (#13347) ## [1.6.4] - 2022-06-01 From 107e407988f22b058ffba4440a893b449008ff20 Mon Sep 17 00:00:00 2001 From: Martino Sorbaro Date: Mon, 27 Jun 2022 21:52:06 +0200 Subject: [PATCH 3/4] Updated changelog --- src/pytorch_lightning/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/CHANGELOG.md b/src/pytorch_lightning/CHANGELOG.md index e9df308cebeb9..fe5f03f43ecca 100644 --- a/src/pytorch_lightning/CHANGELOG.md +++ b/src/pytorch_lightning/CHANGELOG.md @@ -270,7 +270,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Fixed `estimated_stepping_batches` requiring distributed comms in `configure_optimizers` for the `DeepSpeedStrategy` ([#13350](https://github.com/PyTorchLightning/pytorch-lightning/pull/13350)) -- Fixed bug with Python version check that prevented use with development versions of Python (#13347) +- Fixed bug with Python version check that prevented use with development versions of Python ([#13347](https://github.com/PyTorchLightning/pytorch-lightning/pull/13347)) ## [1.6.4] - 2022-06-01 From d838faf19d191b6468cce5c9520a1d19ac065939 Mon Sep 17 00:00:00 2001 From: Martino Sorbaro Date: Tue, 28 Jun 2022 09:50:33 +0200 Subject: [PATCH 4/4] changelog now referring to pull request rather than issue --- src/pytorch_lightning/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_lightning/CHANGELOG.md b/src/pytorch_lightning/CHANGELOG.md index fe5f03f43ecca..373388ea44640 100644 --- a/src/pytorch_lightning/CHANGELOG.md +++ b/src/pytorch_lightning/CHANGELOG.md @@ -270,7 +270,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Fixed `estimated_stepping_batches` requiring distributed comms in `configure_optimizers` for the `DeepSpeedStrategy` ([#13350](https://github.com/PyTorchLightning/pytorch-lightning/pull/13350)) -- Fixed bug with Python version check that prevented use with development versions of Python ([#13347](https://github.com/PyTorchLightning/pytorch-lightning/pull/13347)) +- Fixed bug with Python version check that prevented use with development versions of Python ([#13420](https://github.com/PyTorchLightning/pytorch-lightning/pull/13420)) ## [1.6.4] - 2022-06-01