lightning 2.0.2__tar.gz → 2.0.4__tar.gz

{lightning-2.0.2 → lightning-2.0.4}/.actions/assistant.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import glob
+import logging
 import os
 import pathlib
 import re
@@ -142,7 +143,7 @@ def load_requirements(path_dir: str, file_name: str = "base.txt", unfreeze: str
 
     >>> path_req = os.path.join(_PROJECT_ROOT, "requirements")
     >>> load_requirements(path_req, "docs.txt", unfreeze="major")  # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
-    ['sphinx<6.0,>=4.0', ...]
+    ['sphinx<...]
     """
     assert unfreeze in {"none", "major", "all"}
     path = Path(path_dir) / file_name
@@ -158,7 +159,8 @@ def load_readme_description(path_dir: str, homepage: str, version: str) -> str:
     '...PyTorch Lightning is just organized PyTorch...'
     """
     path_readme = os.path.join(path_dir, "README.md")
-    text = open(path_readme, encoding="utf-8").read()
+    with open(path_readme, encoding="utf-8") as fo:
+        text = fo.read()
 
     # drop images from readme
     text = text.replace(
@@ -331,7 +333,7 @@ def copy_replace_imports(
             if not isfile(fp_new):
                 shutil.copy(fp, fp_new)
             continue
-        elif ext in (".pyc",):
+        if ext in (".pyc",):
             continue
         # Try to parse everything else
         with open(fp, encoding="utf-8") as fo:
@@ -394,8 +396,10 @@ class AssistantCLI:
 
     @staticmethod
     def _replace_min(fname: str) -> None:
-        req = open(fname, encoding="utf-8").read().replace(">=", "==")
-        open(fname, "w", encoding="utf-8").write(req)
+        with open(fname, encoding="utf-8") as fo:
+            req = fo.read().replace(">=", "==")
+        with open(fname, "w", encoding="utf-8") as fw:
+            fw.write(req)
 
     @staticmethod
     def replace_oldest_ver(requirement_fnames: Sequence[str] = REQUIREMENT_FILES_ALL) -> None:
@@ -418,6 +422,42 @@ class AssistantCLI:
             source_dir, source_imports, target_imports, target_dir=target_dir, lightning_by=lightning_by
         )
 
+    @staticmethod
+    def pull_docs_files(
+        gh_user_repo: str,
+        target_dir: str = "docs/source-pytorch/XXX",
+        checkout: str = "tags/1.0.0",
+        source_dir: str = "docs/source",
+    ) -> None:
+        """Pull docs pages from external source and append to local docs."""
+        import zipfile
+
+        zip_url = f"https://github.com/{gh_user_repo}/archive/refs/{checkout}.zip"
+
+        with tempfile.TemporaryDirectory() as tmp:
+            zip_file = os.path.join(tmp, "repo.zip")
+            urllib.request.urlretrieve(zip_url, zip_file)
+
+            with zipfile.ZipFile(zip_file, "r") as zip_ref:
+                zip_ref.extractall(tmp)
+
+            zip_dirs = [d for d in glob.glob(os.path.join(tmp, "*")) if os.path.isdir(d)]
+            # check that the extracted archive has only repo folder
+            assert len(zip_dirs) == 1
+            repo_dir = zip_dirs[0]
+
+            ls_pages = glob.glob(os.path.join(repo_dir, source_dir, "*.rst"))
+            ls_pages += glob.glob(os.path.join(repo_dir, source_dir, "**", "*.rst"))
+            for rst in ls_pages:
+                rel_rst = rst.replace(os.path.join(repo_dir, source_dir) + os.path.sep, "")
+                rel_dir = os.path.dirname(rel_rst)
+                os.makedirs(os.path.join(_PROJECT_ROOT, target_dir, rel_dir), exist_ok=True)
+                new_rst = os.path.join(_PROJECT_ROOT, target_dir, rel_rst)
+                if os.path.isfile(new_rst):
+                    logging.warning(f"Page {new_rst} already exists in the local tree so it will be skipped.")
+                    continue
+                shutil.copy(rst, new_rst)
+
 
 if __name__ == "__main__":
     import jsonargparse

{lightning-2.0.2/src/lightning.egg-info → lightning-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lightning
-Version: 2.0.2
+Version: 2.0.4
 Summary: Use Lightning Apps to build everything from production-ready, multi-cloud ML systems to simple research demos.
 Home-page: https://github.com/Lightning-AI/lightning
 Author: Lightning AI et al.
@@ -26,24 +26,31 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: pytorch-strategies
 Provides-Extra: pytorch-test
+Provides-Extra: pytorch-strategies
 Provides-Extra: pytorch-extra
 Provides-Extra: pytorch-examples
-Provides-Extra: app-components
 Provides-Extra: app-test
-Provides-Extra: app-ui
 Provides-Extra: app-cloud
-Provides-Extra: fabric-strategies
+Provides-Extra: app-ui
+Provides-Extra: app-components
 Provides-Extra: fabric-test
+Provides-Extra: fabric-strategies
 Provides-Extra: fabric-examples
-Provides-Extra: strategies
+Provides-Extra: fabric-all
+Provides-Extra: fabric-dev
+Provides-Extra: pytorch-all
+Provides-Extra: pytorch-dev
+Provides-Extra: app-extra
+Provides-Extra: app-all
+Provides-Extra: app-dev
 Provides-Extra: test
+Provides-Extra: strategies
 Provides-Extra: extra
 Provides-Extra: examples
-Provides-Extra: components
-Provides-Extra: ui
 Provides-Extra: cloud
+Provides-Extra: ui
+Provides-Extra: components
 Provides-Extra: all
 Provides-Extra: dev
 License-File: LICENSE
@@ -66,7 +73,7 @@ ______________________________________________________________________
   <a href="https://lightning.ai/docs/pytorch/stable/">PyTorch Lightning</a> •
   <a href="https://lightning.ai/docs/fabric/stable/">Fabric</a> •
   <a href="https://lightning.ai/docs/app/stable/">Lightning Apps</a> •
-  <a href="https://pytorch-lightning.readthedocs.io/en/2.0.2">Docs</a> •
+  <a href="https://pytorch-lightning.readthedocs.io/en/2.0.4">Docs</a> •
   <a href="#community">Community</a> •
   <a href="https://lightning.ai/docs/pytorch/stable/generated/CONTRIBUTING.html">Contribute</a> •
 </p>
@@ -76,12 +83,12 @@ ______________________________________________________________________
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pytorch-lightning)](https://pypi.org/project/pytorch-lightning/)
 [![PyPI Status](https://badge.fury.io/py/pytorch-lightning.svg)](https://badge.fury.io/py/pytorch-lightning)
 [![PyPI Status](https://pepy.tech/badge/pytorch-lightning)](https://pepy.tech/project/pytorch-lightning)
-[![Conda](https://img.shields.io/conda/v/conda-forge/pytorch-lightning?label=conda&color=success)](https://anaconda.org/conda-forge/pytorch-lightning)
+[![Conda](https://img.shields.io/conda/v/conda-forge/lightning?label=conda&color=success)](https://anaconda.org/conda-forge/lightning)
 [![DockerHub](https://img.shields.io/docker/pulls/pytorchlightning/pytorch_lightning.svg)](https://hub.docker.com/r/pytorchlightning/pytorch_lightning)
-[![codecov](https://codecov.io/gh/Lightning-AI/lightning/release/2.0.2/graph/badge.svg?token=SmzX8mnKlA)](https://codecov.io/gh/Lightning-AI/lightning)
+[![codecov](https://codecov.io/gh/Lightning-AI/lightning/release/2.0.4/graph/badge.svg?token=SmzX8mnKlA)](https://codecov.io/gh/Lightning-AI/lightning)
 
-[![ReadTheDocs](https://readthedocs.org/projects/pytorch-lightning/badge/?version=2.0.2)](https://lightning.ai/docs/pytorch/stable/)
 [![Discord](https://img.shields.io/discord/1077906959069626439?style=plastic)](https://discord.gg/VptPCZkGNa)
+![GitHub commit activity](https://img.shields.io/github/commit-activity/w/lightning-ai/lightning)
 [![license](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/Lightning-AI/lightning/blob/master/LICENSE)
 
 <!--
@@ -481,10 +488,10 @@ Lightning is rigorously tested across multiple CPUs, GPUs, TPUs, IPUs, and HPUs
 
 |       System / PyTorch ver.        |                                                                                              1.11                                                                                               |                                                                                                              1.12                                                                                                               | 1.13                                                                                                                                                                                                                            | 2.0  |
 | :--------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
-|        Linux py3.9 \[GPUs\]        |                                                                                                -                                                                                                | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(GPUs)?branchName=refs%2Ftags%2F2.0.2>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(GPUs)?branchName=refs%2Ftags%2F2.0.2>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) | Soon |
+|        Linux py3.9 \[GPUs\]        |                                                                                                -                                                                                                | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(GPUs)?branchName=refs%2Ftags%2F2.0.4>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(GPUs)?branchName=refs%2Ftags%2F2.0.4>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) | Soon |
 |        Linux py3.9 \[TPUs\]        |                                                                                                -                                                                                                |                     [![Test PyTorch - TPU](https://github.com/Lightning-AI/lightning/actions/workflows/tpu-tests.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/tpu-tests.yml)                     |                                                                                                                                                                                                                                 | Soon |
-|        Linux py3.8 \[IPUs\]        |                                                                                                -                                                                                                |                                                                                                                -                                                                                                                | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(IPUs)?branchName=refs%2Ftags%2F2.0.2>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=25&branchName=master) | Soon |
-|        Linux py3.8 \[HPUs\]        |                                                                                                -                                                                                                |                                                                                                                -                                                                                                                | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(HPUs)?branchName=refs%2Ftags%2F2.0.2>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=26&branchName=master) | Soon |
+|        Linux py3.8 \[IPUs\]        |                                                                                                -                                                                                                |                                                                                                                -                                                                                                                | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(IPUs)?branchName=refs%2Ftags%2F2.0.4>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=25&branchName=master) | Soon |
+|        Linux py3.8 \[HPUs\]        |                                                                                                -                                                                                                |                                                                                                                -                                                                                                                | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(HPUs)?branchName=refs%2Ftags%2F2.0.4>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=26&branchName=master) | Soon |
 |  Linux (multiple Python versions)  | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |                 [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                 | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                                 | Soon |
 |   OSX (multiple Python versions)   | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |                 [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                 | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                                 | Soon |
 | Windows (multiple Python versions) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |                 [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                 | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                                 | Soon |
@@ -499,7 +506,7 @@ ______________________________________________________________________
 The lightning community is maintained by
 
 - [10+ core contributors](https://lightning.ai/docs/pytorch/latest/community/governance.html) who are all a mix of professional engineers, Research Scientists, and Ph.D. students from top AI labs.
-- 590+ active community contributors.
+- 800+ community contributors.
 
 Want to help us build Lightning and reduce boilerplate for thousands of researchers? [Learn how to make your first contribution here](https://lightning.ai/docs/pytorch/stable/generated/CONTRIBUTING.html)
 

{lightning-2.0.2 → lightning-2.0.4}/README.md

@@ -26,12 +26,12 @@ ______________________________________________________________________
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pytorch-lightning)](https://pypi.org/project/pytorch-lightning/)
 [![PyPI Status](https://badge.fury.io/py/pytorch-lightning.svg)](https://badge.fury.io/py/pytorch-lightning)
 [![PyPI Status](https://pepy.tech/badge/pytorch-lightning)](https://pepy.tech/project/pytorch-lightning)
-[![Conda](https://img.shields.io/conda/v/conda-forge/pytorch-lightning?label=conda&color=success)](https://anaconda.org/conda-forge/pytorch-lightning)
+[![Conda](https://img.shields.io/conda/v/conda-forge/lightning?label=conda&color=success)](https://anaconda.org/conda-forge/lightning)
 [![DockerHub](https://img.shields.io/docker/pulls/pytorchlightning/pytorch_lightning.svg)](https://hub.docker.com/r/pytorchlightning/pytorch_lightning)
 [![codecov](https://codecov.io/gh/Lightning-AI/lightning/branch/master/graph/badge.svg?token=SmzX8mnKlA)](https://codecov.io/gh/Lightning-AI/lightning)
 
-[![ReadTheDocs](https://readthedocs.org/projects/pytorch-lightning/badge/?version=stable)](https://lightning.ai/docs/pytorch/stable/)
 [![Discord](https://img.shields.io/discord/1077906959069626439?style=plastic)](https://discord.gg/VptPCZkGNa)
+![GitHub commit activity](https://img.shields.io/github/commit-activity/w/lightning-ai/lightning)
 [![license](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/Lightning-AI/lightning/blob/master/LICENSE)
 
 <!--
@@ -490,7 +490,7 @@ ______________________________________________________________________
 The lightning community is maintained by
 
 - [10+ core contributors](https://lightning.ai/docs/pytorch/latest/community/governance.html) who are all a mix of professional engineers, Research Scientists, and Ph.D. students from top AI labs.
-- 590+ active community contributors.
+- 800+ community contributors.
 
 Want to help us build Lightning and reduce boilerplate for thousands of researchers? [Learn how to make your first contribution here](https://lightning.ai/docs/pytorch/stable/generated/CONTRIBUTING.html)
 

{lightning-2.0.2 → lightning-2.0.4}/pyproject.toml

@@ -55,9 +55,13 @@ line-length = 120
 select = [
     "E", "W",  # see: https://pypi.org/project/pycodestyle
     "F",  # see: https://pypi.org/project/pyflakes
+    "S",  # see: https://pypi.org/project/flake8-bandit
 ]
 extend-select = [
     "C4",  # see: https://pypi.org/project/flake8-comprehensions
+    "SIM",  # see: https://pypi.org/project/flake8-simplify
+    "RET",  # see: https://pypi.org/project/flake8-return
+    "PT",  # see: https://pypi.org/project/flake8-pytest-style
 ]
 ignore = [
     "E731",  # Do not assign a lambda expression, use a def
@@ -70,6 +74,47 @@ exclude = [
 ]
 ignore-init-module-imports = true
 
+[tool.ruff.per-file-ignores]
+".actions/*" = ["S101", "S310"]
+"setup.py" = ["S101"]
+"examples/**" = [
+    "S101",  # Use of `assert` detected
+    "S113",  # todo: Probable use of requests call without
+    "S104",  # Possible binding to all interface
+    "F821",  # Undefined name `...`
+    "S311",  # Standard pseudo-random generators are not suitable for cryptographic purposes
+    "S501",  # Probable use of `requests` call with `verify=False` disabling SSL certificate checks
+    "S108",  # Probable insecure usage of temporary file or directory: "/tmp/data/MNIST"
+]
+"src/**" = [
+    "S101",  # todo: Use of `assert` detected
+    "S105", "S106", "S107",  # todo: Possible hardcoded password: ...
+    "S113",  # todo: Probable use of requests call without timeout
+    "S602",  # todo: `subprocess` call with `shell=True` identified, security issue
+    "S603",  # todo: `subprocess` call: check for execution of untrusted input
+    "S607",  # todo: Starting a process with a partial executable path
+    "S301",  # todo: `pickle` and modules that wrap it can be unsafe when used to deserialize untrusted data, possible security issue
+    "S324",  # todo: Probable use of insecure hash functions in `hashlib`
+    "RET504",  # todo:Unnecessary variable assignment before `return` statement
+]
+"tests/**" = [
+    "S101",  # Use of `assert` detected
+    "S105", "S106",  # todo: Possible hardcoded password: ...
+    "S301",  # `pickle` and modules that wrap it can be unsafe when used to deserialize untrusted data, possible security issue
+    "S113",  # todo: Probable use of requests call without timeout
+    "S311",  # todo: Standard pseudo-random generators are not suitable for cryptographic purposes
+    "S108",  # todo: Probable insecure usage of temporary file or directory: "/tmp/sys-customizations-sync"
+    "S602",  # todo: `subprocess` call with `shell=True` identified, security issue
+    "S603",  # todo: `subprocess` call: check for execution of untrusted input
+    "S605",  # todo: Starting a process with a shell, possible injection detected
+    "S607",  # todo: Starting a process with a partial executable path
+    "RET504",  # todo:Unnecessary variable assignment before `return` statement
+    "PT004",  # todo: Fixture `tmpdir_unittest_fixture` does not return anything, add leading underscore
+    "PT011",  # todo: `pytest.raises(ValueError)` is too broad, set the `match` parameter or use a more specific exception
+    "PT012",  # todo: `pytest.raises()` block should contain a single simple statement
+    "PT019",  # todo: Fixture `_` without value is injected as parameter, use `@pytest.mark.usefixtures` instead
+]
+
 [tool.ruff.mccabe]
 # Unlike Flake8, default to a complexity level of 10.
 max-complexity = 10
@@ -137,7 +182,6 @@ module = [
     "lightning.app.components.serve.types.image",
     "lightning.app.components.serve.types.type",
     "lightning.app.components.training",
-    "lightning.app.core.api",
     "lightning.app.frontend.panel.app_state_comm",
     "lightning.app.frontend.panel.app_state_watcher",
     "lightning.app.frontend.panel.panel_frontend",

{lightning-2.0.2 → lightning-2.0.4}/requirements/app/base.txt

@@ -1,28 +1,29 @@
 lightning-cloud >=0.5.34
 packaging
 typing-extensions >=4.0.0, <=4.4.0
-deepdiff >=5.7.0, <6.2.4
+deepdiff >=5.7.0, <6.3.1
 starsessions >=1.2.1, <2.0 # strict
 fsspec >=2022.5.0, <=2022.7.1
 croniter >=1.3.0, <1.4.0  # strict; TODO: for now until we find something more robust.
-traitlets >=5.3.0, <5.9.0
+traitlets >=5.3.0, <5.10.0
 arrow >=1.2.0, <1.2.4
 lightning-utilities >=0.7.0, <0.9.0
-beautifulsoup4 >=4.8.0, <4.11.2
-inquirer >=2.10.0, <=3.1.2
+beautifulsoup4 >=4.8.0, <4.12.3
+inquirer >=2.10.0, <=3.1.3
 psutil <5.9.5
 click <=8.1.3
+python-multipart>=0.0.5, <=0.0.6
 
-fastapi >=0.69.0, <0.89.0  # strict; TODO: broken serializations
+fastapi >=0.92.0, <0.98.0
 starlette  # https://fastapi.tiangolo.com/deployment/versions/#about-starlette
 pydantic >=1.7.4, <2.0.0  # https://fastapi.tiangolo.com/deployment/versions/#about-pydantic
 
 dateutils <=0.6.12
 Jinja2 <=3.1.2
 PyYAML <=6.0
-requests <2.28.3
-rich >=12.3.0, <=13.0.1
-urllib3 <=1.26.13
-uvicorn <=0.17.6
-websocket-client <1.5.2
+requests <2.31.1
+rich >=12.3.0, <=13.4.2
+urllib3 <=2.0.2
+uvicorn <=0.22.0
+websocket-client <1.5.3
 websockets <=10.4

lightning-2.0.4/requirements/app/cloud.txt

@@ -0,0 +1,4 @@
+redis >=4.0.1, <=4.5.5
+docker >=5.0.0, <6.1.3
+s3fs >=2022.5.0, <2023.6.1
+# setuptools==59.5.0

{lightning-2.0.2 → lightning-2.0.4}/requirements/app/components.txt

@@ -1,5 +1,5 @@
 # deps required by components in the lightning app repository (src/lightning/app/components)
 lightning_api_access >=0.0.3  # serve
-aiohttp >=3.8.0, <=3.8.3  # auto_scaler
+aiohttp >=3.8.0, <=3.8.4  # auto_scaler
 lightning-fabric >=1.9.0  # multinode
 pytorch-lightning >=1.9.0  # multinode

lightning-2.0.4/requirements/app/test.txt

@@ -0,0 +1,14 @@
+coverage ==7.2.5
+pytest ==7.3.1
+pytest-timeout ==2.1.0
+pytest-cov ==4.0.0
+pytest-doctestplus >=0.9.0
+pytest-asyncio ==0.21.0
+pytest-rerunfailures <=11.1.2
+playwright ==1.35.0
+httpx ==0.24.1
+trio <0.22.0  # strict https://github.com/python-trio/trio/pull/2213
+pympler
+psutil
+setuptools <67.7.0
+requests-mock

lightning-2.0.4/requirements/app/ui.txt

@@ -0,0 +1,2 @@
+streamlit >=1.13.0, <1.22.1
+panel >=1.0.0, <=1.0.2

{lightning-2.0.2 → lightning-2.0.4}/requirements/base.txt

@@ -7,7 +7,7 @@ click<9.0
 croniter<1.4.0,>=1.3.0  # strict
 dateutils<1.0
 deepdiff<7.0,>=5.7.0
-fastapi<0.89.0,>=0.69.0  # strict
+fastapi<1.0,>=0.92.0
 fsspec<2023.0,>=2022.5.0
 fsspec[http]<2024.0,>2021.06.0
 inquirer<4.0,>=2.10.0
@@ -18,6 +18,7 @@ packaging
 packaging<24.0,>=17.1
 psutil<6.0
 pydantic<3.0,>=1.7.4
+python-multipart<1.0,>=0.0.5
 requests<3.0
 rich<14.0,>=12.3.0
 starlette
@@ -27,7 +28,7 @@ torchmetrics<1.0,>=0.7.0
 tqdm<5.0,>=4.57.0
 traitlets<6.0,>=5.3.0
 typing-extensions<5.0,>=4.0.0
-urllib3<2.0
+urllib3<3.0
 uvicorn<1.0
 websocket-client<2.0
 websockets<11.0

{lightning-2.0.2 → lightning-2.0.4}/requirements/fabric/base.txt

@@ -1,9 +1,9 @@
 # NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
 
-numpy >=1.17.2, <1.24.2
-torch >=1.11.0, <=2.0.0
-fsspec[http]>2021.06.0, <2023.2.0
+numpy >=1.17.2, <1.24.4
+torch >=1.11.0, <=2.0.1
+fsspec[http]>2021.06.0, <2023.5.0
 packaging >=17.1, <=23.0
 typing-extensions >=4.0.0, <=4.4.0
 lightning-utilities >=0.7.0, <0.9.0

{lightning-2.0.2 → lightning-2.0.4}/requirements/fabric/examples.txt

@@ -1,6 +1,5 @@
 # NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
-
-torchvision >=0.10.0, <=0.14.1
+torchvision >=0.12.0, <=0.15.2
 torchmetrics >=0.10.0, <0.12.0
 lightning-utilities >=0.8.0, <0.9.0

{lightning-2.0.2 → lightning-2.0.4}/requirements/fabric/strategies.txt

@@ -1,3 +1,3 @@
 # NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
-deepspeed >=0.6.0, <=0.8.0; platform_system != "Windows"
+deepspeed >=0.8.2, <=0.9.1; platform_system != "Windows"

lightning-2.0.4/requirements/fabric/test.txt

@@ -0,0 +1,6 @@
+coverage ==7.2.5
+pytest ==7.3.1
+pytest-cov ==4.0.0
+pytest-rerunfailures ==10.3
+click ==8.1.3
+tensorboardX >=2.2, <=2.6.1  # min version is set by torch.onnx missing attribute

{lightning-2.0.2 → lightning-2.0.4}/requirements/pytorch/base.txt

@@ -1,11 +1,11 @@
 # NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
 
-numpy >=1.17.2, <1.24.2
-torch >=1.11.0, <=2.0.0
-tqdm >=4.57.0, <4.65.0
+numpy >=1.17.2, <1.24.4
+torch >=1.11.0, <=2.0.1
+tqdm >=4.57.0, <4.66.0
 PyYAML >=5.4, <=6.0
-fsspec[http] >2021.06.0, <2023.2.0
+fsspec[http] >2021.06.0, <2023.5.0
 torchmetrics >=0.7.0, <0.12.0  # needed for using fixed compare_version
 packaging >=17.1, <=23.0
 typing-extensions >=4.0.0, <=4.4.0

{lightning-2.0.2 → lightning-2.0.4}/requirements/pytorch/examples.txt

@@ -1,8 +1,7 @@
 # NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
-
-torchvision >=0.11.1, <=0.14.1
+torchvision >=0.12.0, <=0.15.2
 gym[classic_control] >=0.17.0, <0.26.3
-ipython[all] <8.7.1
+ipython[all] <8.14.1
 torchmetrics >=0.10.0, <0.12.0
 lightning-utilities >=0.7.0, <0.9.0

{lightning-2.0.2 → lightning-2.0.4}/requirements/pytorch/extra.txt

@@ -5,6 +5,6 @@
 matplotlib>3.1, <3.6.2
 omegaconf >=2.0.5, <2.4.0
 hydra-core >=1.0.5, <1.4.0
-jsonargparse[signatures] >=4.18.0, <4.19.0
-rich >=12.3.0, <=13.0.1
-tensorboardX >=2.2, <=2.5.1  # min version is set by torch.onnx missing attribute
+jsonargparse[signatures] >=4.18.0, <4.22.0
+rich >=12.3.0, <=13.4.2
+tensorboardX >=2.2, <=2.6.1  # min version is set by torch.onnx missing attribute

{lightning-2.0.2 → lightning-2.0.4}/requirements/pytorch/strategies.txt

@@ -1,4 +1,3 @@
 # NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
-
-deepspeed >=0.6.0, <0.8.0  # TODO: Include 0.8.x after https://github.com/microsoft/DeepSpeed/commit/b587c7e85470329ac25df7c7c2521ff9b2833db7 gets released
+deepspeed >=0.8.2, <=0.9.1; platform_system != "Windows"

lightning-2.0.4/requirements/pytorch/test.txt

@@ -0,0 +1,18 @@
+coverage ==7.2.5
+pytest ==7.3.1
+pytest-cov ==4.0.0
+pytest-forked ==1.4.0
+pytest-rerunfailures ==10.3
+
+# needed in tests
+cloudpickle >=1.3, <2.3.0
+scikit-learn >0.22.1, <1.2.1
+onnx <1.15.0
+onnxruntime <1.16.0
+psutil <5.9.5 # for `DeviceStatsMonitor`
+pandas >1.0, <2.0.3  # needed in benchmarks
+fastapi <0.98.0  # for `ServableModuleValidator`
+uvicorn <0.22.1  # for `ServableModuleValidator`
+
+tensorboard >=2.9.1, <2.14.0  # for `TensorBoardLogger`
+protobuf <=3.20.1 # strict  # an extra is updating protobuf, this pin prevents TensorBoard failure

{lightning-2.0.2 → lightning-2.0.4}/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")

lightning-2.0.2/src/lightning/38d738fa976ff32e3647abda880ddbd8b4ac29efe1e4df47 → lightning-2.0.4/src/lightning/86dcf8da7a6ae2b13e801016525b958a9b8498e90d27f8ad

@@ -4,10 +4,13 @@ include requirements/base.txt
 include src/lightning/app/CHANGELOG.md
 include src/lightning/app/README.md
 include src/lightning/app/components/serve/catimage.png
+include src/lightning/app/py.typed  # marker file for PEP 561
 include src/lightning/app/version.info
 include src/lightning/fabric/CHANGELOG.md
 include src/lightning/fabric/README.md
+include src/lightning/fabric/py.typed  # marker file for PEP 561
 include src/lightning/fabric/version.info
+include src/lightning/py.typed
 include src/lightning/pytorch/CHANGELOG.md
 include src/lightning/pytorch/README.md
 include src/lightning/pytorch/py.typed  # marker file for PEP 561

{lightning-2.0.2 → lightning-2.0.4}/src/lightning/__setup__.py

@@ -29,21 +29,28 @@ _ASSISTANT = _load_py_module(name="assistant", location=os.path.join(_PROJECT_RO
 def _prepare_extras() -> Dict[str, Any]:
     # https://setuptools.readthedocs.io/en/latest/setuptools.html#declaring-extras
     # Define package extras. These are only installed if you specify them.
-    # From remote, use like `pip install pytorch-lightning[dev, docs]`
+    # From remote, use like `pip install "lightning[dev, docs]"`
     # From local copy of repo, use like `pip install ".[dev, docs]"`
     req_files = [Path(p) for p in glob.glob(os.path.join(_PATH_REQUIREMENTS, "*", "*.txt"))]
     common_args = {"unfreeze": "none" if _FREEZE_REQUIREMENTS else "major"}
+    # per-project extras
     extras = {
         f"{p.parent.name}-{p.stem}": _ASSISTANT.load_requirements(file_name=p.name, path_dir=p.parent, **common_args)
         for p in req_files
-        if p.name not in ("docs.txt", "devel.txt", "base.txt") and not p.parts[-2].startswith("_")
+        if p.name not in ("docs.txt", "base.txt") and not p.parent.name.startswith("_")
     }
+    # project specific extras groups
+    extras["fabric-all"] = extras["fabric-strategies"] + extras["fabric-examples"]
+    extras["fabric-dev"] = extras["fabric-all"] + extras["fabric-test"]
+    extras["pytorch-all"] = extras["pytorch-extra"] + extras["pytorch-strategies"] + extras["pytorch-examples"]
+    extras["pytorch-dev"] = extras["pytorch-all"] + extras["pytorch-test"]
+    extras["app-extra"] = extras["app-cloud"] + extras["app-ui"] + extras["app-components"]
+    extras["app-all"] = extras["app-extra"]
+    extras["app-dev"] = extras["app-all"] + extras["app-test"]
+    # merge per-project extras of the same category, e.g. `app-test` + `fabric-test`
     for extra in list(extras):
         name = "-".join(extra.split("-")[1:])
         extras[name] = extras.get(name, []) + extras[extra]
-    extras["extra"] += extras["cloud"] + extras["ui"] + extras["components"]
-    extras["all"] = extras["extra"]
-    extras["dev"] = extras["all"] + extras["test"]  # + extras['docs']
     extras = {name: sorted(set(reqs)) for name, reqs in extras.items()}
     print("The extras are: ", extras)
     return extras

{lightning-2.0.2 → lightning-2.0.4}/src/lightning/app/CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 
+## [2.0.4] - 2023-06-22
+
+### Fixed
+
+- bumped several dependencies to address security volnebilities.
+
+
+## [2.0.3] - 2023-06-07
+
+- Added the property `LightningWork.public_ip` that exposes the public IP of the `LightningWork` instance ([#17742](https://github.com/Lightning-AI/lightning/pull/17742))
+- Add missing python-multipart dependency ([#17244](https://github.com/Lightning-AI/lightning/pull/17244))
+
+### Changed
+
+- Made type hints public ([#17100](https://github.com/Lightning-AI/lightning/pull/17100))
+
+### Fixed
+
+- Fixed `LightningWork.internal_ip` that was mistakenly exposing the public IP instead; now exposes the private/internal IP address ([#17742](https://github.com/Lightning-AI/lightning/pull/17742))
+- Fixed resolution of latest version in CLI ([#17351](https://github.com/Lightning-AI/lightning/pull/17351))
+- Fixed property raised instead of returned ([#17595](https://github.com/Lightning-AI/lightning/pull/17595))
+- Fixed get project ([#17617](https://github.com/Lightning-AI/lightning/pull/17617), [#17666](https://github.com/Lightning-AI/lightning/pull/17666))
+
+
 ## [2.0.2] - 2023-04-24
 
 ### Fixed

{lightning-2.0.2 → lightning-2.0.4}/src/lightning/app/api/http_methods.py

@@ -71,7 +71,7 @@ class _FastApiMockRequest:
 
     @property
     def method(self):
-        raise self._method
+        return self._method
 
     @property
     def headers(self):