Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MANIFEST.in and setup.py clean-up #7614

Merged
merged 17 commits into from
Nov 19, 2021
Merged

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented May 19, 2021

What does this PR do?

  • Do not include tests, pl_examples, and benchmarks in the generated wheel (python setup.py bdist_wheel)
  • Prune the MANIFEST.in definition for the source distribution (python setup.py sdist)
  • Copy the MNIST implementation from our tests into pl_examples
  • Removed check-manifest use as it contradicts the output of bdist_wheel:
warning: no previously-included files found matching '.yapfignore'
warning: no previously-included files found matching '*.yaml'
warning: no previously-included files found matching 'Makefile'
warning: no previously-included files matching '*.py' found under directory 'requirements'
no previously-included directories found matching 'docs'
no previously-included directories found matching 'dockers'
no previously-included directories found matching 'legacy'
no previously-included directories found matching 'benchmarks'
no previously-included directories found matching 'notebooks'
no previously-included directories found matching 'pl_examples'
no previously-included directories found matching 'tests'

Credit to @flying-sheep for finding the solution in #7596
Closes #7596
Fixes #10335

Resources:

Manually tested that everything is correctly included/excluded.

Part of https://github.com/PyTorchLightning/internal-dev/issues/132

Before submitting

  • Was this discussed/approved via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • [n/a] Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • [n/a] Did you update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified

cc @Borda @justusschock @awaelchli @akihironitta

@carmocca carmocca added bug Something isn't working refactor labels May 19, 2021
@carmocca carmocca added this to the v1.4 milestone May 19, 2021
@carmocca carmocca self-assigned this May 19, 2021
@codecov
Copy link

codecov bot commented May 19, 2021

Codecov Report

Merging #7614 (c5281a3) into master (3628c31) will decrease coverage by 0%.
The diff coverage is n/a.

❗ Current head c5281a3 differs from pull request most recent head 692c233. Consider uploading reports for the commit 692c233 to get more accurate results

@@           Coverage Diff            @@
##           master   #7614     +/-   ##
========================================
- Coverage      92%     92%     -0%     
========================================
  Files         217     198     -19     
  Lines       14258   12930   -1328     
========================================
- Hits        13161   11914   -1247     
+ Misses       1097    1016     -81     

@carmocca carmocca marked this pull request as draft May 20, 2021 10:49
@edenlightning edenlightning removed this from the v1.4 milestone Jul 1, 2021
.azure-pipelines/gpu-tests.yml Outdated Show resolved Hide resolved
.github/workflows/ci_pkg-install.yml Show resolved Hide resolved
pl_examples/basic_examples/autoencoder.py Outdated Show resolved Hide resolved
Borda
Borda previously requested changes Nov 18, 2021
Copy link
Member

@Borda Borda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls make the benchmark move to test in separate PR, as it does not have any connection to Manifest/setup cleaning

@mergify mergify bot removed the ready PRs ready to be merged label Nov 18, 2021
@mergify mergify bot removed the has conflicts label Nov 18, 2021
@carmocca carmocca changed the base branch from master to ci/move-benchmarks-into-tests November 18, 2021 17:42
@carmocca carmocca marked this pull request as draft November 18, 2021 17:42
Base automatically changed from ci/move-benchmarks-into-tests to master November 19, 2021 02:07
@carmocca carmocca marked this pull request as ready for review November 19, 2021 02:09
@carmocca carmocca requested a review from Borda November 19, 2021 02:10
@mergify mergify bot added the ready PRs ready to be merged label Nov 19, 2021
@carmocca carmocca merged commit 3d2d0f2 into master Nov 19, 2021
@carmocca carmocca deleted the refactor/manifest-setup-cleanup branch November 19, 2021 14:38
@carmocca carmocca modified the milestones: 1.5.x, 1.6 Nov 22, 2021
Raalsky pushed a commit to neptune-ai/pytorch-lightning that referenced this pull request Nov 23, 2021
@awaelchli awaelchli modified the milestones: 1.6, 1.5.x Nov 24, 2021
awaelchli pushed a commit that referenced this pull request Nov 24, 2021
awaelchli pushed a commit that referenced this pull request Nov 24, 2021
lexierule pushed a commit that referenced this pull request Nov 24, 2021
@rohitgr7 rohitgr7 mentioned this pull request Feb 7, 2022
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working ready PRs ready to be merged refactor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

package "tests" in Python path?
7 participants