It was copied from the Archive Loader, but is not needed here.
Details
Details
- Reviewers
borisbaldassari ardumont - Group Reviewers
Reviewers - Commits
- rDLDBASE11ea5f514319: maven: Remove dead code for extid computation
Diff Detail
Diff Detail
- Repository
- rDLDBASE Generic VCS/Package Loader
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
Comment Actions
Build is green
Patch application report for D6761 (id=24547)
Could not rebase; Attempt merge onto 2d9e93a2f2...
Updating 2d9e93a..11ea5f5 Fast-forward docs/package-loader-specifications.rst | 9 +++-- swh/loader/package/archive/loader.py | 6 ++- swh/loader/package/archive/tests/test_archive.py | 1 + swh/loader/package/debian/loader.py | 22 +++++++---- swh/loader/package/debian/tests/test_debian.py | 50 +++++++++++++++--------- swh/loader/package/loader.py | 34 +++++++++++----- swh/loader/package/maven/loader.py | 26 ++---------- swh/loader/package/maven/tests/test_maven.py | 25 ++---------- swh/loader/package/nixguix/loader.py | 4 +- swh/loader/package/npm/loader.py | 3 +- swh/loader/package/pypi/loader.py | 3 +- swh/loader/package/tests/test_loader.py | 20 +++++----- 12 files changed, 105 insertions(+), 98 deletions(-)
Changes applied before test
commit 11ea5f5143197e8ef6369b7fe2c6a3baeac1dcbe Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Tue Dec 7 11:40:11 2021 +0100 maven: Remove dead code for extid computation It was copied from the Archive Loader, but is not needed here. commit 0fe66b718638f93dbdeff145d332f3036779e1ff Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Mon Dec 6 15:32:10 2021 +0100 package-loaders: Add support for extid versions, and bump it for Debian The previous commit updated the format of release, and we must not reuse releases created before, hence the bump. commit c87c8c79ea660d5de697455d7c1882a216b23df5 Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Mon Dec 6 14:03:51 2021 +0100 debian: Remove the extrinsic version from release names Use only the intrinsic version (eg. 1.0.0) instead of the extrinsic version (eg. stretch/contrib/1.0.0). Releases should only contain data from DSC, not external 'pointers' to them. Additionally, having extrinsic data in releases means the same dsc-sha256 extid can point to different releases, which meant the loader may reuse a release mentioning a specific suite as a release in a different suite. With this commit, this won't be a problem anymore, as releases won't mention the suite at all, so suites can safely share extids. commit 26996ef3eef494eb187e01b999255cfa101ad758 Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Mon Dec 6 13:48:04 2021 +0100 debian: Fix confusion between the two versions 'version' was documented as the intrinsic version (eg. '0.7.2-3') and 'full_version' as the one containing the suite name (eg. 'stretch/contrib/0.7.2-3'). In practice, it was the opposite, except in a few incorrect test. This commit fixes said tests, and renamed 'full_version' to 'intrinsic_version'. This is only a refactoring, the behavior is unchanged for now; but a future commit will remove the 'version' (which is extrinsic) from the release name (which should contain only data intrinsic to the DSC).
See https://jenkins.softwareheritage.org/job/DLDBASE/job/tests-on-diff/654/ for more details.
swh/loader/package/maven/loader.py | ||
---|---|---|
62 | That's part of another commit, isn't it? |
swh/loader/package/maven/loader.py | ||
---|---|---|
62 | it's not, I only moved this code from the toplevel, so it's accessible by the parent class's extid method |
This comment was removed by borisbaldassari.
Comment Actions
LGTM. Considering the refactoring and removal of the extid, you fixed the proper maven parts in my humble opinion.