Merge branch 'master' into ci/requires

Lightning-AI · Dec 13, 2023 · cef2d5e · cef2d5e
2 parents 68da1e3 + 665c94c
commit cef2d5e
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 74 deletions.
diff --git a/.github/label-change.yml b/.github/label-change.yml
@@ -1,68 +1,91 @@
 app:
-  - "src/lightning/app/**"
-  - "src/lightning_app/*"
-  - "tests/tests_app/**"
-  - "tests/integrations_app/**"
-  - "tests/integrations_app_examples/**"
-  - "examples/app/**"
-  - "docs/source-app/**"
-  - "requirements/app/**"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "src/lightning/app/**"
+          - "src/lightning_app/*"
+          - "tests/tests_app/**"
+          - "tests/integrations_app/**"
+          - "tests/integrations_app_examples/**"
+          - "examples/app/**"
+          - "docs/source-app/**"
+          - "requirements/app/**"
 
 data:
-  - "src/lightning/data/**"
-  - "tests/tests_data/**"
-  - "requirements/data/**"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "src/lightning/data/**"
+          - "tests/tests_data/**"
+          - "requirements/data/**"
 
 store:
-  - "src/lightning/store/**"
-  - "tests/tests_store/**"
-  - "requirements/store/**"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "src/lightning/store/**"
+          - "tests/tests_store/**"
+          - "requirements/store/**"
 
 pl:
-  - "src/lightning/pytorch/**"
-  - "src/pytorch_lightning/*"
-  - "tests/tests_pytorch/**"
-  - "tests/legacy/**"
-  - "examples/pytorch/**"
-  - "docs/source-pytorch/**"
-  - "requirements/pytorch/**"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "src/lightning/pytorch/**"
+          - "src/pytorch_lightning/*"
+          - "tests/tests_pytorch/**"
+          - "tests/legacy/**"
+          - "examples/pytorch/**"
+          - "docs/source-pytorch/**"
+          - "requirements/pytorch/**"
 
 fabric:
-  - "src/lightning/fabric/**"
-  - "src/lightning_fabric/*"
-  - "tests/tests_fabric/**"
-  - "examples/fabric/**"
-  - "docs/source-fabric/**"
-  - "requirements/fabric/**"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "src/lightning/fabric/**"
+          - "src/lightning_fabric/*"
+          - "tests/tests_fabric/**"
+          - "examples/fabric/**"
+          - "docs/source-fabric/**"
+          - "requirements/fabric/**"
 
 ci:
-  - ".actions/**"
-  - ".azure/**"
-  - ".github/**"
-  - "dockers/**"
-  - ".pre-commit-config.yml"
+  - changed-files:
+      - any-glob-to-any-file:
+          - ".actions/**"
+          - ".azure/**"
+          - ".github/**"
+          - "dockers/**"
+          - ".pre-commit-config.yml"
 
 docs:
-  - ".github/workflows/docs-build.yml"
-  - "docs/**"
-  - "requirements/docs.txt"
-  - "requirements/*/docs.txt"
+  - changed-files:
+      - any-glob-to-any-file:
+          - ".github/workflows/docs-build.yml"
+          - "docs/**"
+          - "requirements/docs.txt"
+          - "requirements/*/docs.txt"
 
 package:
-  - ".github/workflows/ci-pkg-install.yml"
-  - "setup.py"
-  - "pyproject.toml"
-  - "src/version.info"
-  - "src/lightning/*/__setup__.py"
-  - "src/lightning/*/__version__.py"
-  - "src/lightning_app/*"
-  - "src/lightning_fabric/*"
-  - "src/pytorch_lightning/*"
+  - changed-files:
+      - any-glob-to-any-file:
+          - ".github/workflows/ci-pkg-install.yml"
+          - "setup.py"
+          - "pyproject.toml"
+          - "src/version.info"
+          - "src/lightning/*/__setup__.py"
+          - "src/lightning/*/__version__.py"
+          - "src/lightning_app/*"
+          - "src/lightning_fabric/*"
+          - "src/pytorch_lightning/*"
 
 dockers:
-  - "dockers/**"
-  - ".github/workflows/docker-build.yml"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "dockers/**"
+          - ".github/workflows/docker-build.yml"
 
 dependencies:
-  - "requirements.txt"
-  - "requirements/**"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "requirements.txt"
+          - "requirements/**"
+
+release:
+  - base-branch: "release/*"
diff --git a/.github/workflows/labeler-issue.yml b/.github/workflows/labeler-issue.yml
@@ -28,7 +28,7 @@ jobs:
           template-path: .github/ISSUE_TEMPLATE/1_bug_report.yaml
 
       - name: Set labels based on severity field
-        uses: redhat-plumbers-in-action/advanced-issue-labeler@v2
+        uses: redhat-plumbers-in-action/advanced-issue-labeler@v3
         with:
           issue-form: ${{ steps.issue-parser.outputs.jsonString }}
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml
@@ -8,7 +8,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v4
+      - uses: actions/labeler@v5
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           configuration-path: .github/label-change.yml
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -42,7 +42,8 @@ build:
     - pip install -U pip awscli py-tree --user
     - python -m awscli s3 sync --no-sign-request s3://sphinx-packages/ dist/ ; ls -lh dist/
     - >
-      pip install -e . -q -r _notebooks/.actions/requires.txt \
+      pip install -e ".[app]" -q -r _notebooks/.actions/requires.txt \
+          -r requirements/app/docs.txt \
           -r requirements/fabric/docs.txt \
           -r requirements/pytorch/docs.txt \
           -f 'https://download.pytorch.org/whl/cpu/torch_stable.html' -f dist/ ;

diff --git a/docs/crossroad.html b/docs/crossroad.html
@@ -9,6 +9,7 @@
     </style>
   </head>
   <body>
+    <a href="app/"><button>App</button></a>
     <a href="fabric/"><button>Fabric</button></a>
     <a href="pytorch/"><button>PyTorch</button></a>
   </body>

diff --git a/docs/rtfd-build.sh b/docs/rtfd-build.sh
@@ -1,19 +1,17 @@
 # building for PRs and skip stable and latest states
+set -ex
 
 if ! [ $READTHEDOCS_VERSION == "latest" -o $READTHEDOCS_VERSION == "stable" ];
 then
     export FAST_DOCS_DEV=1 ;
     root=$(pwd) ;
-    # build Fabric
-    cd $root/docs/source-fabric ;
-    make html --jobs $(nproc) ;
-    cd $root/docs ;
-    mv build/html build/fabric ;
-    # build PyTorch
-    cd $root/docs/source-pytorch ;
-    make html --jobs $(nproc) ;
-    cd $root/docs ;
-    mv build/html build/pytorch ;
+    for pkg in 'app' 'fabric' 'pytorch' ;
+    do
+      cd $root/docs/source-$pkg ;
+      make html --jobs $(nproc) ;
+      cd $root/docs ;
+      mv build/html build/$pkg ;
+    done ;
     # cross-road
     rm -rf build/doctrees ;
     cp crossroad.html build/index.html

diff --git a/requirements/app/test.txt b/requirements/app/test.txt
@@ -2,7 +2,7 @@ coverage ==7.3.1
 pytest ==7.4.0
 pytest-timeout ==2.1.0
 pytest-cov ==4.1.0
-pytest-doctestplus ==0.9.0
+pytest-doctestplus ==1.0.0
 pytest-asyncio ==0.21.1
 # pytest-random-order ==1.1.0
 pytest-rerunfailures ==12.0

diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -1,6 +1,6 @@
 sphinx >5.0, <6.0
 myst-parser >=0.18.1, <3.0.0
-nbsphinx >=0.8.5, <=0.8.9
+nbsphinx >=0.8.5, <=0.9.2
 pandoc >=1.0, <=2.3
 docutils >=0.16, <0.21
 sphinxcontrib-fulltoc >=1.0, <=1.2.0

diff --git a/src/lightning/app/cli/react-ui-template/ui/package.json b/src/lightning/app/cli/react-ui-template/ui/package.json
@@ -11,7 +11,7 @@
     "@emotion/react": "^11.8.2",
     "@emotion/styled": "^11.8.1",
     "@mui/material": "5.8.5",
-    "axios": "^0.26.1",
+    "axios": "^1.6.0",
     "lodash": "^4.17.21",
     "nanoid": "^3.3.1",
     "react": "^17.0.2",

diff --git a/src/lightning/app/cli/react-ui-template/ui/yarn.lock b/src/lightning/app/cli/react-ui-template/ui/yarn.lock
@@ -545,12 +545,19 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-axios@^0.26.1:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
-  integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+
+axios@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
   dependencies:
-    follow-redirects "^1.14.8"
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
 babel-plugin-macros@^2.6.1:
   version "2.8.0"
@@ -607,6 +614,13 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
 convert-source-map@^1.5.0, convert-source-map@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
@@ -637,6 +651,11 @@ debug@^4.1.0:
   dependencies:
     ms "2.1.2"
 
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
+
 dom-helpers@^5.0.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
@@ -808,10 +827,19 @@ find-root@^1.1.0:
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
   integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
-follow-redirects@^1.14.8:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
-  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+follow-redirects@^1.15.0:
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
+  integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
+
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
 
 fsevents@~2.3.2:
   version "2.3.2"
@@ -909,6 +937,18 @@ loose-envify@^1.1.0, loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
+[email protected]:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.1.12:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
 [email protected]:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -994,6 +1034,11 @@ prop-types@^15.6.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 react-dom@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"