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: messing with realpaths, fixing up install tests (no creativism), etc #743

Merged
merged 8 commits into from
Sep 2, 2016

Conversation

yarikoptic
Copy link
Member

might provide hints on #739 resolution with symlinks problem

* origin/master: (70 commits)
  DOC: typo
  codename for new balsa dataset
  TST: Test fast modes of info, repo_info
  ENH: Add fast flag to info, repo_info of AnnexRepo
  BF: just take 3rd word in git version output
  BF: compatibility with git >= 2.9
  BF: 2nd workaround of get_dis_filename due to authentication requirment
  BF: indeed not ready for utf8 ;-)
  BF: no testtools used any longer (was originally needed for testkraut pieces)
  ENH: updated contributors, removed executable bit from setup_support.py
  UTF8 into TMPDIR name -- must brake things up
  ENH: let's add a space into TMPDIR symlink for bigger insult
  ENH: travis -- add a run with symlinked TMPDIR
  Document that annex add ignored dotfiles in a unittest
  ENH: Implement suggestion to have both Dataset.id and AnnexRepo.uuid
  BF: use custom get_disposition_filename reusing balsa downloader
  NF: Dataset.id property (closes dataladgh-701)
  TST: changing file ending due to disdain for zip
  BF&TST: crawl the show of file url to get to download, tst reflects this
  BF&TST: verify_files properly compares now, test updated to show this
  ...
@yarikoptic yarikoptic changed the title BF(BK): messing with realpaths, fixing up install tests (no creativism), etc WiP/TEMP BF(BK): messing with realpaths, fixing up install tests (no creativism), etc Aug 30, 2016
…tall

* gh-hanke/rf-pathresolution:
  BF: Deal with symlinks
  RF: Do not resolve symlinks to realpath
  TST&RF: added more testing, placed exclude loop back but kept changes
  BF: allow unrelated merges while merging incoming-processed in balsa
  ENH: Pass call args to results renderers (closes: dataladgh-650)
  RF: compare all files with find_files
  BF+TST: Ignore excluded dirs before strip leading_dir
  BK+TST: Reproduce archive stripping, exclude bug
  BK: cannot find path to '1'
  WiP: Attempt to reproduce crcns dir name bug
  TST: to demonstrate bug in stripping of dirs

 Conflicts:
	datalad/distribution/dataset.py -- took my imports
* 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
nothing really -- just bringing together with prev merge to make github happy
@coveralls
Copy link

coveralls commented Sep 1, 2016

Coverage Status

Coverage decreased (-0.2%) to 86.556% when pulling 957aea7 on yarikoptic:bf-install into 8c42f85 on datalad:master.

@yarikoptic
Copy link
Member Author

grr... and this one is in conflict now. ok -- if no objections/recommendations -- will be updated and merged in an hour or two

…le running a test for require_dataset

sorry -- I have screwed up and melded merge with fixing of the test_require_dataset

wasn't intentionally -- damn -a
@codecov-io
Copy link

codecov-io commented Sep 2, 2016

Codecov Report

Merging #743 into master will decrease coverage by 0.06%.
The diff coverage is 82.05%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #743      +/-   ##
==========================================
- Coverage   86.79%   86.73%   -0.07%     
==========================================
  Files         200      200              
  Lines       18124    18139      +15     
==========================================
+ Hits        15731    15732       +1     
- Misses       2393     2407      +14
Impacted Files Coverage Δ
datalad/distribution/dataset.py 95.38% <ø> (-0.05%) ⬇️
datalad/support/gitrepo.py 88.23% <100%> (+0.07%) ⬆️
datalad/distribution/tests/test_dataset.py 100% <100%> (ø) ⬆️
datalad/distribution/create.py 91.04% <66.66%> (-1.15%) ⬇️
datalad/distribution/install.py 76.67% <77.77%> (-3.91%) ⬇️

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...01ea9f4. Read the comment docs.

@coveralls
Copy link

coveralls commented Sep 2, 2016

Coverage Status

Coverage decreased (-0.08%) to 86.719% when pulling 01ea9f4 on yarikoptic:bf-install into 82df4b4 on datalad:master.

@yarikoptic yarikoptic changed the title WiP/TEMP BF(BK): messing with realpaths, fixing up install tests (no creativism), etc BF: messing with realpaths, fixing up install tests (no creativism), etc Sep 2, 2016
@yarikoptic
Copy link
Member Author

ok -- no objections, so merging... god save us all! ;)

@yarikoptic yarikoptic merged commit e4673ff into datalad:master Sep 2, 2016
@yarikoptic yarikoptic deleted the bf-install 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.

3 participants