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

Remove conflicting setuptools instructions #435

Merged
merged 3 commits into from Dec 13, 2023

Conversation

MattToast
Copy link
Member

This PR fixes some conflicting directives in the SmartSim packaging instructions:

  • setup.py manually listed an incomplete list of packages to include in SmartSim while the setup.cfg was using find_packages. This PR default to setup.cfg with a slightly refined include directive.
  • setup.py manually listed package_data directives while the setup.cfg set include_package_data=True. This PR defaults to setup.cfg.
  • In order to exclude the __pycache__ created from SmartSim modules imported during the setup.py script, __pycache__ and related files were explicitly ignored in the MANIFEST.in.
  • In order to ensure the the smartsim._core.launcher.local package was found by find_packages without reverting to find_namespace_packages an __init__.py module was added to the directory.

@MattToast MattToast added the area: build Issues related to builds, makefiles, installs, etc label Dec 8, 2023
@MattToast MattToast self-assigned this Dec 8, 2023
Copy link

codecov bot commented Dec 8, 2023

Codecov Report

Merging #435 (6bf358d) into develop (d8fba1b) will decrease coverage by 0.11%.
Report is 1 commits behind head on develop.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #435      +/-   ##
===========================================
- Coverage    90.38%   90.28%   -0.11%     
===========================================
  Files           60       60              
  Lines         3839     3859      +20     
===========================================
+ Hits          3470     3484      +14     
- Misses         369      375       +6     
Files Coverage Δ
smartsim/_core/launcher/local/local.py 95.45% <100.00%> (-0.47%) ⬇️

... and 12 files with indirect coverage changes

@MattToast MattToast marked this pull request as ready for review December 9, 2023 01:05
setup.py Show resolved Hide resolved
@MattToast MattToast merged commit 79e8ce5 into CrayLabs:develop Dec 13, 2023
26 checks passed
@MattToast MattToast deleted the unify-find-packages branch December 13, 2023 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: build Issues related to builds, makefiles, installs, etc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants