Page MenuHomeSoftware Heritage

migrate_extrinsic_metadata: add support for guessing the origin of more PyPI packages from filenames.
ClosedPublic

Authored by vlorentz on Oct 1 2020, 7:57 PM.

Details

Summary

It now supports all pypi revisions with an id starting with 0, 1, or 2.

Diff Detail

Repository
rDSTO Storage manager
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 15785
Build 24294: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 24293: arc lint + arc unit

Event Timeline

Build is green

Patch application report for D4122 (id=14523)

Could not rebase; Attempt merge onto bef08d6316...

Merge made by the 'recursive' strategy.
 swh/storage/migrate_extrinsic_metadata.py          | 50 ++++++++++----
 .../tests/migrate_extrinsic_metadata/test_cran.py  | 76 ++++++++++++++++++++++
 .../migrate_extrinsic_metadata/test_deposit.py     | 32 ++++-----
 .../tests/migrate_extrinsic_metadata/test_pypi.py  |  9 +++
 4 files changed, 139 insertions(+), 28 deletions(-)
Changes applied before test
commit 0b20a24c58cd7db559f0d214dadd8e68a2cf4f7a
Merge: bef08d63 e393edd1
Author: Jenkins user <jenkins@localhost>
Date:   Thu Oct 1 18:03:29 2020 +0000

    Merge branch 'diff-target' into HEAD

commit e393edd17272e0cd6e23a3668fc08db4d7151ddf
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 1 19:57:29 2020 +0200

    migrate_extrinsic_metadata: add support for guessing the origin of more PyPI packages from filenames.
    
    It now supports all pypi revisions with an id starting with 0, 1, or 2.

commit b6a10e5ee038c2dcd5748fe924d9cf8cb0fe40fc
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 1 19:54:57 2020 +0200

    migrate_extrinsic_metadata: allow dash in deposit client and collection names.

commit 5fa348ba82c9d8449db40dfe67285137f8d66703
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 1 19:53:53 2020 +0200

    migrate_extrinsic_metadata: update name of column deposit.swhid_context.
    
    It was renamed in 4d72d1be529a568784842f5c0864e862a4b4705c.

commit a56dbbc055dc233841cc9fdb5c37ca622a7d121d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Sep 30 13:07:49 2020 +0200

    migrate_extrinsic_metadata: Add support for the current format of original_artifacts written by the CRAN loader.

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

This revision is now accepted and ready to land.Oct 2 2020, 10:04 AM
This revision was landed with ongoing or failed builds.Oct 2 2020, 11:08 AM
This revision was automatically updated to reflect the committed changes.

Build is green

Patch application report for D4122 (id=14538)

Rebasing onto a6af589ada...

First, rewinding head to replay your work on top of it...
Fast-forwarded diff-target to base-revision-999-D4122.
Changes applied before test

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