Do not modify MANIFEST.in on install #15646

carmocca · 2022-11-11T13:25:47Z

Re-land of #15549 which was reverted in #15644 after an accidental merge that broke e2e app tests

What does this PR do?

Part of #15474

Each package keeps it's own MANIFEST.in

Does your PR introduce any breaking changes? If yes, please list them.

None

cc @carmocca @akihironitta @Borda

carmocca · 2022-11-11T13:26:31Z

This is blocked by finding out why app e2e tests hang with these changes

carmocca · 2022-11-12T16:26:16Z

I tried pip installing this branch and master in 2 different environments, and then diffing both resulting directories to see if it's all equal

diff --exclude '*.md' --exclude '__pycache__' -r src/lightning ../moccaLightning/src/lightning --brief
Only in src/lightning/app: MANIFEST.in
Files src/lightning/app/__setup__.py and ../moccaLightning/src/lightning/app/__setup__.py differ
Only in src/lightning/lite: MANIFEST.in
Files src/lightning/lite/__setup__.py and ../moccaLightning/src/lightning/lite/__setup__.py differ
Only in src/lightning/pytorch: MANIFEST.in
Files src/lightning/pytorch/__setup__.py and ../moccaLightning/src/lightning/pytorch/__setup__.py differ
Files src/lightning/__setup__.py and ../moccaLightning/src/lightning/__setup__.py differ

And they are (excluding the modifications of the PR itself). The quest to find the e2e issue continues...

This reverts commit cf6a95e.

carmocca · 2022-11-16T08:30:38Z

The e2e are hanging due to failed platform machine provisioning. Cause still unknown

github-actions · 2022-11-25T17:31:41Z

⚡ Required checks status: All passing 🟢

Groups summary

🟢 pytorch_lightning: Tests workflow

Check ID	Status
pl-cpu (macOS-11, pytorch, 3.8, 1.11)	success	✅
pl-cpu (macOS-11, pytorch, 3.9, 1.12)	success	✅
pl-cpu (macOS-11, pytorch, 3.10, 1.13)	success	✅
pl-cpu (macOS-11, pytorch, 3.8, 1.10, oldest)	success	✅
pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.10)	success	✅
pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.11)	success	✅
pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)	success	✅
pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.13)	success	✅
pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.10, oldest)	success	✅
pl-cpu (windows-2022, pytorch, 3.9, 1.11)	success	✅
pl-cpu (windows-2022, pytorch, 3.10, 1.12)	success	✅
pl-cpu (windows-2022, pytorch, 3.10, 1.13)	success	✅
pl-cpu (windows-2022, pytorch, 3.7, 1.10, oldest)	success	✅
pl-cpu (slow, macOS-11, pytorch, 3.7, 1.11)	success	✅
pl-cpu (slow, ubuntu-20.04, pytorch, 3.7, 1.11)	success	✅
pl-cpu (slow, windows-2022, pytorch, 3.7, 1.11)	success	✅
pl-cpu (macOS-11, lightning, 3.8, 1.13)	success	✅
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.13)	success	✅
pl-cpu (windows-2022, lightning, 3.8, 1.13)	success	✅

These checks are required after the changes to .actions/setup_tools.py, src/lightning_lite/MANIFEST.in, src/lightning_lite/__setup__.py, src/pytorch_lightning/MANIFEST.in, src/pytorch_lightning/__setup__.py.

🟢 pytorch_lightning: Azure GPU

Check ID	Status
pytorch-lightning (GPUs)	success	✅

These checks are required after the changes to .actions/setup_tools.py, src/pytorch_lightning/MANIFEST.in, src/pytorch_lightning/__setup__.py, src/lightning_lite/MANIFEST.in, src/lightning_lite/__setup__.py.

🟢 pytorch_lightning: Azure HPU

Check ID	Status
pytorch-lightning (HPUs)	success	✅

These checks are required after the changes to .actions/setup_tools.py, src/lightning_lite/MANIFEST.in, src/lightning_lite/__setup__.py, src/pytorch_lightning/MANIFEST.in, src/pytorch_lightning/__setup__.py.

🟢 pytorch_lightning: Azure IPU

Check ID	Status
pytorch-lightning (IPUs)	success	✅

These checks are required after the changes to .actions/setup_tools.py, src/lightning_lite/MANIFEST.in, src/lightning_lite/__setup__.py, src/pytorch_lightning/MANIFEST.in, src/pytorch_lightning/__setup__.py.

🟢 pytorch_lightning: Docs

Check ID	Status
make-doctest (pytorch)	success	✅
make-html (pytorch)	success	✅

These checks are required after the changes to src/pytorch_lightning/MANIFEST.in, src/pytorch_lightning/__setup__.py, .actions/setup_tools.py, .github/workflows/docs-checks.yml, setup.py.

🟢 pytorch_lightning: Docker

Check ID	Status
build-cuda (3.9, 1.10, 11.3.1)	success	✅
build-cuda (3.9, 1.11, 11.3.1)	success	✅
build-cuda (3.9, 1.12, 11.6.1)	success	✅
build-cuda (3.9, 1.13, 11.6.1)	success	✅
build-hpu (1.5.0, 1.11.0)	success	✅
build-ipu (3.9, 1.10)	success	✅
build-NGC	success	✅
build-pl (3.9, 1.10, 11.3.1)	success	✅
build-pl (3.9, 1.11, 11.3.1)	success	✅
build-pl (3.9, 1.12, 11.6.1)	success	✅
build-pl (3.9, 1.13, 11.6.1)	success	✅
build-xla (3.7, 1.12)	success	✅

These checks are required after the changes to .actions/setup_tools.py, setup.py.

🟢 lightning_lite: CPU workflow

Check ID	Status
lite-cpu (macOS-11, lite, 3.8, 1.11)	success	✅
lite-cpu (macOS-11, lite, 3.9, 1.12)	success	✅
lite-cpu (macOS-11, lite, 3.10, 1.13)	success	✅
lite-cpu (macOS-11, lite, 3.7, 1.10, oldest)	success	✅
lite-cpu (ubuntu-20.04, lite, 3.8, 1.10)	success	✅
lite-cpu (ubuntu-20.04, lite, 3.9, 1.11)	success	✅
lite-cpu (ubuntu-20.04, lite, 3.10, 1.12)	success	✅
lite-cpu (ubuntu-20.04, lite, 3.10, 1.13)	success	✅
lite-cpu (ubuntu-20.04, lite, 3.7, 1.10, oldest)	success	✅
lite-cpu (windows-2022, lite, 3.9, 1.11)	success	✅
lite-cpu (windows-2022, lite, 3.10, 1.12)	success	✅
lite-cpu (windows-2022, lite, 3.10, 1.13)	success	✅
lite-cpu (windows-2022, lite, 3.7, 1.10, oldest)	success	✅
lite-cpu (macOS-11, lightning, 3.8, 1.13)	success	✅
lite-cpu (ubuntu-20.04, lightning, 3.8, 1.13)	success	✅
lite-cpu (windows-2022, lightning, 3.8, 1.13)	success	✅

These checks are required after the changes to .actions/setup_tools.py, src/lightning_lite/MANIFEST.in, src/lightning_lite/__setup__.py.

🟢 lightning_lite: Azure GPU

Check ID	Status
lightning-lite (GPUs)	success	✅

These checks are required after the changes to .actions/setup_tools.py, src/lightning_lite/MANIFEST.in, src/lightning_lite/__setup__.py.

🟢 lightning_app: Tests workflow

Check ID	Status
app-pytest (macOS-11, app, 3.8, latest)	success	✅
app-pytest (macOS-11, app, 3.8, oldest)	success	✅
app-pytest (macOS-11, lightning, 3.9, latest)	success	✅
app-pytest (ubuntu-20.04, app, 3.8, latest)	success	✅
app-pytest (ubuntu-20.04, app, 3.8, oldest)	success	✅
app-pytest (ubuntu-20.04, lightning, 3.9, latest)	success	✅
app-pytest (windows-2022, app, 3.8, latest)	success	✅
app-pytest (windows-2022, app, 3.8, oldest)	success	✅
app-pytest (windows-2022, lightning, 3.8, latest)	success	✅

These checks are required after the changes to .actions/setup_tools.py, src/lightning_app/MANIFEST.in, src/lightning_app/__setup__.py, src/lightning_app/testing/testing.py, src/lightning_app/utilities/packaging/lightning_utils.py, tests/tests_app/utilities/packaging/test_lightning_utils.py, setup.py.

🟢 lightning_app: Examples

Check ID	Status
app-examples (macOS-11, app, 3.9, latest)	success	✅
app-examples (macOS-11, app, 3.9, oldest)	success	✅
app-examples (macOS-11, lightning, 3.9, latest)	success	✅
app-examples (ubuntu-20.04, app, 3.9, latest)	success	✅
app-examples (ubuntu-20.04, app, 3.9, oldest)	success	✅
app-examples (ubuntu-20.04, lightning, 3.9, latest)	success	✅
app-examples (windows-2022, app, 3.9, latest)	success	✅
app-examples (windows-2022, app, 3.9, oldest)	success	✅
app-examples (windows-2022, lightning, 3.9, latest)	success	✅

These checks are required after the changes to .actions/setup_tools.py, src/lightning_app/MANIFEST.in, src/lightning_app/__setup__.py, src/lightning_app/testing/testing.py, src/lightning_app/utilities/packaging/lightning_utils.py, setup.py.

🟢 lightning_app: Azure

Check ID	Status
App.cloud-e2e	success	✅

These checks are required after the changes to .actions/setup_tools.py, src/lightning_app/MANIFEST.in, src/lightning_app/__setup__.py, src/lightning_app/testing/testing.py, src/lightning_app/utilities/packaging/lightning_utils.py, setup.py.

🟢 lightning_app: Docs

Check ID	Status
make-doctest (app)	success	✅
make-html (app)	success	✅

These checks are required after the changes to .actions/setup_tools.py, src/lightning_app/MANIFEST.in, src/lightning_app/__setup__.py, src/lightning_app/testing/testing.py, src/lightning_app/utilities/packaging/lightning_utils.py, .github/workflows/docs-checks.yml, setup.py.

🟢 mypy

Check ID	Status
mypy	success	✅

These checks are required after the changes to .actions/setup_tools.py, src/lightning/__setup__.py, src/lightning_app/MANIFEST.in, src/lightning_app/__setup__.py, src/lightning_app/testing/testing.py, src/lightning_app/utilities/packaging/lightning_utils.py, src/lightning_lite/MANIFEST.in, src/lightning_lite/__setup__.py, src/pytorch_lightning/MANIFEST.in, src/pytorch_lightning/__setup__.py.

🟢 install

Check ID	Status
install-pkg (ubuntu-22.04, app, 3.7)	success	✅
install-pkg (ubuntu-22.04, app, 3.10)	success	✅
install-pkg (ubuntu-22.04, lite, 3.7)	success	✅
install-pkg (ubuntu-22.04, lite, 3.10)	success	✅
install-pkg (ubuntu-22.04, pytorch, 3.7)	success	✅
install-pkg (ubuntu-22.04, pytorch, 3.10)	success	✅
install-pkg (ubuntu-22.04, lightning, 3.7)	success	✅
install-pkg (ubuntu-22.04, lightning, 3.10)	success	✅
install-pkg (macOS-12, app, 3.7)	success	✅
install-pkg (macOS-12, app, 3.10)	success	✅
install-pkg (macOS-12, lite, 3.7)	success	✅
install-pkg (macOS-12, lite, 3.10)	success	✅
install-pkg (macOS-12, pytorch, 3.7)	success	✅
install-pkg (macOS-12, pytorch, 3.10)	success	✅
install-pkg (macOS-12, lightning, 3.7)	success	✅
install-pkg (macOS-12, lightning, 3.10)	success	✅
install-pkg (windows-2022, app, 3.7)	success	✅
install-pkg (windows-2022, app, 3.10)	success	✅
install-pkg (windows-2022, lite, 3.7)	success	✅
install-pkg (windows-2022, lite, 3.10)	success	✅
install-pkg (windows-2022, pytorch, 3.7)	success	✅
install-pkg (windows-2022, pytorch, 3.10)	success	✅
install-pkg (windows-2022, lightning, 3.7)	success	✅
install-pkg (windows-2022, lightning, 3.10)	success	✅

These checks are required after the changes to .actions/setup_tools.py, setup.py, src/lightning/__setup__.py, src/lightning_app/MANIFEST.in, src/lightning_app/__setup__.py, src/lightning_app/testing/testing.py, src/lightning_app/utilities/packaging/lightning_utils.py, src/lightning_lite/MANIFEST.in, src/lightning_lite/__setup__.py, src/pytorch_lightning/MANIFEST.in, src/pytorch_lightning/__setup__.py.

Thank you for your contribution! 💜

Note
This comment is automatically generated and updates for 60 minutes every 180 seconds. If you have any other questions, contact carmocca for help.

This reverts commit a812d04.

This reverts commit 8071cdb.

carmocca added the ci Continuous Integration label Nov 11, 2022

carmocca added this to the v1.8.x milestone Nov 11, 2022

carmocca requested a review from Borda as a code owner November 11, 2022 13:25

carmocca self-assigned this Nov 11, 2022

carmocca requested review from akihironitta, awaelchli, ethanwharris, hhsecond, justusschock, lantiga, tchaton and williamFalcon as code owners November 11, 2022 13:25

carmocca mentioned this pull request Nov 11, 2022

PKG: distribute single semver #15374

Merged

12 tasks

Borda approved these changes Nov 11, 2022

View reviewed changes

mergify bot added has conflicts and removed has conflicts labels Nov 12, 2022

Do not modify MANIFEST.in on install

46a3366

carmocca force-pushed the ci/manifest-2 branch from 23ce2fb to 46a3366 Compare November 12, 2022 15:57

Not needed

3d4d20c

carmocca added 4 commits November 13, 2022 01:27

Prune unnecessary requirement files

cf6a95e

Merge branch 'master' into ci/manifest-2

1778812

Revert "Prune unnecessary requirement files"

1996fe8

This reverts commit cf6a95e.

Merge branch 'master' into ci/manifest-2

4f6e1cf

mergify bot added the has conflicts label Nov 24, 2022

Merge branch 'master' into ci/manifest-2

8893bc6

mergify bot removed the has conflicts label Nov 25, 2022

carmocca added 12 commits November 25, 2022 18:51

Fix failure

a812d04

Print the app ID

8071cdb

Revert "Fix failure"

2f55011

This reverts commit a812d04.

Another fix

e06e842

Remove dupe

041cac6

fix?

39fd64c

Merge branch 'master' into ci/manifest-2

02e1b7f

Another attempt

c9a6830

Simplify

b98be7c

Reduce diff

87c9ba5

Last?

4a415c5

Maybe this?

2137040

carmocca force-pushed the ci/manifest-2 branch from 17f1e86 to 2137040 Compare November 26, 2022 03:36

carmocca added 3 commits November 26, 2022 04:48

Fix for mirror

90f18eb

Further fixes

63318dc

Revert "Print the app ID"

161fbfd

This reverts commit 8071cdb.

carmocca force-pushed the ci/manifest-2 branch 2 times, most recently from 79e0797 to 02d117c Compare November 26, 2022 04:47

Fix

c60c4ef

carmocca force-pushed the ci/manifest-2 branch from 02d117c to c60c4ef Compare November 26, 2022 04:54

carmocca added 2 commits November 26, 2022 06:17

Test

5b25b01

Test

cc07db5

awaelchli approved these changes Nov 26, 2022

View reviewed changes

mergify bot added the ready PRs ready to be merged label Nov 26, 2022

carmocca enabled auto-merge (squash) November 26, 2022 22:24

carmocca merged commit eaa71a2 into master Nov 26, 2022

carmocca deleted the ci/manifest-2 branch November 26, 2022 22:27

carmocca mentioned this pull request Nov 28, 2022

Fix pip install with no PACKAGE_NAME or editable mode #15853

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Do not modify MANIFEST.in on install #15646

Do not modify MANIFEST.in on install #15646

Uh oh!

carmocca commented Nov 11, 2022

Uh oh!

carmocca commented Nov 11, 2022

Uh oh!

carmocca commented Nov 12, 2022

Uh oh!

carmocca commented Nov 16, 2022

Uh oh!

github-actions bot commented Nov 25, 2022 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Do not modify MANIFEST.in on install #15646

Do not modify MANIFEST.in on install #15646

Uh oh!

Conversation

carmocca commented Nov 11, 2022

What does this PR do?

Does your PR introduce any breaking changes? If yes, please list them.

Uh oh!

carmocca commented Nov 11, 2022

Uh oh!

carmocca commented Nov 12, 2022

Uh oh!

carmocca commented Nov 16, 2022

Uh oh!

github-actions bot commented Nov 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚡ Required checks status: All passing 🟢

Groups summary

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions bot commented Nov 25, 2022 •

edited

Loading