Page MenuHomeSoftware Heritage
Differential D6312

opam: Make the instance optional and derived from the url
ClosedPublic
Actions

Authored by ardumont on Sep 20 2021, 5:48 PM.

Details

Reviewers
olasd
Group Reviewers
Reviewers
Maniphest Tasks
T3590: opam loader: Ensure required opam state is shared amongst ingestion/listing runs
Commits
rDLSff5e86ff489e: opam: Make the instance optional and derived from the url
Summary

This matches how it's done for all other multi instances lister.

Related to T3590
Depends on D6310

Test Plan

tox

Diff Detail

Repository
rDLS Listers
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ardumont created this revision.Sep 20 2021, 5:48 PM
swh-public-ci added a comment.Sep 20 2021, 5:52 PM

Build is green

Patch application report for D6312 (id=22904)

Could not rebase; Attempt merge onto c803fc2b59...

Updating c803fc2..b1a6f8f
Fast-forward
 swh/lister/opam/lister.py            | 14 +++++++++----
 swh/lister/opam/tests/test_lister.py | 39 +++++++++++++++++++++++++++++-------
 swh/lister/pattern.py                | 13 ++++++++++++
 3 files changed, 55 insertions(+), 11 deletions(-)
Changes applied before test
commit b1a6f8f3632d95085333b420e3e9fb2f0974d6ae
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Sep 20 17:47:29 2021 +0200

    opam: Make the instance optional and derived from the url
    
    This matches how it's done for all other multi instances listers.

commit 05ad61681276c69a63b871e977059871f705a9a7
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Sep 20 17:41:19 2021 +0200

    opam: Separate side-effects call from the constructor
    
    We should avoid side-effects in the constructor as much as possible. That avoids
    surprising behavior at object instantiation time. The state if needed should be now
    built within the `swh.lister.patter.Lister.prepare` method.
    
    This also fixes the current test that actually bootstrap a real opam local "clone".

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

Harbormaster completed remote builds in B23832: Diff 22904.Sep 20 2021, 5:52 PM
ardumont requested review of this revision.Sep 20 2021, 5:52 PM
ardumont updated this revision to Diff 22907.Sep 20 2021, 5:56 PM

Rebase

ardumont edited the summary of this revision. (Show Details)Sep 20 2021, 5:57 PM
ardumont added a task: T3590: opam loader: Ensure required opam state is shared amongst ingestion/listing runs.
ardumont added a parent revision: D6310: opam: Move the state initialization into the get_pages method.
ardumont added a child revision: D6306: opam: Allow defining where to actually install the opam_root folder.
swh-public-ci added a comment.Sep 20 2021, 6:00 PM

Build is green

Patch application report for D6312 (id=22907)

Could not rebase; Attempt merge onto c803fc2b59...

Updating c803fc2..0feddfa
Fast-forward
 swh/lister/opam/lister.py            | 14 +++++++++----
 swh/lister/opam/tests/test_lister.py | 39 +++++++++++++++++++++++++++++-------
 swh/lister/pattern.py                | 13 ++++++++++++
 3 files changed, 55 insertions(+), 11 deletions(-)
Changes applied before test
commit 0feddfaced6df52b06a145c1e9c905becf61b4d3
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Sep 20 17:47:29 2021 +0200

    opam: Make the instance optional and derived from the url
    
    This matches how it's done for all other multi instances listers.
    
    Related to T3590

commit 2d0099bf7206347298e38603130445e79a9bf1dd
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Sep 20 17:41:19 2021 +0200

    opam: Separate side-effects call from the constructor
    
    We should avoid side-effects in the constructor as much as possible. That avoids
    surprising behavior at object instantiation time. The state if needed should be now
    built within the `swh.lister.patter.Lister.prepare` method.
    
    This also fixes the current test that actually bootstrap a real opam local "clone".
    
    Related to T3590

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

Harbormaster completed remote builds in B23835: Diff 22907.Sep 20 2021, 6:00 PM
ardumont updated this revision to Diff 22913.Sep 21 2021, 10:36 AM

Rebase

swh-public-ci added a comment.Sep 21 2021, 10:39 AM

Build is green

Patch application report for D6312 (id=22913)

Could not rebase; Attempt merge onto c803fc2b59...

Updating c803fc2..34880c7
Fast-forward
 swh/lister/opam/lister.py            | 16 +++++++++------
 swh/lister/opam/tests/test_lister.py | 39 +++++++++++++++++++++++++++++-------
 swh/lister/pattern.py                | 13 ++++++++++++
 3 files changed, 55 insertions(+), 13 deletions(-)
Changes applied before test
commit 34880c73a2154a24a6fd3e0f8b707b951f810ec8
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Sep 20 17:47:29 2021 +0200

    opam: Make the instance optional and derived from the url
    
    This matches how it's done for all other multi instances listers.
    
    Related to T3590

commit 0af407999ab4932e4dccf51897e0402d748a3f03
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Sep 20 17:41:19 2021 +0200

    opam: Move the state initialization into the get_pages method
    
    We should avoid side-effects in the constructor as much as possible. That avoids
    surprising behavior at object instantiation time. The state if needed must be
    initialized into the `swh.lister.pattern.Lister.get_pages` method, as preconized in the
    class docstring.
    
    This also fixes the current test that actually bootstrap a real opam local "clone" in
    /tmp.
    
    Related to T3590

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

Harbormaster completed remote builds in B23841: Diff 22913.Sep 21 2021, 10:39 AM
ardumont updated this revision to Diff 22917.Sep 21 2021, 10:47 AM

Rebase

swh-public-ci added a comment.Sep 21 2021, 10:50 AM

Build is green

Patch application report for D6312 (id=22917)

Could not rebase; Attempt merge onto c803fc2b59...

Updating c803fc2..2398ca8
Fast-forward
 swh/lister/opam/lister.py            | 16 +++++++++------
 swh/lister/opam/tests/test_lister.py | 40 +++++++++++++++++++++++++++++-------
 2 files changed, 43 insertions(+), 13 deletions(-)
Changes applied before test
commit 2398ca85c8c4685465945c305a67279a67f7ba55
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Sep 20 17:47:29 2021 +0200

    opam: Make the instance optional and derived from the url
    
    This matches how it's done for all other multi instances listers.
    
    Related to T3590

commit c160376b17175bd8fa73adddf2e14b8dcfad947b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Sep 20 17:41:19 2021 +0200

    opam: Move the state initialization into the get_pages method
    
    We should avoid side-effects in the constructor as much as possible. That avoids
    surprising behavior at object instantiation time. The state if needed must be
    initialized into the `swh.lister.pattern.Lister.get_pages` method, as preconized in the
    class docstring.
    
    This also fixes the current test that actually bootstrap a real opam local "clone" in
    /tmp.
    
    Related to T3590

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

Harbormaster completed remote builds in B23845: Diff 22917.Sep 21 2021, 10:50 AM
olasd accepted this revision.Sep 21 2021, 11:07 AM
olasd added a subscriber: olasd.

Cool, thanks.

This revision is now accepted and ready to land.Sep 21 2021, 11:07 AM
ardumont updated this revision to Diff 22923.Sep 21 2021, 11:18 AM

Rebase

swh-public-ci added a comment.Sep 21 2021, 11:22 AM

Build is green

Patch application report for D6312 (id=22923)

Could not rebase; Attempt merge onto c803fc2b59...

Updating c803fc2..ff5e86f
Fast-forward
 swh/lister/opam/lister.py            | 16 +++++++++------
 swh/lister/opam/tests/test_lister.py | 40 +++++++++++++++++++++++++++++-------
 2 files changed, 43 insertions(+), 13 deletions(-)
Changes applied before test
commit ff5e86ff489eb1d3c504fe6f0a3392db4d8b6c19
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Sep 20 17:47:29 2021 +0200

    opam: Make the instance optional and derived from the url
    
    This matches how it's done for all other multi instances listers.
    
    Related to T3590

commit b69b0b7fd6745cd579acf2e5544c3810217bb542
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Sep 20 17:41:19 2021 +0200

    opam: Move the state initialization into the get_pages method
    
    We should avoid side-effects in the constructor as much as possible. That avoids
    surprising behavior at object instantiation time. The state if needed must be
    initialized into the `swh.lister.pattern.Lister.get_pages` method, as preconized in the
    class docstring.
    
    This also fixes the current test that actually bootstrap a real opam local "clone" in
    /tmp.
    
    Related to T3590

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

Harbormaster completed remote builds in B23852: Diff 22923.Sep 21 2021, 11:22 AM
Closed by commit rDLSff5e86ff489e: opam: Make the instance optional and derived from the url (authored by ardumont). · Explain WhySep 21 2021, 11:23 AM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDLSff5e86ff489e: opam: Make the instance optional and derived from the url.

Revision Contents
Changeset List

PathSize
swh/
lister/
opam/
4 lines
tests/
10 lines

Diff 22927

View Options

swh/lister/opam/lister.py

Loading...
View Options

swh/lister/opam/tests/test_lister.py

Loading...
About · Developer information · Legal