From ea71c6d4ae7f2ae6e5e26714464cee375f7c0b3f Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 7 Aug 2024 14:26:39 +0200 Subject: [PATCH] Add support for lightning 2.4+ (#2211) --- .github/dependabot.yml | 4 ---- pyproject.toml | 4 ++-- requirements/required.txt | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e9796f63b42..eb0571076dc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -20,10 +20,6 @@ updates: - "torch" - "torchvision" ignore: - # lightning 2.3+ contains known bugs related to YAML parsing - # https://github.com/Lightning-AI/pytorch-lightning/issues/19977 - - dependency-name: "lightning" - version: ">=2.3" # setuptools releases new versions almost daily - dependency-name: "setuptools" update-types: ["version-update:semver-patch"] diff --git a/pyproject.toml b/pyproject.toml index fa90653782f..0116b767518 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,9 +47,9 @@ dependencies = [ # https://github.com/microsoft/torchgeo/issues/1824 "lightly>=1.4.5,!=1.4.26", # lightning 2+ required for LightningCLI args + sys.argv support - # lightning 2.3+ contains known bugs related to YAML parsing + # lightning 2.3 contains known bugs related to YAML parsing # https://github.com/Lightning-AI/pytorch-lightning/issues/19977 - "lightning[pytorch-extra]>=2,<2.3", + "lightning[pytorch-extra]>=2,!=2.3.*", # matplotlib 3.5+ required for Python 3.10 wheels "matplotlib>=3.5", # numpy 1.21.2+ required by Python 3.10 wheels diff --git a/requirements/required.txt b/requirements/required.txt index 46e79defbf5..1250d051313 100644 --- a/requirements/required.txt +++ b/requirements/required.txt @@ -6,7 +6,7 @@ einops==0.8.0 fiona==1.9.6 kornia==0.7.3 lightly==1.5.10 -lightning[pytorch-extra]==2.2.5 +lightning[pytorch-extra]==2.4.0 matplotlib==3.9.0 numpy==1.26.4 pandas==2.2.2