Skip to content

Commit 04316af

Browse files
authored
Merge branch 'master' into bugfix/collect-cuda-only-if-available
2 parents 3926301 + 7a4b0fc commit 04316af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+438
-807
lines changed

.actions/assistant.py

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,20 @@ def pull_docs_files(
442442
target_dir: str = "docs/source-pytorch/XXX",
443443
checkout: str = "refs/tags/1.0.0",
444444
source_dir: str = "docs/source",
445+
single_page: Optional[str] = None,
445446
as_orphan: bool = False,
446447
) -> None:
447-
"""Pull docs pages from external source and append to local docs."""
448+
"""Pull docs pages from external source and append to local docs.
449+
450+
Args:
451+
gh_user_repo: standard GitHub user/repo string
452+
target_dir: relative location inside the docs folder
453+
checkout: specific tag or branch to checkout
454+
source_dir: relative location inside the remote / external repo
455+
single_page: copy only single page from the remote repo and name it as the repo name
456+
as_orphan: append orphan statement to the page
457+
458+
"""
448459
import zipfile
449460

450461
zip_url = f"https://github.com/{gh_user_repo}/archive/{checkout}.zip"
@@ -464,6 +475,14 @@ def pull_docs_files(
464475
assert len(zip_dirs) == 1
465476
repo_dir = zip_dirs[0]
466477

478+
if single_page: # special case for copying single page
479+
single_page = os.path.join(repo_dir, source_dir, single_page)
480+
assert os.path.isfile(single_page), f"File '{single_page}' does not exist."
481+
name = re.sub(r"lightning[-_]?", "", gh_user_repo.split("/")[-1])
482+
new_rst = os.path.join(_PROJECT_ROOT, target_dir, f"{name}.rst")
483+
AssistantCLI._copy_rst(single_page, new_rst, as_orphan=as_orphan)
484+
return
485+
# continue with copying all pages
467486
ls_pages = glob.glob(os.path.join(repo_dir, source_dir, "*.rst"))
468487
ls_pages += glob.glob(os.path.join(repo_dir, source_dir, "**", "*.rst"))
469488
for rst in ls_pages:

.github/checkgroup.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ subprojects:
9595
- ".github/workflows/tpu-tests.yml"
9696
- "tests/tests_pytorch/run_tpu_tests.sh"
9797
checks:
98-
- "test-on-tpus (pytorch, xrt, v4-8)"
9998
- "test-on-tpus (pytorch, pjrt, v4-8)"
10099

101100
- id: "fabric: Docs"
@@ -248,7 +247,6 @@ subprojects:
248247
- ".github/workflows/tpu-tests.yml"
249248
- "tests/tests_fabric/run_tpu_tests.sh"
250249
checks:
251-
- "test-on-tpus (fabric, xrt, v4-8)"
252250
- "test-on-tpus (pytorch, pjrt, v4-8)"
253251

254252
# SECTION: lightning_app

.github/workflows/_build-packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
with:
4848
name: ${{ inputs.artifact-name }}
4949
path: pypi
50-
- uses: actions/setup-python@v4
50+
- uses: actions/setup-python@v5
5151
with:
5252
python-version: 3.9
5353

.github/workflows/_legacy-checkpoints.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
steps:
5858
- uses: actions/checkout@v4
5959

60-
- uses: actions/setup-python@v4
60+
- uses: actions/setup-python@v5
6161
with:
6262
# Python version here needs to be supported by all PL versions listed in back-compatible-versions.txt.
6363
python-version: 3.8

.github/workflows/ci-examples-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
steps:
5656
- uses: actions/checkout@v4
5757
- name: Set up Python ${{ matrix.python-version }}
58-
uses: actions/setup-python@v4
58+
uses: actions/setup-python@v5
5959
with:
6060
python-version: ${{ matrix.python-version }}
6161

.github/workflows/ci-pkg-install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- { os: "ubuntu-22.04", pkg-name: "notset", python-version: "3.9", pkg-extra: "app" }
5454
steps:
5555
- uses: actions/checkout@v4
56-
- uses: actions/setup-python@v4
56+
- uses: actions/setup-python@v5
5757
with:
5858
python-version: ${{ matrix.python-version }}
5959
- uses: actions/download-artifact@v3

.github/workflows/ci-tests-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
steps:
6262
- uses: actions/checkout@v4
6363
- name: Set up Python ${{ matrix.python-version }}
64-
uses: actions/setup-python@v4
64+
uses: actions/setup-python@v5
6565
with:
6666
python-version: ${{ matrix.python-version }}
6767

.github/workflows/ci-tests-data.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- uses: actions/checkout@v4
5656

5757
- name: Set up Python ${{ matrix.python-version }}
58-
uses: actions/setup-python@v4
58+
uses: actions/setup-python@v5
5959
with:
6060
python-version: ${{ matrix.python-version }}
6161

.github/workflows/ci-tests-fabric.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
- uses: actions/checkout@v4
9797

9898
- name: Set up Python ${{ matrix.python-version }}
99-
uses: actions/setup-python@v4
99+
uses: actions/setup-python@v5
100100
with:
101101
python-version: ${{ matrix.python-version }}
102102

.github/workflows/ci-tests-pytorch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
- uses: actions/checkout@v4
102102

103103
- name: Set up Python ${{ matrix.python-version }}
104-
uses: actions/setup-python@v4
104+
uses: actions/setup-python@v5
105105
with:
106106
python-version: ${{ matrix.python-version }}
107107

0 commit comments

Comments
 (0)