Merge maint (0.15.5-1-g6e96447d1) into master #6459
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ually" apparently no test was excercising it and no code was using where is on multiple keys at once. Detected this defect while working out the "batch" mode for whereis also adjusted the test for "conflicting" invocation of --all with --key option. Because we loop explicitly now, we would not even invoke git-annex and thus not trigger the error if test is invoked without any file. So I just decided to adjust the test since IMHO it would better reflect needed testing of us still bubbling up the exception. FWIW, filed an issue on --all not erroring out with --batch-keys: https://git-annex.branchable.com/bugs/should_error_on_whereis_--batch-keys_--all/?updated
…nex) Recently (in 8.20210903) git-annex introduced --batch-keys option to a number of commands which otherwise had --batch mode, but not for whenever specification was on keys instead of paths. I thought to make use of whereis(..., key=True, batch=True) mode of operation to only then discover that we do not have that supported.
Some got python2 -- those which were never converted to python3. The python3 ones got python3 [ci skip] [ci: skip] [skip ci]
…tory AFAIK, those could point to directories since otherwise such option would not scale for many realistic scenarios. But @djarecka mentioned that docs explicitly mention file only, not directories, which led her to believe that it must point to a file
Co-authored-by: Michael Hanke <michael.hanke@gmail.com>
DOC: run - adjust description for -i/-o to mention that it could be a directory
Fix AnnexRepo.whereis key=True mode operation, and add batch mode support
compare with http_proxy set:
root@smaug:/tmp/buildd/datalad-0.15.4+git528.g4ea21cb32# http_proxy=http://127.0.0.1:9/ PYTHONPATH=$PWD bin/datalad download-url http://example.com/bogus
It is highly recommended to configure Git before using DataLad. Set both 'user.name' and 'user.email' configuration variables.
[INFO ] Downloading 'http://example.com/bogus' into '/tmp/buildd/datalad-0.15.4+git528.g4ea21cb32/'
download_url(error): /tmp/buildd/datalad-0.15.4+git528.g4ea21cb32/ (file) [AccessFailedError(Failed to establish a new session 1 times. )]
to without (when we should do that assert):
root@smaug:/tmp/buildd/datalad-0.15.4+git528.g4ea21cb32# PYTHONPATH=$PWD bin/datalad download-url http://example.com/bogus
It is highly recommended to configure Git before using DataLad. Set both 'user.name' and 'user.email' configuration variables.
[INFO ] Downloading 'http://example.com/bogus' into '/tmp/buildd/datalad-0.15.4+git528.g4ea21cb32/'
download_url(error): /tmp/buildd/datalad-0.15.4+git528.g4ea21cb32/ (file) [DownloadError(Access to http://example.com/bogus has failed: not found)]
dependencies:
- dependencies: cmd:git=2.34.1 cmd:annex=8.20211123 cmd:bundled-git=UNKNOWN cmd:system-git=2.34.1 cmd:system-ssh=8.7p1 cmd:7z=16.02 annexremote=1.6.0 platformdirs=2.4.1 exifread=2.3.2 humanize=0.0.0 iso8601=0.1.16 keyring=23.5.0 keyrings.alt=UNKNOWN msgpack=1.0.2 mutagen=1.45.1 requests=2.25.1
root@smaug:/tmp/buildd/datalad-0.15.4+git528.g4ea21cb32# python3 --version
Python 3.9.10
* commit '0.15.5-1-g6e96447d1':
BF(TST): add another condition to skip under http_proxy set
[skip ci] Update RST changelog
Update CHANGELOG.md [skip ci]
DOC: use 'relative path' instead of 'file (or directory)'
DOC: Adjust description for -i/-o to mention that it could be a directory
BF: use /usr/bin/env python* shebang in tools/* helpers
ENH: whereis key=True batch=True mode support (requires recent git-annex)
BF: whereis key=True (non batched) needs to loop through entries "manually"
Conflicts:
datalad/support/annexrepo.py -- BatchedAnnex class was moved, so had to
manually apply the "patch" to introduce batch_opt='--batch' option
|
…o enh-merge-maint2 * origin/master: (30 commits) Replace custom entrypoint with standard for special remotes RF: bring back testing of special remote entrypoint shims Update documentation and add a design doc on provenance capture Use specific command in run result message, rather then generic statement Isort imports Alter the semantics of the output reporting in the run result Make `run_command()` slightly easier to read Add explicit flag to skip the dirty test prio run execution Add possibility to force-remove (not unlock) outputs in run_command() Support for parametric run-records Normalize imports Reduce code-duplication and support non-list specification for run_command() Support substitution expansion for run's (extra_)in|outputs too Update `subdatasets()` in the spirit of datalad#6461 Discontinue making global assumptions about number of results Update `create_sibling*()` in the spirit of datalad#6461 Reintroduce the CLI entrypoint for custom special remotes from 0.15 Reintroduce customremotes/main.py e945d2f unify keyword w.r.t. issue datalad#6461 Update foreach-dataset|no_annex|remove|aggregate-metadata() in the spirit of datalad#6461 ... * origin/maint: Fix version incorrectly incremented by release process in CHANGELOGs
|
Code Climate has analyzed commit c19c4a9 and detected 0 issues on this pull request. View more on Code Climate. |
filed #6491, fixed manually, pushed to |
Codecov Report
@@ Coverage Diff @@
## master #6459 +/- ##
==========================================
+ Coverage 89.94% 89.97% +0.02%
==========================================
Files 349 349
Lines 43943 43958 +15
==========================================
+ Hits 39526 39550 +24
+ Misses 4417 4408 -9
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
had conflicts, running CI