-
Notifications
You must be signed in to change notification settings - Fork 111
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+ENH: cocktail of changes while was working on crcns/smaug #746
Conversation
since that breaks our checks for the target file size... TODO to fix it properly but atm otherwise breaks to download crcns list of datasets
that is why test was failing since it was asking for versioning support from non-versioned bucket it asked before about (tests rule! do not ignore them! ;) ) meanwhile fixed few minor issues to robustify ls
…ns pipeline more, use create in initialize_dataset, etc
funny failure on py 3.3 only
|
Codecov Report
@@ Coverage Diff @@
## master #746 +/- ##
==========================================
- Coverage 86.79% 86.76% -0.03%
==========================================
Files 200 200
Lines 18124 18184 +60
==========================================
+ Hits 15731 15778 +47
- Misses 2393 2406 +13
Continue to review full report at Codecov.
|
* origin/master: BF: Handle crazy cfg TYPO: contraint -> constraint ENH: use @_where_reload decorator ENH+RF: remove_section, centralized duplicate docstring for where and reload ENH+TODO: test global gitconfig modifications with mocked HOME RF: swap logic - first dataset, and then git configs RF: move all invocations of git config into one method (+ few typos fixed) TST: For the dataset integration of the config DOC: Small fixes DOC: for ConfigManager BF: Make test deterministic NF: Draft of our own config parser Conflicts: datalad/distribution/create.py - took my version with Michael's added code for .origin check/set
* origin/master: BF: Deal with symlinks RF: Do not resolve symlinks to realpath
2 similar comments
@@ -8,6 +8,9 @@ cache: | |||
matrix: | |||
include: | |||
- python: 2.7 | |||
env: | |||
- secure: "k2rHdTBjUU3pUUASqfRr7kHaaSmNKLLAR2f66A0fFSulih4CXxwLrR3g8/HP9m+jMve8mAYEiPSI7dT7cCm3WMA/piyLh2wKCGgzDD9oLjtvPAioR8dgLpzbgjxV/Vq6fwwPMlvbqqa+MmAImnAoSufEmI7zVQHCq11Hd5nd6Es=" | |||
- secure: "Az7Pzo5pSdAFTTX6XXzE4VUS3wnlIe1vi/+bfHBzDjxstDvZVkPjPzaIs6v/BLod43AYBl1v9dyJR4qnBnaVrUDLB3tC0emLhJ2qnw+8GKHSSImCwIOeZzg9QpXeVQovZUqQVQ3fg3KIWCIzhmJ59EbMQcI4krNDxk4WcXmyVfk=" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unfortunately doesn't work yet :-/ but better to have the rest merged since conflicts would pile up @mih ;)
uf... merge conflicts again/already... if no objections or further comments -- I will merge "master merged" version in an hour or so -- this one includes a number of fixes to tests etc I need to get in |
* origin/master: (29 commits) Evasive maneuver (symlink issue, unrelated to this PR) BF: Let `save -a` commit modified submodules too (closes: dataladgh-636) RF: Redesign Dataset.id -- now also for non-annex ones BF: Correctly recurse into subdatasets beneath a given path RF: Consider the dict API as primary for ConfigManager BF: Trivial fixes ENH: Provide return value and user output for add command RF: Use require_dataset BF: Minor fixes after merging master BF: Minor fixes TST: more testing of add API BF+TST: Fail on 'git addurl'; testing 'addurl' BF: get_git_url didn't work with URL instances BF: dataset resolution was incomplete BF: Make get_containing_subdatasetproperly deal with explicit paths TST+BF: Fix (most) tests + minor bugfixes ENH: First implementation of new API for add RF: Make get_containing_subdataset a emthod of Dataset Start actual implementation of add ENH: recursive and recursion_limit for get_conatining_subdataset TST: Shaping tests for add ... Conflicts: datalad/distribution/create.py -- resolved by looking at original merged PRs and adopting their changes into my changes datalad/support/annexrepo.py -- minor conflicts here -- just kept both introduced kwargs datalad/support/gitrepo.py
[DATALAD]
prefix which now used in many spotscreate
command to initiate dataset--no-commit
to create (if we know that we will commit anyways later)add_to_super="auto"
to add to super only if there is a super