Skip to content

Commit c09b1df

Browse files
authored
fix package and validate folders (#16299)
1 parent c656307 commit c09b1df

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/actions/pkg-check/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,11 @@ runs:
3939
shell: bash
4040

4141
- name: Unzip packages
42-
if: ${{ inputs.pkg-name != 'lightning' && inputs.pkg-name != 'notset' }}
4342
working-directory: dist
4443
run: for file in `ls *.gz`; do tar -xzf $file; done
4544
shell: bash
4645

4746
- name: Check single pkg/folder
48-
if: ${{ inputs.pkg-name != 'lightning' && inputs.pkg-name != 'notset' }}
4947
working-directory: dist
5048
run: |
5149
import os, glob, pathlib, shutil

.github/workflows/docs-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
6969
- name: Install dependencies
7070
run: |
71-
sudo apt-get update
71+
sudo apt-get update --fix-missing
7272
sudo apt-get install -y cmake pandoc
7373
pip --version
7474
@@ -145,7 +145,7 @@ jobs:
145145
PACKAGE_NAME: ${{ matrix.pkg-name }}
146146
FREEZE_REQUIREMENTS: 1
147147
run: |
148-
sudo apt-get update
148+
sudo apt-get update --fix-missing
149149
sudo apt-get install -y cmake pandoc texlive-latex-extra dvipng texlive-pictures
150150
pip --version
151151
pip install -e . -U -r requirements/${{ matrix.pkg-name }}/docs.txt \

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ def _set_manifest_path(manifest_dir: str, aggregate: bool = False) -> Generator:
9797
lines.extend(fh.readlines())
9898
# convert lightning_foo to lightning/foo
9999
for new, old in mapping.items():
100-
lines += [ln.replace(old, f"lightning/{new}") for ln in lines]
100+
if old == "lightning":
101+
continue # avoid `lightning` -> `lightning/lightning`
102+
lines = [ln.replace(old, f"lightning/{new}") for ln in lines]
101103
lines = sorted(set(filter(lambda ln: not ln.strip().startswith("#"), lines)))
102104
with open(manifest_path, mode="w") as fp:
103105
fp.writelines(lines)

src/lightning_app/MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ include .actions/assistant.py
77
recursive-include src/lightning_app/cli/*-template *
88
# TODO: remove this once lightning-ui package is ready as a dependency
99
recursive-include src/lightning_app/ui *
10-
include src/lightning/app/components/serve/catimage.png
10+
include src/lightning_app/components/serve/catimage.png

0 commit comments

Comments
 (0)