From faed5929876432aed8298c2ccecf86c3acfea41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Fri, 17 Mar 2023 15:08:59 +0100 Subject: [PATCH 1/6] Add missing MANIFESTs --- .gitignore | 6 +++--- src/lightning_app/MANIFEST.in | 1 + src/lightning_app/py.typed | 0 src/lightning_fabric/MANIFEST.in | 1 + src/lightning_fabric/py.typed | 0 5 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 src/lightning_app/py.typed create mode 100644 src/lightning_fabric/py.typed diff --git a/.gitignore b/.gitignore index bc108553a9e5a..7fe99b1a333f1 100644 --- a/.gitignore +++ b/.gitignore @@ -51,9 +51,9 @@ wheels/ .installed.cfg *.egg src/*/version.info -src/lightning_app/ -src/lightning_fabric/ -src/pytorch_lightning/ +src/lightning_app/* +src/lightning_fabric/* +src/pytorch_lightning/* !src/*/__about__.py !src/*/__main__.py !src/*/__setup__.py diff --git a/src/lightning_app/MANIFEST.in b/src/lightning_app/MANIFEST.in index 45aea6f8bdbef..a8e251508baf5 100644 --- a/src/lightning_app/MANIFEST.in +++ b/src/lightning_app/MANIFEST.in @@ -8,3 +8,4 @@ recursive-include src/lightning_app/cli/*-template * # TODO: remove this once lightning-ui package is ready as a dependency recursive-include src/lightning_app/ui * include src/lightning_app/components/serve/catimage.png +include src/lightning_app/py.typed # marker file for PEP 561 diff --git a/src/lightning_app/py.typed b/src/lightning_app/py.typed new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/src/lightning_fabric/MANIFEST.in b/src/lightning_fabric/MANIFEST.in index 4cff43c8fdb22..3c33b95ae9b20 100644 --- a/src/lightning_fabric/MANIFEST.in +++ b/src/lightning_fabric/MANIFEST.in @@ -4,3 +4,4 @@ include src/lightning_fabric/CHANGELOG.md include src/lightning_fabric/README.md recursive-include requirements/fabric *.txt include .actions/assistant.py +include src/lightning_fabric/py.typed # marker file for PEP 561 diff --git a/src/lightning_fabric/py.typed b/src/lightning_fabric/py.typed new file mode 100644 index 0000000000000..e69de29bb2d1d From 348d3d960d0d7710fa4419c60632e863df1e5a3a Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 29 Mar 2023 14:06:46 +0200 Subject: [PATCH 2/6] move --- src/{lightning_app => lightning/app}/py.typed | 0 src/{lightning_fabric => lightning/fabric}/py.typed | 0 src/{pytorch_lightning => lightning/pytorch}/py.typed | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/{lightning_app => lightning/app}/py.typed (100%) rename src/{lightning_fabric => lightning/fabric}/py.typed (100%) rename src/{pytorch_lightning => lightning/pytorch}/py.typed (100%) diff --git a/src/lightning_app/py.typed b/src/lightning/app/py.typed similarity index 100% rename from src/lightning_app/py.typed rename to src/lightning/app/py.typed diff --git a/src/lightning_fabric/py.typed b/src/lightning/fabric/py.typed similarity index 100% rename from src/lightning_fabric/py.typed rename to src/lightning/fabric/py.typed diff --git a/src/pytorch_lightning/py.typed b/src/lightning/pytorch/py.typed similarity index 100% rename from src/pytorch_lightning/py.typed rename to src/lightning/pytorch/py.typed From 6d3ea91ac5d8ae34d283cd5d34f34433a430acf9 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 29 Mar 2023 14:08:20 +0200 Subject: [PATCH 3/6] one more --- src/lightning/py.typed | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/lightning/py.typed diff --git a/src/lightning/py.typed b/src/lightning/py.typed new file mode 100644 index 0000000000000..e69de29bb2d1d From 3994edd40cc1bfa6a0c65b84daff1cbd6d5c7b52 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 29 Mar 2023 11:07:54 -0500 Subject: [PATCH 4/6] Ignore version.info properly --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e014f1b4b2abe..17c18b06ee99a 100644 --- a/.gitignore +++ b/.gitignore @@ -63,7 +63,7 @@ src/pytorch_lightning/* !src/*/MANIFEST.in !src/*/py.typed !src/*/README.md -!src/*/*.info +!src/*/shell-folder_code-lives-lightning.info # PyInstaller # Usually these files are written by a python script from a template From e049e838d206ddc40edb4b51ab1bc53edf93d291 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 29 Mar 2023 18:40:44 +0200 Subject: [PATCH 5/6] move --- src/{lightning/app => lightning_app}/py.typed | 0 src/{lightning/fabric => lightning_fabric}/py.typed | 0 src/{lightning/pytorch => pytorch_lightning}/py.typed | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/{lightning/app => lightning_app}/py.typed (100%) rename src/{lightning/fabric => lightning_fabric}/py.typed (100%) rename src/{lightning/pytorch => pytorch_lightning}/py.typed (100%) diff --git a/src/lightning/app/py.typed b/src/lightning_app/py.typed similarity index 100% rename from src/lightning/app/py.typed rename to src/lightning_app/py.typed diff --git a/src/lightning/fabric/py.typed b/src/lightning_fabric/py.typed similarity index 100% rename from src/lightning/fabric/py.typed rename to src/lightning_fabric/py.typed diff --git a/src/lightning/pytorch/py.typed b/src/pytorch_lightning/py.typed similarity index 100% rename from src/lightning/pytorch/py.typed rename to src/pytorch_lightning/py.typed From 1041437aee0de128be2554abdc73a4bf83e691b3 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 29 Mar 2023 18:51:52 +0200 Subject: [PATCH 6/6] manifest --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5b4e9b5caaaeb..e2dfc48d08088 100755 --- a/setup.py +++ b/setup.py @@ -87,7 +87,11 @@ def _set_manifest_path(manifest_dir: str, aggregate: bool = False, mapping: Mapp if aggregate: # aggregate all MANIFEST.in contents into a single temporary file manifest_path = _named_temporary_file(manifest_dir) - lines = ["include src/lightning/version.info\n", "include requirements/base.txt\n"] + lines = [ + "include src/lightning/version.info\n", + "include src/lightning/py.typed\n", + "include requirements/base.txt\n", + ] # load manifest and aggregated all manifests for pkg in mapping.values(): pkg_manifest = os.path.join(_PATH_SRC, pkg, "MANIFEST.in")