addurls: Fix handling of relative URL-FILE #3582
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
A good number of commands use `dataset` for the dataset, as provided, and `ds` for the resolved dataset. Do the same here.
This deviates a bit from our command-line handling (both on 0.11.x and master), but I think that is fine given that (1) the files aren't specified on the command-line, (2) it leads to simpler behavior and code, and (3) the user can still easily specify desired sudirectories in the filename format.
Pass the input file to resolve_path() so that we follow the rules for resolving relative paths against the dataset. Note that this should be switched to rev_resolve_path() once this is merged to master. Closes datalad#3580.
In addition to being unnecessary, using chpwd() could mask path handling issues with bound-dataset calls. Note that aside from the removed chpwd() calls and some "relative -> absolute" changes in the test paths, the diff here is purely from indentation.
When this was added in cc28fd7 (ENH: addurls: Add --cfg-proc option that is passed to create(), 2019-07-24), the intention was to assert this for _every_ subds.
This is admittedly a very ugly merge for test_addurls.py due to the widespread indentation changes coming in. The best view of these changes probably comes from diffing the merge with the second parent: $ git diff HEAD^2.. -- datalad/plugin/tests/test_addurls.py That set of changes can be compared to what would be expected for the current 0.11.x and master differences: $ git diff origin/0.11.x..master -- datalad/plugin/tests/test_addurls.py
We just merged in the maintenance line fix for taking the input file relative to the specified dataset, but on master this should use rev_resolve_path() so that the path considered relative to the dataset only if it's an _instance_. Re: datalad#3580
Codecov Report
@@ Coverage Diff @@
## master #3582 +/- ##
==========================================
+ Coverage 76.99% 77.39% +0.39%
==========================================
Files 272 255 -17
Lines 35354 33676 -1678
==========================================
- Hits 27222 26063 -1159
+ Misses 8132 7613 -519
Continue to review full report at Codecov.
|
1 similar comment
Codecov Report
@@ Coverage Diff @@
## master #3582 +/- ##
==========================================
+ Coverage 76.99% 77.39% +0.39%
==========================================
Files 272 255 -17
Lines 35354 33676 -1678
==========================================
- Hits 27222 26063 -1159
+ Misses 8132 7613 -519
Continue to review full report at Codecov.
|
kyleam
added a commit
that referenced
this issue
Aug 6, 2019
yarikoptic
added a commit
that referenced
this issue
Sep 6, 2019
0.11.7 (Sep 02, 2019) -- python2-we-still-love-you-but-...
Primarily bugfixes with some optimizations and refactorings.
Fixes
- [addurls][]
- now provides better handling when the URL file isn't in the
expected format. ([#3579][])
- always considered a relative file for the URL file argument as
relative to the current working directory, which goes against the
convention used by other commands of taking relative paths as
relative to the dataset argument. ([#3582][])
- [run-procedure][]
- hard coded "python" when formatting the command for non-executable
procedures ending with ".py". `sys.executable` is now used.
([#3624][])
- failed if arguments needed more complicated quoting than simply
surrounding the value with double quotes. This has been resolved
for systems that support `shlex.quote`, but note that on Windows
values are left unquoted. ([#3626][])
- [siblings][] now displays an informative error message if a local
path is given to `--url` but `--name` isn't specified. ([#3555][])
- [sshrun][], the command DataLad uses for `GIT_SSH_COMMAND`, didn't
support all the parameters that Git expects it to. ([#3616][])
- Fixed a number of Unicode py2-compatibility issues. ([#3597][])
Enhancements and new features
- The [annotate-paths][] helper now caches subdatasets it has seen to
avoid unnecessary calls. ([#3570][])
- A repeated configuration query has been dropped from the handling of
`--proc-pre` and `--proc-post`. ([#3576][])
- Calls to `git annex find` now use `--in=.` instead of the alias
`--in=here` to take advantage of an optimization that git-annex (as
of the current release, 7.20190730) applies only to the
former. ([#3574][])
- [addurls][] now suggests close matches when the URL or file format
contains an unknown field. ([#3594][])
- Shared logic used in the setup.py files of Datalad and its
extensions has been moved to modules in the _datalad_build_support/
directory. ([#3600][])
- Get ready for upcoming git-annex dropping support for direct mode
([#3631][])
* tag '0.11.7': (87 commits)
DOC: Added an entry to changelogn on merged 3631
ENH: finalizing changelog for 0.11.7
TST: Update tests for a git-annex without direct mode
TST: utils: Add decorator that skips when direct mode is unsupported
ENH: annexrepo: Refuse to initialize in direct mode if unsupported
ENH: annexrepo: Add check_direct_mode_support method
BF+TST: Avoid leaking patched git-annex version
TST+RF: test_annexrepo: Split up a test
CHANGELOG.md: Second batch for 0.11.7
TST: run_procedure: Mark test_spaces() as known Windows failure
TST: run_procedure: Mark test_quoting as known windows failure
TST: run_procedure: Test more arguments that need quoting
BF(py2): run_procedure: Avoid encoding error in log message
TST: add run_procedure test with spaces in file name
TST/RF: non-hardcoded Python executable
RF: newline at end of file
RF: helper instead of conditional
RF: remove superfluous imports
BF/TST: remove quoting
ENH: replace conditionals with helper function
...
yarikoptic
added a commit
that referenced
this issue
Sep 6, 2019
0.11.7 (Sep 02, 2019) -- python2-we-still-love-you-but-...
Primarily bugfixes with some optimizations and refactorings.
Fixes
- [addurls][]
- now provides better handling when the URL file isn't in the
expected format. ([#3579][])
- always considered a relative file for the URL file argument as
relative to the current working directory, which goes against the
convention used by other commands of taking relative paths as
relative to the dataset argument. ([#3582][])
- [run-procedure][]
- hard coded "python" when formatting the command for non-executable
procedures ending with ".py". `sys.executable` is now used.
([#3624][])
- failed if arguments needed more complicated quoting than simply
surrounding the value with double quotes. This has been resolved
for systems that support `shlex.quote`, but note that on Windows
values are left unquoted. ([#3626][])
- [siblings][] now displays an informative error message if a local
path is given to `--url` but `--name` isn't specified. ([#3555][])
- [sshrun][], the command DataLad uses for `GIT_SSH_COMMAND`, didn't
support all the parameters that Git expects it to. ([#3616][])
- Fixed a number of Unicode py2-compatibility issues. ([#3597][])
- [download-url][] now will create leading directories of the output path
if they do not exist ([#3646][])
Enhancements and new features
- The [annotate-paths][] helper now caches subdatasets it has seen to
avoid unnecessary calls. ([#3570][])
- A repeated configuration query has been dropped from the handling of
`--proc-pre` and `--proc-post`. ([#3576][])
- Calls to `git annex find` now use `--in=.` instead of the alias
`--in=here` to take advantage of an optimization that git-annex (as
of the current release, 7.20190730) applies only to the
former. ([#3574][])
- [addurls][] now suggests close matches when the URL or file format
contains an unknown field. ([#3594][])
- Shared logic used in the setup.py files of Datalad and its
extensions has been moved to modules in the _datalad_build_support/
directory. ([#3600][])
- Get ready for upcoming git-annex dropping support for direct mode
([#3631][])
* tag '0.11.7':
Changelog entry for download-url paths handling
ENH: downloaders: Ensure directories for target exist
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.
Follow conventions (different on master and 0.11.x) for taking URL-FILE as relative to the specified dataset.
This PR is against master, but it has a 0.11.x component. I've pushed that 0.11.x-based branch to a scratch branch so that we can check its Travis build. If all looks good, I'll merge the 0.11.x-bits to 0.11.x after this PR is merged to master.
Closes #3580.