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

Install all data files under datalad/ #6336

Merged
merged 1 commit into from
Jan 7, 2022
Merged

Conversation

jwodder
Copy link
Member

@jwodder jwodder commented Jan 4, 2022

  • The contents of the datalad/test/ca/ folder are currently not included when datalad is installed; this PR fixes that.
  • datalad/metadata/tests/data/nifti1.nii.gz is currently not included when datalad is installed; this PR fixes that.
  • The package_data specification in setup.py listed a number of file extensions to include under datalad/resources/ that are no longer present; this PR removes them.
  • The package data specification is simplified so that all files under datalad/ are included when installing datalad without needing to list all of the desired files' file extensions.

@jwodder jwodder added semver-internal Changes only affect the internal API semver-patch Increment the patch version when merged and removed semver-internal Changes only affect the internal API labels Jan 4, 2022
@codecov
Copy link

codecov bot commented Jan 4, 2022

Codecov Report

Merging #6336 (05ddd72) into master (ec8fdab) will decrease coverage by 8.73%.
The diff coverage is n/a.

❗ Current head 05ddd72 differs from pull request most recent head 7b87fd1. Consider uploading reports for the commit 7b87fd1 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6336      +/-   ##
==========================================
- Coverage   89.85%   81.12%   -8.74%     
==========================================
  Files         331      331              
  Lines       43209    43189      -20     
==========================================
- Hits        38827    35038    -3789     
- Misses       4382     8151    +3769     
Impacted Files Coverage Δ
datalad/version.py 0.00% <0.00%> (-100.00%) ⬇️
datalad/plugin/wtf.py 0.00% <0.00%> (-100.00%) ⬇️
datalad/plugin/addurls.py 0.00% <0.00%> (-100.00%) ⬇️
datalad/interface/clean.py 0.00% <0.00%> (-100.00%) ⬇️
datalad/interface/rerun.py 0.00% <0.00%> (-100.00%) ⬇️
datalad/plugin/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
datalad/plugin/no_annex.py 0.00% <0.00%> (-100.00%) ⬇️
datalad/interface/unlock.py 0.00% <0.00%> (-100.00%) ⬇️
datalad/distribution/drop.py 0.00% <0.00%> (-100.00%) ⬇️
datalad/plugin/add_readme.py 0.00% <0.00%> (-100.00%) ⬇️
... and 125 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ec8fdab...7b87fd1. Read the comment docs.

import sys
from os.path import dirname
from os.path import join as opj
Copy link
Member

Choose a reason for hiding this comment

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

isort does it . I guess we should separate "plain" imports from remapped (the "as" ones).

findsome(opj('distribution', 'tests'), {'yaml'}) +
findsome(opj('metadata', 'tests', 'data'), {'mp3', 'jpg', 'pdf'})
},
include_package_data=True,
Copy link
Member

Choose a reason for hiding this comment

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

I wondered if we had it filtered on purpose. But probably not really on purpose. I guess it should be safe and we would not distribute something we do not actually like to distribute in the binary distribution.

Copy link
Member

@mih mih left a comment

Choose a reason for hiding this comment

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

Good to go! Thx!

@mih mih merged commit 251e780 into datalad:master Jan 7, 2022
@jwodder jwodder deleted the include-test-ca branch May 12, 2023 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
semver-patch Increment the patch version when merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants