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

BF(RF?): do not aggregate dataset itself if paths for aggregation provided #3002

Merged
merged 1 commit into from Nov 24, 2018

Conversation

@yarikoptic
Copy link
Member

@yarikoptic yarikoptic commented Nov 21, 2018

Otherwise it causes negative side effect in --recursive mode that it would start
recursing all subdatasets.

This issue was mentioned in
#2841

Aggregation of current dataset could always be forced by providing '.' or just not providing paths.
If this PR causes some ideological breakage, it is not visible since no tests seems to get broken.

…vided

Otherwise it causes negative side effect in --recursive mode that it would start
recursing all subdatasets.

This issue was mentioned in
datalad#2841
@yarikoptic yarikoptic requested a review from mih Nov 21, 2018
@codecov
Copy link

@codecov codecov bot commented Nov 22, 2018

Codecov Report

Merging #3002 into master will decrease coverage by 0.02%.
The diff coverage is 94.11%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3002      +/-   ##
==========================================
- Coverage   90.36%   90.34%   -0.03%     
==========================================
  Files         245      245              
  Lines       32270    32282      +12     
==========================================
+ Hits        29161    29164       +3     
- Misses       3109     3118       +9
Impacted Files Coverage Δ
datalad/metadata/tests/test_aggregation.py 99.06% <100%> (+0.02%) ⬆️
datalad/metadata/aggregate.py 87.21% <91.66%> (-4.74%) ⬇️
datalad/metadata/metadata.py 85.98% <0%> (+0.26%) ⬆️
datalad/support/json_py.py 98.63% <0%> (+1.36%) ⬆️
datalad/interface/unlock.py 100% <0%> (+4.93%) ⬆️

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 ec128a6...7f85c98. Read the comment docs.

@yarikoptic
Copy link
Member Author

@yarikoptic yarikoptic commented Nov 22, 2018

reverted one commit back -- will submit the other changes as a separate PR

@yarikoptic
Copy link
Member Author

@yarikoptic yarikoptic commented Nov 23, 2018

@mih - what do you think?

@yarikoptic
Copy link
Member Author

@yarikoptic yarikoptic commented Nov 24, 2018

ok, at least @mih doesn't have objections. I bet his life will also get much better so I will merge

@yarikoptic yarikoptic merged commit d59932e into datalad:master Nov 24, 2018
8 of 9 checks passed
@yarikoptic yarikoptic added this to the Release 0.11.1 milestone Nov 24, 2018
yarikoptic added a commit that referenced this issue Nov 27, 2018
	## 0.11.1 (Nov 25, 2018) -- v7-better-than-v6

	Rushed out bugfix release to stay fully compatible with recent
	[git-annex] which introduced v7 to replace v6.

	### Fixes

	- [install]: be able to install recursively into a dataset ([#2982])
	- [save]: be able to commit/save changes whenever files potentially
	  could have swapped their storage between git and annex
	  ([#1651]) ([#2752]) ([#3009])
	- [aggregate-metadata]:
	  - dataset's itself is now not "aggregated" if specific paths are
		provided for aggregation ([#3002]). That resolves the issue of
		`-r` invocation aggregating all subdatasets of the specified dataset
		as well
	  - also compare/verify the actual content checksum of aggregated metadata
		while considering subdataset metadata for re-aggregation ([#3007])
	- `annex` commands are now chunked assuming 50% "safety margin" on the
	  maximal command line length. Should resolve crashes while operating
	  ot too many files at ones ([#3001])
	- `run` sidecar config processing ([#2991])
	- no double trailing period in docs ([#2984])
	- correct identification of the repository with symlinks in the paths
	  in the tests ([#2972])
	- re-evaluation of dataset properties in case of dataset changes ([#2946])
	- [text2git] procedure to use `ds.repo.set_gitattributes`
	  ([#2974]) ([#2954])
	- Switch to use plain `os.getcwd()` if inconsistency with env var
	  `$PWD` is detected ([#2914])
	- Make sure that credential defined in env var takes precedence
	  ([#2960]) ([#2950])

	### Enhancements and new features

	- [shub://datalad/datalad:git-annex-dev](https://singularity-hub.org/containers/5663/view)
	  provides a Debian buster Singularity image with build environment for
	  [git-annex]. [tools/bisect-git-annex]() provides a helper for running
	  `git bisect` on git-annex using that Singularity container ([#2995])
	- Added [.zenodo.json]() for better integration with Zenodo for citation
	- [run-procedure] now provides names and help messages with a custom
	  renderer for ([#2993])
	- Documentation: point to [datalad-revolution] extension (prototype of
	  the greater DataLad future)
	- [run]
	  - support injecting of a detached command ([#2937])
	- `annex` metadata extractor now extracts `annex.key` metadata record.
	  Should allow now to identify uses of specific files etc ([#2952])
	- Test that we can install from http://datasets.datalad.org
	- Proper rendering of `CommandError` (e.g. in case of "out of space"
	  error) ([#2958])

* tag '0.11.1':
  Adjust the date -- 25th fell through due to __version__ fiasco
  BF+ENH(TST): boost hardcoded version + provide a test to guarantee consistency in the future
  This (expensive) approach is not needed in v6+
  small tuneup to changelog
@yarikoptic yarikoptic deleted the bf-metadata branch Feb 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

1 participant