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

Fix gh-3621 broken error handling under PY3 #3622

Merged
merged 6 commits into from Aug 26, 2019

Conversation

@mih
Copy link
Member

commented Aug 26, 2019

Pretty much just moving the affected code (see #3621). Plus replacement of import * usage.

Fingers crossed...

mih and others added 4 commits Aug 26, 2019
RF: Adjust import location
Formerly exceptions had been imported blindly into downloaders.base
There seems to be no advantage of having 'import *' at the core, and
then specific imports downstream.
RF: Adjust import locations, round 2
These locations were missed by the last commit.
@codecov

This comment has been minimized.

Copy link

commented Aug 26, 2019

Codecov Report

Merging #3622 into master will decrease coverage by 58.07%.
The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #3622       +/-   ##
===========================================
- Coverage   82.93%   24.85%   -58.08%     
===========================================
  Files         273      270        -3     
  Lines       35509    35492       -17     
===========================================
- Hits        29450     8823    -20627     
- Misses       6059    26669    +20610
Impacted Files Coverage Δ
datalad/downloaders/s3.py 0% <0%> (-57.37%) ⬇️
datalad/downloaders/http.py 0% <0%> (-61.51%) ⬇️
datalad/downloaders/base.py 0% <0%> (-56.37%) ⬇️
datalad/customremotes/tests/__init__.py 0% <0%> (-100%) ⬇️
datalad/tests/test_protocols.py 0% <0%> (-100%) ⬇️
datalad/tests/test_constraints.py 0% <0%> (-100%) ⬇️
datalad/tests/test_misc.py 0% <0%> (-100%) ⬇️
datalad/distribution/tests/test_clone.py 0% <0%> (-100%) ⬇️
datalad/local/tests/test_subdataset.py 0% <0%> (-100%) ⬇️
datalad/support/tests/test_ansi_colors.py 0% <0%> (-100%) ⬇️
... and 220 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 94e335c...24a99f0. Read the comment docs.

@codecov

This comment has been minimized.

Copy link

commented Aug 26, 2019

Codecov Report

Merging #3622 into master will decrease coverage by 58.07%.
The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #3622       +/-   ##
===========================================
- Coverage   82.93%   24.85%   -58.08%     
===========================================
  Files         273      270        -3     
  Lines       35509    35492       -17     
===========================================
- Hits        29450     8823    -20627     
- Misses       6059    26669    +20610
Impacted Files Coverage Δ
datalad/downloaders/s3.py 0% <0%> (-57.37%) ⬇️
datalad/downloaders/http.py 0% <0%> (-61.51%) ⬇️
datalad/downloaders/base.py 0% <0%> (-56.37%) ⬇️
datalad/customremotes/tests/__init__.py 0% <0%> (-100%) ⬇️
datalad/tests/test_protocols.py 0% <0%> (-100%) ⬇️
datalad/tests/test_constraints.py 0% <0%> (-100%) ⬇️
datalad/tests/test_misc.py 0% <0%> (-100%) ⬇️
datalad/distribution/tests/test_clone.py 0% <0%> (-100%) ⬇️
datalad/local/tests/test_subdataset.py 0% <0%> (-100%) ⬇️
datalad/support/tests/test_ansi_colors.py 0% <0%> (-100%) ⬇️
... and 220 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 94e335c...8d1a72e. Read the comment docs.

RF: downloaders: Add missing import
This one was missed in 22392dd (RF: Discontinue evil 'import *',
2019-08-26).
@mih

This comment has been minimized.

Copy link
Member Author

commented Aug 26, 2019

@kyleam Thx, I almost had it edited myself, almost... ;-)

@kyleam

This comment has been minimized.

Copy link
Member

commented Aug 26, 2019

Thx, I almost had it edited myself, almost... ;-)

No problem. Those were caught by the tests, but I spotted one more. Pushing shortly.

RF: downloaders: Remove unneeded condition
As of bd975a8, this code is under the AccessDeniedError exception
handling, so the access_denied flag is no longer needed.
@kyleam

This comment has been minimized.

Copy link
Member

commented Aug 26, 2019

Some Travis runs failed with network issues. Restarted.

Edit: Actually, I guess not network issues:

+sudo apt-get update -qq
E: Failed to fetch http://apt.postgresql.org/pub/repos/apt/dists/xenial-pgdg/main/binary-i386/Packages  Writing more data than expected (788347 > 787357)

The restarted runs have failed as well. Given that AppVeyor and many of the main Travis runs passed, I think these setup failures shouldn't hold up this PR.

@kyleam
kyleam approved these changes Aug 26, 2019

@mih mih merged commit c9abcb0 into datalad:master Aug 26, 2019

2 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
WIP Ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@mih mih deleted the mih:bf-3621 branch Aug 26, 2019

@mih

This comment has been minimized.

Copy link
Member Author

commented Aug 26, 2019

Thx!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.