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+ENH: cocktail of changes while was working on crcns/smaug #746

Merged
merged 13 commits into from
Sep 2, 2016

Conversation

yarikoptic
Copy link
Member

  • added "private" argument to .commit to add our [DATALAD] prefix which now used in many spots
  • used create command to initiate dataset
  • --no-commit to create (if we know that we will commit anyways later)
  • parametric renames (outside of tarballs and on extracted content) for crcns pipeline
  • add_to_super="auto" to add to super only if there is a super
  • fixed a test url to db.hcp url
  • request non-compressed content so our logic of checking download by size to match header works and (ideally a TODO item to enable back, but may be later)

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
@coveralls
Copy link

coveralls commented Sep 1, 2016

Coverage Status

Coverage decreased (-0.04%) to 86.562% when pulling eb0cb56 on yarikoptic:bf-crcns into 64730e6 on datalad:master.

@yarikoptic
Copy link
Member Author

funny failure on py 3.3 only

Traceback (most recent call last):

  File "/home/travis/virtualenv/python3.3.6/lib/python3.3/site-packages/nose/case.py", line 198, in runTest

    self.test(*self.arg)

  File "/home/travis/build/datalad/datalad/datalad/tests/test_strings.py", line 25, in test_apply_replacement_rules

    eq_(apply_replacement_rules(['/a/b', ',b,ab'], 'abab'), 'abababab')

AssertionError: 'bbbbbb' != 'abababab'

@codecov-io
Copy link

codecov-io commented Sep 1, 2016

Codecov Report

Merging #746 into master will decrease coverage by 0.02%.
The diff coverage is 84.74%.

Impacted file tree graph

@@            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
Impacted Files Coverage Δ
datalad/crawler/pipelines/tests/test_openfmri.py 90.45% <ø> (ø) ⬆️
datalad/downloaders/tests/test_http.py 81.74% <ø> (ø) ⬆️
datalad/crawler/pipelines/tests/test_balsa.py 100% <ø> (ø) ⬆️
datalad/interface/add_archive_content.py 90.21% <ø> (ø) ⬆️
datalad/downloaders/tests/test_s3.py 67.92% <0%> (-1.31%) ⬇️
datalad/downloaders/base.py 74.23% <0%> (-0.33%) ⬇️
datalad/support/s3.py 27.09% <0%> (ø) ⬆️
datalad/interface/ls.py 52.56% <0%> (-0.42%) ⬇️
datalad/support/gitrepo.py 88.28% <100%> (+0.12%) ⬆️
datalad/downloaders/http.py 83.73% <100%> (+0.15%) ⬆️
... and 14 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 82df4b4...4f74450. Read the comment docs.

* 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
@coveralls
Copy link

Coverage Status

Coverage decreased (-14.4%) to 72.403% when pulling 1d9f555 on yarikoptic:bf-crcns into 9a6ad90 on datalad:master.

@coveralls
Copy link

coveralls commented Sep 1, 2016

Coverage Status

Coverage decreased (-0.04%) to 86.722% when pulling 96b3c38 on yarikoptic:bf-crcns into 8c42f85 on datalad:master.

2 similar comments
@coveralls
Copy link

coveralls commented Sep 1, 2016

Coverage Status

Coverage decreased (-0.04%) to 86.722% when pulling 96b3c38 on yarikoptic:bf-crcns into 8c42f85 on datalad:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.04%) to 86.722% when pulling 96b3c38 on yarikoptic:bf-crcns into 8c42f85 on datalad:master.

@coveralls
Copy link

coveralls commented Sep 2, 2016

Coverage Status

Coverage decreased (-0.03%) to 86.738% when pulling 005f4a6 on yarikoptic:bf-crcns into 8c42f85 on datalad:master.

@@ -8,6 +8,9 @@ cache:
matrix:
include:
- python: 2.7
env:
- secure: "k2rHdTBjUU3pUUASqfRr7kHaaSmNKLLAR2f66A0fFSulih4CXxwLrR3g8/HP9m+jMve8mAYEiPSI7dT7cCm3WMA/piyLh2wKCGgzDD9oLjtvPAioR8dgLpzbgjxV/Vq6fwwPMlvbqqa+MmAImnAoSufEmI7zVQHCq11Hd5nd6Es="
- secure: "Az7Pzo5pSdAFTTX6XXzE4VUS3wnlIe1vi/+bfHBzDjxstDvZVkPjPzaIs6v/BLod43AYBl1v9dyJR4qnBnaVrUDLB3tC0emLhJ2qnw+8GKHSSImCwIOeZzg9QpXeVQovZUqQVQ3fg3KIWCIzhmJ59EbMQcI4krNDxk4WcXmyVfk="
Copy link
Member Author

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 ;)

@yarikoptic
Copy link
Member Author

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
@coveralls
Copy link

coveralls commented Sep 2, 2016

Coverage Status

Coverage decreased (-0.03%) to 86.769% when pulling 4f74450 on yarikoptic:bf-crcns into 82df4b4 on datalad:master.

2 similar comments
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) to 86.769% when pulling 4f74450 on yarikoptic:bf-crcns into 82df4b4 on datalad:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) to 86.769% when pulling 4f74450 on yarikoptic:bf-crcns into 82df4b4 on datalad:master.

@yarikoptic yarikoptic merged commit cf58158 into datalad:master Sep 2, 2016
@yarikoptic yarikoptic deleted the bf-crcns branch September 17, 2016 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants