from_disk: Fix ImportError with dulwich >= 0.20
ClosedPublic
Actions

Authored by anlambert on Jun 2 2020, 2:12 PM.

Details

Reviewers

douardda
ardumont

Group Reviewers

Reviewers

Commits

rDLDG7323aec4f84d: from_disk: Fix ImportError with dulwich >= 0.20

Summary

EmptyFileException has been moved to dulwich.objects in 0.20 release.
(see https://github.com/dulwich/dulwich/commit/24986435b81e39ab596be1e3afba418cc20444b2)

Diff Detail

Repository

rDLDG Git loader

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

anlambert created this revision.Jun 2 2020, 2:12 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptJun 2 2020, 2:12 PM

Build is green

Patch application report for D3206 (id=11376)

Rebasing onto b5467f9c3f...

Current branch diff-target is up to date.

Changes applied before test

commit 95d8a538727471745b0c7297392245004cea14b2
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue Jun 2 14:10:56 2020 +0200

    from_disk: Fix ImportError with dulwich >= 0.20
    
    See https://github.com/dulwich/dulwich/commit/24986435b81e39ab596be1e3afba418cc20444b2

See https://jenkins.softwareheritage.org/job/DLDG/job/tests-on-diff/16/ for more details.

Harbormaster completed remote builds in B12574: Diff 11376.Jun 2 2020, 2:14 PM

ok but why move the import statement in the method?

This revision is now accepted and ready to land.Jun 2 2020, 2:36 PM

Fixes ci build [1]

[1] https://jenkins.softwareheritage.org/view/swh%20dashboard/job/DLDG/job/tests/672/console

\m/

In D3206#78132, @douardda wrote:

ok but why move the import statement in the method?

I thought it was forbidden by flake8 to mix try/except and import statements outside functions but I was wrong.
I will update before landing this.

Update: Move statements back to top of file

Build is green

Patch application report for D3206 (id=11380)

Rebasing onto b5467f9c3f...

Current branch diff-target is up to date.

Changes applied before test

commit b5bad864cd0e59f4239babf315b8a773f1f682a6
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue Jun 2 14:10:56 2020 +0200

    from_disk: Fix ImportError with dulwich >= 0.20
    
    See https://github.com/dulwich/dulwich/commit/24986435b81e39ab596be1e3afba418cc20444b2

See https://jenkins.softwareheritage.org/job/DLDG/job/tests-on-diff/17/ for more details.

Harbormaster completed remote builds in B12578: Diff 11380.Jun 2 2020, 5:43 PM

Update: Remove empty line

Build is green

Patch application report for D3206 (id=11381)

Rebasing onto b5467f9c3f...

Current branch diff-target is up to date.

Changes applied before test

commit 7323aec4f84d36a8ca4788ee569cf13c403d2cca
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue Jun 2 14:10:56 2020 +0200

    from_disk: Fix ImportError with dulwich >= 0.20
    
    See https://github.com/dulwich/dulwich/commit/24986435b81e39ab596be1e3afba418cc20444b2

See https://jenkins.softwareheritage.org/job/DLDG/job/tests-on-diff/18/ for more details.

Harbormaster completed remote builds in B12579: Diff 11381.Jun 2 2020, 5:45 PM

Closed by commit rDLDG7323aec4f84d: from_disk: Fix ImportError with dulwich >= 0.20 (authored by anlambert). · Explain WhyJun 2 2020, 5:47 PM

This revision was automatically updated to reflect the committed changes.

anlambert added a commit: rDLDG7323aec4f84d: from_disk: Fix ImportError with dulwich >= 0.20.