Page MenuHomeSoftware Heritage

Use an attr class for p_info instead of a dict.
ClosedPublic

Authored by vlorentz on Jul 23 2020, 2:58 PM.

Details

Summary

The benefits are minimal for now, as 'raw' still contains a lot of stuff;
but further commits will move data out of 'raw' to a proper attribute.

Event Timeline

Build is green

Patch application report for D3602 (id=12688)

Could not rebase; Attempt merge onto 2699a1f629...

Updating 2699a1f..6890273
Fast-forward
 swh/loader/cli.py                              | 10 +++++--
 swh/loader/package/archive/loader.py           | 25 ++++++++++-------
 swh/loader/package/cran/loader.py              | 24 ++++++++--------
 swh/loader/package/debian/loader.py            | 22 +++++++++------
 swh/loader/package/debian/tests/test_debian.py |  4 +--
 swh/loader/package/deposit/loader.py           | 27 ++++++++++--------
 swh/loader/package/loader.py                   | 39 +++++++++++++++++++-------
 swh/loader/package/nixguix/loader.py           | 20 +++++++++----
 swh/loader/package/npm/loader.py               | 18 ++++++------
 swh/loader/package/pypi/loader.py              | 23 +++++++--------
 10 files changed, 132 insertions(+), 80 deletions(-)
Changes applied before test
commit 68902739138ba4ce282572dd66e55c048eaa1310
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Jul 22 11:58:32 2020 +0200

    Use an attr class for p_info instead of a dict.
    
    The benefits are minimal for now, as 'raw' still contains a lot of stuff;
    but further commits will move data out of 'raw' to a proper attribute.

commit 1fbbf14ed01e6fc9852f9b54f1b60b14f19a5515
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jul 23 13:31:09 2020 +0200

    test_resolve_revision_from_edge_cases: fix argument names/order.

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

Nice!

A couple of nits... ;)

swh/loader/package/cran/loader.py
64

might as well make that Iterator[Tuple[str, CranPackageInfo]] now.

swh/loader/package/debian/loader.py
94

same, Iterator...

108

p_info.raw now

swh/loader/package/deposit/loader.py
117

well yea, the extrinsic because it got processed by a third party (the deposit server) and raw because the loader did not touch it (afair).

swh/loader/package/loader.py
101

Iterator...

swh/loader/package/nixguix/loader.py
68

Iterator...

swh/loader/package/npm/loader.py
74

Iterator...

This revision now requires changes to proceed.Jul 23 2020, 3:29 PM
This revision is now accepted and ready to land.Jul 23 2020, 4:12 PM

Build is green

Patch application report for D3602 (id=12693)

Could not rebase; Attempt merge onto 2699a1f629...

Updating 2699a1f..1050d94
Fast-forward
 swh/loader/cli.py                              | 10 +++++--
 swh/loader/package/archive/loader.py           | 27 ++++++++++-------
 swh/loader/package/cran/loader.py              | 28 +++++++++---------
 swh/loader/package/debian/loader.py            | 24 ++++++++-------
 swh/loader/package/debian/tests/test_debian.py |  4 +--
 swh/loader/package/deposit/loader.py           | 27 ++++++++++-------
 swh/loader/package/loader.py                   | 41 ++++++++++++++++++--------
 swh/loader/package/nixguix/loader.py           | 18 +++++++----
 swh/loader/package/npm/loader.py               | 20 ++++++-------
 swh/loader/package/pypi/loader.py              | 25 ++++++++--------
 10 files changed, 132 insertions(+), 92 deletions(-)
Changes applied before test
commit 1050d94d871d7f46deb18aa46cc07f95f3932e92
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Jul 22 11:58:32 2020 +0200

    Use an attr class for p_info instead of a dict.
    
    The benefits are minimal for now, as 'raw' still contains a lot of stuff;
    but further commits will move data out of 'raw' to a proper attribute.

commit 1fbbf14ed01e6fc9852f9b54f1b60b14f19a5515
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jul 23 13:31:09 2020 +0200

    test_resolve_revision_from_edge_cases: fix argument names/order.

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