From 0b88204c6acc0634e82904c1f5e8e41b559ce535 Mon Sep 17 00:00:00 2001 From: Jirka Borovec <6035284+Borda@users.noreply.github.com> Date: Thu, 7 Mar 2024 17:20:57 +0100 Subject: [PATCH] bump `lightning-utilities` from <0.10 to <0.11 (#19586) --- requirements/app/app.txt | 2 +- requirements/fabric/base.txt | 2 +- requirements/fabric/examples.txt | 2 +- requirements/pytorch/base.txt | 2 +- requirements/pytorch/examples.txt | 2 +- src/lightning/__init__.py | 2 +- src/lightning/fabric/utilities/rank_zero.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements/app/app.txt b/requirements/app/app.txt index 4c7ef3b796..3c7dbae240 100644 --- a/requirements/app/app.txt +++ b/requirements/app/app.txt @@ -6,7 +6,7 @@ fsspec[http] >=2022.5.0, <2023.11.0 croniter >=1.3.0, <1.5.0 # strict; TODO: for now until we find something more robust. traitlets >=5.3.0, <5.12.0 arrow >=1.2.0, <1.3.0 -lightning-utilities >=0.8.0, <0.10.0 +lightning-utilities >=0.8.0, <0.11.0 beautifulsoup4 >=4.8.0, <4.13.0 inquirer >=2.10.0, <3.2.0 psutil <5.9.6 diff --git a/requirements/fabric/base.txt b/requirements/fabric/base.txt index 0b2345613c..c64c024e18 100644 --- a/requirements/fabric/base.txt +++ b/requirements/fabric/base.txt @@ -6,4 +6,4 @@ torch >=1.13.0, <=2.2.0 fsspec[http] >=2022.5.0, <2023.11.0 packaging >=20.0, <=23.1 typing-extensions >=4.4.0, <4.10.0 -lightning-utilities >=0.8.0, <0.10.0 +lightning-utilities >=0.8.0, <0.11.0 diff --git a/requirements/fabric/examples.txt b/requirements/fabric/examples.txt index cac15b74bf..389cd81f58 100644 --- a/requirements/fabric/examples.txt +++ b/requirements/fabric/examples.txt @@ -3,4 +3,4 @@ torchvision >=0.14.0, <0.18.0 torchmetrics >=0.10.0, <1.3.0 -lightning-utilities >=0.8.0, <0.10.0 +lightning-utilities >=0.8.0, <0.11.0 diff --git a/requirements/pytorch/base.txt b/requirements/pytorch/base.txt index 7f9f8f6803..97a998f2db 100644 --- a/requirements/pytorch/base.txt +++ b/requirements/pytorch/base.txt @@ -9,4 +9,4 @@ fsspec[http] >=2022.5.0, <2023.11.0 torchmetrics >=0.7.0, <1.3.0 # needed for using fixed compare_version packaging >=20.0, <=23.1 typing-extensions >=4.4.0, <4.10.0 -lightning-utilities >=0.8.0, <0.10.0 +lightning-utilities >=0.8.0, <0.11.0 diff --git a/requirements/pytorch/examples.txt b/requirements/pytorch/examples.txt index 551c6470a7..850f95684c 100644 --- a/requirements/pytorch/examples.txt +++ b/requirements/pytorch/examples.txt @@ -6,4 +6,4 @@ torchvision >=0.14.0, <0.18.0 gym[classic_control] >=0.17.0, <0.27.0 ipython[all] <8.15.0 torchmetrics >=0.10.0, <1.3.0 -lightning-utilities >=0.8.0, <0.10.0 +lightning-utilities >=0.8.0, <0.11.0 diff --git a/src/lightning/__init__.py b/src/lightning/__init__.py index 0b5b1c1db8..c191334d2c 100644 --- a/src/lightning/__init__.py +++ b/src/lightning/__init__.py @@ -39,7 +39,7 @@ def _cli_entry_point() -> None: if not ( ModuleAvailableCache("lightning.app") if RequirementCache("lightning-utilities<0.10.0") - else RequirementCache(module="lightning.app") # type: ignore[call-arg] + else RequirementCache(module="lightning.app") ): print("The `lightning` command requires additional dependencies: `pip install lightning[app]`") sys.exit(1) diff --git a/src/lightning/fabric/utilities/rank_zero.py b/src/lightning/fabric/utilities/rank_zero.py index d12d5bf496..bd9b65e3b8 100644 --- a/src/lightning/fabric/utilities/rank_zero.py +++ b/src/lightning/fabric/utilities/rank_zero.py @@ -74,7 +74,7 @@ if not _UTILITIES_GREATER_EQUAL_0_10: rank_zero_module.rank_zero_only.rank = getattr(rank_zero_module.rank_zero_only, "rank", _get_rank() or 0) else: - rank_zero_only = rank_zero_module.rank_zero_only # type: ignore[assignment] + rank_zero_only = rank_zero_module.rank_zero_only # add the attribute to the function but don't overwrite in case Trainer has already set it rank_zero_only.rank = getattr(rank_zero_only, "rank", _get_rank() or 0)