Paths

Table of Contentst

Differential D2714

Use swh-model objects in package loader.
ClosedPublic
Actions

Authored by vlorentz on Feb 24 2020, 4:36 PM.

Tags

None

Subscribers

Details

Reviewers

Group Reviewers

Commits

rDLDBASE0c58f98ef1df: Use swh-model objects in package loader.

Test Plan

Tests will fail because they depend on D2713 and D2720

Diff Detail

Repository

rDLDBASE Generic VCS/Package Loader

Branch

model-objects

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 10780
Build 16185: tox-on-jenkins	Jenkins
Build 16184: arc lint + arc unit

Event Timeline

vlorentz created this revision.Feb 24 2020, 4:36 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptFeb 24 2020, 4:36 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/333/
See console output for more information: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/333/console

Harbormaster failed remote builds in B10744: Diff 9677!Feb 24 2020, 4:37 PM

remove print

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/334/
See console output for more information: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/334/console

Harbormaster failed remote builds in B10745: Diff 9678!Feb 24 2020, 4:44 PM

ardumont added a subscriber: ardumont.Feb 24 2020, 4:58 PM

ardumont added inline comments.

swh/loader/package/loader.py
340	Why not directly make it a snapshot object and then use its `compute_hash` method? That would make us use less swh.model code. Also we avoid building 2 objects (dict, snapshot) for one use.

ardumont added inline comments.Feb 24 2020, 5:09 PM

swh/loader/package/loader.py
41	Those 3 lines can be dropped as, that's taking care of here ;)

Tests will fail because they depend on D2713.

Quick, let's land and tag those then (they got accepted ;)

ardumont added inline comments.Feb 24 2020, 5:21 PM

swh/loader/package/loader.py
415	wondering whether the `build_revision` (old name) should return a `Revision` object directly (i know..., more work...).
426	Use `Revision.compute_hash`?

Oh, I forgot about compute_hash. And also that the id is "optional" (well not optional, but can be set to b'')

Also, compute_hash is a staticmethod that takes a dict as argument.

vlorentz edited the test plan for this revision. (Show Details)Feb 27 2020, 2:34 PM

Make build_revision return Revision objects instead of dicts.

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/335/
See console output for more information: https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/335/console

Harbormaster failed remote builds in B10772: Diff 9706!Feb 27 2020, 3:09 PM

ardumont added inline comments.Feb 27 2020, 3:24 PM

swh/loader/package/npm/loader.py
138	remove the prints ;)

Restarted build.
(in the mean time, fixing the debian build for swh-model)

Build is green
See https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/336/ for more details.

Harbormaster completed remote builds in B10772: Diff 9706.Feb 27 2020, 3:38 PM

Build is green

\m/

(in the mean time, fixing the debian build for swh-model)

unstable fixed.
stable still fails though... [1] /me is sad

[1] https://jenkins.softwareheritage.org/view/Debian%20packages/job/debian/job/packages/job/DMOD/job/gbp-buildpackage/74/console

ardumont accepted this revision.Feb 27 2020, 3:43 PM

This revision is now accepted and ready to land.Feb 27 2020, 3:43 PM

remove prints

Build is green
See https://jenkins.softwareheritage.org/job/DLDBASE/job/tox/337/ for more details.

Harbormaster completed remote builds in B10780: Diff 9714.Feb 27 2020, 4:03 PM

Closed by commit rDLDBASE0c58f98ef1df: Use swh-model objects in package loader. (authored by vlorentz). · Explain WhyFeb 27 2020, 4:28 PM

This revision was automatically updated to reflect the committed changes.

vlorentz added a commit: rDLDBASE0c58f98ef1df: Use swh-model objects in package loader..

Revision Contents
Changeset List

Path

Size

1 line

requirements-swh.txt

2 lines

swh/

loader/

core/

tests/

test_converters.py

3 lines

package/

archive/

43 lines

cran/

40 lines

tests/

9 lines

debian/

52 lines

tests/

12 lines

deposit/

54 lines

113 lines

npm/

51 lines

tests/

61 lines

pypi/

53 lines

tests/

64 lines

tests/

36 lines

22 lines

Diff 9714

conftest.py

Loading...

requirements-swh.txt

Loading...

swh/loader/core/tests/test_converters.py

Loading...

swh/loader/package/archive/loader.py

Loading...

swh/loader/package/cran/loader.py

Loading...

swh/loader/package/cran/tests/test_cran.py

Loading...

swh/loader/package/debian/loader.py

Loading...

swh/loader/package/debian/tests/test_debian.py

Loading...

swh/loader/package/deposit/loader.py

Loading...

swh/loader/package/loader.py

Loading...

swh/loader/package/npm/loader.py

Loading...

swh/loader/package/npm/tests/test_npm.py

Loading...

swh/loader/package/pypi/loader.py

Loading...

swh/loader/package/pypi/tests/test_pypi.py

Loading...

swh/loader/package/tests/test_common.py

Loading...

swh/loader/package/utils.py

Loading...