From d85fec2f760477bb3130ea1600360806e2c2be5b Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 21 Aug 2023 12:27:16 +0200 Subject: [PATCH 1/7] refactor path to root preventing circular import --- src/lightning/__init__.py | 3 ++- src/lightning/app/__init__.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lightning/__init__.py b/src/lightning/__init__.py index 385af0de771e7..a46380ea44ac2 100644 --- a/src/lightning/__init__.py +++ b/src/lightning/__init__.py @@ -31,7 +31,8 @@ import lightning.app # isort: skip # noqa: E402 import lightning.store # isort: skip # noqa: E402 -lightning.app._PROJECT_ROOT = os.path.dirname(lightning.app._PROJECT_ROOT) +_PACKAGE_ROOT = os.path.dirname(__file__) +_PROJECT_ROOT = os.path.dirname(os.path.dirname(_PACKAGE_ROOT)) __all__ = [ diff --git a/src/lightning/app/__init__.py b/src/lightning/app/__init__.py index 13983ef64e101..f3e77ac7f765e 100644 --- a/src/lightning/app/__init__.py +++ b/src/lightning/app/__init__.py @@ -45,5 +45,8 @@ _PACKAGE_ROOT = os.path.dirname(__file__) _PROJECT_ROOT = os.path.dirname(os.path.dirname(_PACKAGE_ROOT)) +if __package_name__ == ("lightning" + ".app"): + _PACKAGE_ROOT = os.path.dirname(_PACKAGE_ROOT) + _PROJECT_ROOT = os.path.dirname(_PROJECT_ROOT) __all__ = ["LightningApp", "LightningFlow", "LightningWork", "LightningPlugin", "BuildConfig", "CloudCompute"] From 128f7ac7c00296f74eb0fe5a7e03c62e5aea4ccb Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 21 Aug 2023 14:05:56 +0200 Subject: [PATCH 2/7] name --- src/lightning/app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lightning/app/__init__.py b/src/lightning/app/__init__.py index f3e77ac7f765e..6e4635c83c48b 100644 --- a/src/lightning/app/__init__.py +++ b/src/lightning/app/__init__.py @@ -45,7 +45,7 @@ _PACKAGE_ROOT = os.path.dirname(__file__) _PROJECT_ROOT = os.path.dirname(os.path.dirname(_PACKAGE_ROOT)) -if __package_name__ == ("lightning" + ".app"): +if __package_name__ == "lightning": _PACKAGE_ROOT = os.path.dirname(_PACKAGE_ROOT) _PROJECT_ROOT = os.path.dirname(_PROJECT_ROOT) From d895176e6dc625906cf6f1d854a043c7dd0f5404 Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 21 Aug 2023 14:30:21 +0200 Subject: [PATCH 3/7] ignore --- src/lightning/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lightning/__init__.py b/src/lightning/__init__.py index a46380ea44ac2..bf0b510518f3d 100644 --- a/src/lightning/__init__.py +++ b/src/lightning/__init__.py @@ -29,7 +29,7 @@ from lightning.pytorch.trainer import Trainer # noqa: E402 import lightning.app # isort: skip # noqa: E402 -import lightning.store # isort: skip # noqa: E402 +import lightning.store # isort: skip # noqa: E402, F401 _PACKAGE_ROOT = os.path.dirname(__file__) _PROJECT_ROOT = os.path.dirname(os.path.dirname(_PACKAGE_ROOT)) From ba962ca8ab34abd9b229ed4184ed48dd9f308814 Mon Sep 17 00:00:00 2001 From: Jirka Borovec <6035284+Borda@users.noreply.github.com> Date: Mon, 21 Aug 2023 18:46:41 +0200 Subject: [PATCH 4/7] ci store --- .github/workflows/ci-tests-store.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci-tests-store.yml b/.github/workflows/ci-tests-store.yml index ba05dfb9d6d73..52949009d70df 100644 --- a/.github/workflows/ci-tests-store.yml +++ b/.github/workflows/ci-tests-store.yml @@ -10,6 +10,11 @@ on: paths: - ".actions/*" - "requirements/store/**" + - "src/lightning/__about__.py" + - "src/lightning/__init__.py" + - "src/lightning/__main__.py" + - "src/lightning/__setup__.py" + - "src/lightning/__version__.py" - "src/lightning/store/**" - "tests/tests_store/**" - "pyproject.toml" # includes pytest config From 10019a2a88c45ee73c98286a30c678f37f28db23 Mon Sep 17 00:00:00 2001 From: Jirka Borovec <6035284+Borda@users.noreply.github.com> Date: Mon, 21 Aug 2023 19:06:41 +0200 Subject: [PATCH 5/7] drop --- src/lightning/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lightning/__init__.py b/src/lightning/__init__.py index bf0b510518f3d..6290158d69b55 100644 --- a/src/lightning/__init__.py +++ b/src/lightning/__init__.py @@ -31,8 +31,6 @@ import lightning.app # isort: skip # noqa: E402 import lightning.store # isort: skip # noqa: E402, F401 -_PACKAGE_ROOT = os.path.dirname(__file__) -_PROJECT_ROOT = os.path.dirname(os.path.dirname(_PACKAGE_ROOT)) __all__ = [ From acd225959a9e711c1076f9410aecfa2f05de5d7a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 17:07:50 +0000 Subject: [PATCH 6/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/lightning/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lightning/__init__.py b/src/lightning/__init__.py index 6290158d69b55..47e6ced6c83f4 100644 --- a/src/lightning/__init__.py +++ b/src/lightning/__init__.py @@ -32,7 +32,6 @@ import lightning.store # isort: skip # noqa: E402, F401 - __all__ = [ "LightningApp", "LightningFlow", From 3fd0f941e1d9cfde7d96db338009f02ce67bc70d Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 21 Aug 2023 19:14:08 +0200 Subject: [PATCH 7/7] import --- src/lightning/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lightning/__init__.py b/src/lightning/__init__.py index 47e6ced6c83f4..b506f72ed1d87 100644 --- a/src/lightning/__init__.py +++ b/src/lightning/__init__.py @@ -1,6 +1,5 @@ """Root package info.""" import logging -import os # explicitly don't set root logger's propagation and leave this to subpackages to manage _logger = logging.getLogger(__name__)