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: do not even check with hasattr, go straight for _repo #2901

Merged
merged 1 commit into from Oct 8, 2018

Conversation

Projects
None yet
2 participants
@yarikoptic
Member

yarikoptic commented Oct 5, 2018

This should complete the fix in 1557322 .
Apparently hasattr would also trigger property value computation, at least according
to this traceback I was receiving if using python3:

[INFO   ] Cloning http://datasets-dev.datalad.org/openfmri/ds000002 [1 other candidates] into '/tmp/ds000002'
[INFO   ]   Remote origin not usable by git-annex; setting annex-ignore
[INFO   ] Exception ignored in: <bound method AnnexRepo.__del__ of <AnnexRepo path=/tmp/ds000002 (<class 'datalad.support.annexrepo.AnnexRepo'>)>>
[INFO   ] Traceback (most recent call last):
[INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/annexrepo.py, line 365, in __del__
[INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/gitrepo.py, line 870, in __del__
[INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/gitrepo.py, line 743, in repo
[INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/cmd.py, line 189, in __call__
[INFO   ] Exception ignored in: <bound method AnnexRepo.__del__ of <AnnexRepo path=/tmp/ds000002 (<class 'datalad.support.annexrepo.AnnexRepo'>)>>
[INFO   ] Traceback (most recent call last):
[INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/annexrepo.py, line 365, in __del__
[INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/gitrepo.py, line 870, in __del__
[INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/gitrepo.py, line 743, in repo
[INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/cmd.py, line 189, in __call__
[INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/cmd.py, line 570, in call
[INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/gitrepo.py, line 402, in Repo
[INFO   ]   File /usr/lib/python3/dist-packages/git/repo/base.py, line 178, in __init__
[INFO   ] NameError: name 'open' is not defined
[INFO   ] access to dataset sibling datalad not auto-enabled, enable with:
| 		datalad siblings -d /tmp/ds000002 enable -s datalad
install(ok): /tmp/ds000002 (dataset)
BF: do not even check with hasattr, go straight for _repo
This should complete the fix in 1557322 .
Apparently hasattr would also trigger property value computation, at least according
to this traceback I was receiving if using python3:

    [INFO   ] Cloning http://datasets-dev.datalad.org/openfmri/ds000002 [1 other candidates] into '/tmp/ds000002'
    [INFO   ]   Remote origin not usable by git-annex; setting annex-ignore
    [INFO   ] Exception ignored in: <bound method AnnexRepo.__del__ of <AnnexRepo path=/tmp/ds000002 (<class 'datalad.support.annexrepo.AnnexRepo'>)>>
    [INFO   ] Traceback (most recent call last):
    [INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/annexrepo.py, line 365, in __del__
    [INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/gitrepo.py, line 870, in __del__
    [INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/gitrepo.py, line 743, in repo
    [INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/cmd.py, line 189, in __call__
    [INFO   ] Exception ignored in: <bound method AnnexRepo.__del__ of <AnnexRepo path=/tmp/ds000002 (<class 'datalad.support.annexrepo.AnnexRepo'>)>>
    [INFO   ] Traceback (most recent call last):
    [INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/annexrepo.py, line 365, in __del__
    [INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/gitrepo.py, line 870, in __del__
    [INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/gitrepo.py, line 743, in repo
    [INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/cmd.py, line 189, in __call__
    [INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/cmd.py, line 570, in call
    [INFO   ]   File /home/yoh/proj/datalad/datalad-master/datalad/support/gitrepo.py, line 402, in Repo
    [INFO   ]   File /usr/lib/python3/dist-packages/git/repo/base.py, line 178, in __init__
    [INFO   ] NameError: name 'open' is not defined
    [INFO   ] access to dataset sibling datalad not auto-enabled, enable with:
    | 		datalad siblings -d /tmp/ds000002 enable -s datalad
    install(ok): /tmp/ds000002 (dataset)
@mih

This comment has been minimized.

Member

mih commented Oct 7, 2018

I restarted appveyor to see whether this was a spurious failure.

@codecov

This comment has been minimized.

codecov bot commented Oct 7, 2018

Codecov Report

Merging #2901 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2901      +/-   ##
==========================================
- Coverage   90.28%   90.27%   -0.01%     
==========================================
  Files         246      246              
  Lines       31877    31877              
==========================================
- Hits        28780    28778       -2     
- Misses       3097     3099       +2
Impacted Files Coverage Δ
datalad/support/gitrepo.py 88.39% <100%> (-0.23%) ⬇️

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 afcde8c...b01f401. Read the comment docs.

@yarikoptic

This comment has been minimized.

Member

yarikoptic commented Oct 8, 2018

Thank you @mih

@yarikoptic

This comment has been minimized.

Member

yarikoptic commented Oct 8, 2018

ok, no objections - must be good

@yarikoptic yarikoptic merged commit 1748863 into datalad:master Oct 8, 2018

10 checks passed

WIP ready for review
Details
codecov/patch 100% of diff hit (target 90.28%)
Details
codecov/project Absolute coverage decreased by -<.01% but relative coverage increased by +9.71% compared to afcde8c
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
datalad-pr-dl-osx-64 DEV build done.
Details
datalad-pr-docker-dl-nd14_04 DEV build done.
Details
datalad-pr-docker-dl-nd16_04 DEV build done.
Details
datalad-pr-docker-dl-nd80 DEV build done.
Details
datalad-pr-docker-dl-nd90 DEV build done.
Details

@yarikoptic yarikoptic modified the milestone: Release 0.10.4 Oct 22, 2018

yarikoptic added a commit that referenced this pull request Oct 24, 2018

Merge tag '0.11.0' into debian
 Upgrade of [git-annex] to the most recent available to your release is
 advisable since a number of issues were resolved at that level.

 ### Major refactoring and deprecations

 - `datalad.consts.LOCAL_CENTRAL_PATH` constant was deprecated in favor
   of `datalad.locations.default-dataset` [configuration] variable
   ([#2835])

 ### Minor refactoring

 - `"notneeded"` messages are no longer reported by default results
   renderer
 - [run] no longer shows commit instructions upon command failure when
   `explicit` is true and no outputs are specified ([#2922])
 - `get_git_dir` moved into GitRepo ([#2886])
 - `_gitpy_custom_call` removed from GitRepo ([#2894])
 - `GitRepo.get_merge_base` argument is now called `commitishes` instead
   of `treeishes` ([#2903])

 ### Fixes

 - [update] should not leave the dataset in non-clean state ([#2858])
   and some other enhancements ([#2859])
 - Fixed chunking of the long command lines to account for decorators
   and other arguments ([#2864])
 - Progress bar should not crash the process on some missing progress
   information ([#2891])
 - Default value for `jobs` set to be `"auto"` (not `None`) to take
   advantage of possible parallel get if in `-g` mode ([#2861])
 - [wtf] must not crash if `git-annex` is not installed etc ([#2865]),
   ([#2865]), ([#2918]), ([#2917])
 - Fixed paths (with spaces etc) handling while reporting annex error
   output ([#2892]), ([#2893])
 - `__del__` should not access `.repo` but `._repo` to avoid attempts
   for reinstantiation etc ([#2901])
 - Fix up submodule `.git` right in `GitRepo.add_submodule` to avoid
   added submodules being non git-annex friendly ([#2909]), ([#2904])
 - [run-procedure] ([#2905])
   - now will provide dataset into the procedure if called within dataset
   - will not crash if procedure is an executable without `.py` or `.sh`
     suffixes
 - Use centralized `.gitattributes` handling while setting annex backend
   ([#2912])
 - `GlobbedPaths.expand(..., full=True)` incorrectly returned relative
    paths when called more than once ([#2921])

 ### Enhancements and new features

 - Report progress on [clone] when installing from "smart" git servers
   ([#2876])
 - Stale/unused `sth_like_file_has_content` was removed ([#2860])
 - Enhancements to [search] to operate on "improved" metadata layouts
   ([#2878])
 - Output of `git annex init` operation is now logged ([#2881])
 - New
   - `GitRepo.cherry_pick` ([#2900])
   - `GitRepo.format_commit` ([#2902])
 - [run-procedure] ([#2905])
   - procedures can now recursively be discovered in subdatasets as well.
     The uppermost has highest priority
   - Procedures in user and system locations now take precedence over
     those in datasets.

* tag '0.11.0':
  Make it a 0.11.0 release since there were some API RFings
  REL: slight tune up to Changelog following the advices
  DOC: v0.10.4: Mention change in procedure precedence (a0cbcba)
  DOC: v0.10.4: Fix description of db715b7
  DOC: v0.10.4: Improve description of 6f615a4
  DOC: v0.10.4: Remove duplicate word

yarikoptic added a commit that referenced this pull request Oct 24, 2018

Merge tag '0.11.0' into debian
 ## 0.11.0 (Oct 23, 2018) -- Soon-to-be-perfect

 [git-annex] 6.20180913 (or later) is now required - provides a number of
 fixes for v6 mode operations etc.

 ### Major refactoring and deprecations

 - `datalad.consts.LOCAL_CENTRAL_PATH` constant was deprecated in favor
   of `datalad.locations.default-dataset` [configuration] variable
   ([#2835])

 ### Minor refactoring

 - `"notneeded"` messages are no longer reported by default results
   renderer
 - [run] no longer shows commit instructions upon command failure when
   `explicit` is true and no outputs are specified ([#2922])
 - `get_git_dir` moved into GitRepo ([#2886])
 - `_gitpy_custom_call` removed from GitRepo ([#2894])
 - `GitRepo.get_merge_base` argument is now called `commitishes` instead
   of `treeishes` ([#2903])

 ### Fixes

 - [update] should not leave the dataset in non-clean state ([#2858])
   and some other enhancements ([#2859])
 - Fixed chunking of the long command lines to account for decorators
   and other arguments ([#2864])
 - Progress bar should not crash the process on some missing progress
   information ([#2891])
 - Default value for `jobs` set to be `"auto"` (not `None`) to take
   advantage of possible parallel get if in `-g` mode ([#2861])
 - [wtf] must not crash if `git-annex` is not installed etc ([#2865]),
   ([#2865]), ([#2918]), ([#2917])
 - Fixed paths (with spaces etc) handling while reporting annex error
   output ([#2892]), ([#2893])
 - `__del__` should not access `.repo` but `._repo` to avoid attempts
   for reinstantiation etc ([#2901])
 - Fix up submodule `.git` right in `GitRepo.add_submodule` to avoid
   added submodules being non git-annex friendly ([#2909]), ([#2904])
 - [run-procedure] ([#2905])
   - now will provide dataset into the procedure if called within dataset
   - will not crash if procedure is an executable without `.py` or `.sh`
     suffixes
 - Use centralized `.gitattributes` handling while setting annex backend
   ([#2912])
 - `GlobbedPaths.expand(..., full=True)` incorrectly returned relative
    paths when called more than once ([#2921])

 ### Enhancements and new features

 - Report progress on [clone] when installing from "smart" git servers
   ([#2876])
 - Stale/unused `sth_like_file_has_content` was removed ([#2860])
 - Enhancements to [search] to operate on "improved" metadata layouts
   ([#2878])
 - Output of `git annex init` operation is now logged ([#2881])
 - New
   - `GitRepo.cherry_pick` ([#2900])
   - `GitRepo.format_commit` ([#2902])
 - [run-procedure] ([#2905])
   - procedures can now recursively be discovered in subdatasets as well.
     The uppermost has highest priority
   - Procedures in user and system locations now take precedence over
     those in datasets.

* tag '0.11.0':
  CHANGELOG adjusted to reflect new minimal version of git-annex
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment