Page MenuHomeSoftware Heritage
Differential D3745

nixguix: Make the unsupported artifact extensions configurable
ClosedPublic
Actions

Authored by ardumont on Aug 8 2020, 8:54 AM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Commits
rDLDBASE22e2b0632ce7: nixguix: Make the unsupported artifact extensions configurable
Summary

So the maintenance is easier (as in, sometimes, it could be an update of just one extension to add/remove
and not necessarily code to change, which would then imply some extra package and deploy work).

Note that if this lands, this needs an update on the current loader-nixguix's
configuration puppet wise (D3747)

Test Plan

tox

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

ardumont created this revision.Aug 8 2020, 8:54 AM
Herald added a reviewer: Reviewers. · View Herald TranscriptAug 8 2020, 8:54 AM
swh-public-ci added a comment.Aug 8 2020, 8:55 AM

Build is green

Patch application report for D3745 (id=13192)

Rebasing onto fc9fe58d65...

Current branch diff-target is up to date.
Changes applied before test
commit 4a8a3d8e4bb818213e7960fa0dbbc9ff8af22bbe
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sat Aug 8 08:53:15 2020 +0200

    nixguix: Make the unsupported artifact extensions configurable
    
    So the maintenance is easier (not necessarily code to package and deploy).

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

Harbormaster completed remote builds in B14458: Diff 13192.Aug 8 2020, 8:55 AM
ardumont updated this revision to Diff 13193.Aug 8 2020, 8:58 AM

Rework comment

ardumont added inline comments.Aug 8 2020, 8:59 AM
swh/loader/package/nixguix/tests/conftest.py
31

this one is added (emacs-lisp), seen it yesterday on another run on guix sources

swh-public-ci added a comment.Aug 8 2020, 9:00 AM

Build is green

Patch application report for D3745 (id=13193)

Rebasing onto fc9fe58d65...

Current branch diff-target is up to date.
Changes applied before test
commit 8dc56df25fe19994b5b026975b8ae4d60a356c3c
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sat Aug 8 08:53:15 2020 +0200

    nixguix: Make the unsupported artifact extensions configurable
    
    So the maintenance is easier (not necessarily code to package and deploy).

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

Harbormaster completed remote builds in B14459: Diff 13193.Aug 8 2020, 9:00 AM
vlorentz requested changes to this revision.Aug 8 2020, 10:36 AM
vlorentz added a subscriber: vlorentz.
vlorentz added inline comments.
swh/loader/package/nixguix/loader.py
66

s/archive/file/

because they are also extensions of non-archives

226

re.escape(unsupported_archive_extensions), just in case

This revision now requires changes to proceed.Aug 8 2020, 10:36 AM
ardumont edited the summary of this revision. (Show Details)Aug 8 2020, 12:42 PM
ardumont added inline comments.Aug 8 2020, 12:46 PM
swh/loader/package/nixguix/loader.py
66

oh right!

swh/loader/package/nixguix/tests/conftest.py
31

by the way, in the long run, how one could deal with those sources (on source code file) ?

Adding a snapshot branch which targets a Content?

vlorentz added inline comments.Aug 8 2020, 12:51 PM
swh/loader/package/nixguix/tests/conftest.py
31

yes

(and c and el are twice in that list btw)

ardumont updated this revision to Diff 13196.EditedAug 8 2020, 12:58 PM

Adapt according to valid points

ardumont edited the summary of this revision. (Show Details)Aug 8 2020, 12:59 PM
swh-public-ci added a comment.Aug 8 2020, 1:00 PM

Build is green

Patch application report for D3745 (id=13196)

Could not rebase; Attempt merge onto fc9fe58d65...

Updating fc9fe58..93e3aa5
Fast-forward
 swh/loader/package/loader.py                     |  6 +++
 swh/loader/package/nixguix/loader.py             | 31 +++++++++----
 swh/loader/package/nixguix/tests/conftest.py     | 34 ++++++++++++++
 swh/loader/package/nixguix/tests/test_nixguix.py | 58 +++++++++++++++++-------
 4 files changed, 103 insertions(+), 26 deletions(-)
 create mode 100644 swh/loader/package/nixguix/tests/conftest.py
Changes applied before test
commit 93e3aa51c4e06f42cf840cc7dc59ff2c87e454b9
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sat Aug 8 08:53:15 2020 +0200

    nixguix: Make the unsupported artifact extensions configurable
    
    So the maintenance is easier (not necessarily code to package and deploy).

commit e3a9d5a89e2047117065af4554d917001f2f3630
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sat Aug 8 10:06:48 2020 +0200

    package.loader: Log a failure summary report at the end of the task

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

Harbormaster completed remote builds in B14462: Diff 13196.Aug 8 2020, 1:00 PM
ardumont added inline comments.Aug 8 2020, 1:01 PM
swh/loader/package/nixguix/tests/conftest.py
31

right, cleaned up ;)

ardumont updated this revision to Diff 13197.Aug 8 2020, 1:10 PM
  • Drop duplicated "patch" entry in test loader config
  • Rename one variable
swh-public-ci added a comment.Aug 8 2020, 1:12 PM

Build is green

Patch application report for D3745 (id=13197)

Could not rebase; Attempt merge onto fc9fe58d65...

Updating fc9fe58..22e2b06
Fast-forward
 swh/loader/package/loader.py                     |  6 +++
 swh/loader/package/nixguix/loader.py             | 31 +++++++++----
 swh/loader/package/nixguix/tests/conftest.py     | 33 ++++++++++++++
 swh/loader/package/nixguix/tests/test_nixguix.py | 58 +++++++++++++++++-------
 4 files changed, 102 insertions(+), 26 deletions(-)
 create mode 100644 swh/loader/package/nixguix/tests/conftest.py
Changes applied before test
commit 22e2b0632ce7797249881191b8d3cc15c8fd9efe
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sat Aug 8 08:53:15 2020 +0200

    nixguix: Make the unsupported artifact extensions configurable
    
    So the maintenance is easier (not necessarily code to package and deploy).

commit e3a9d5a89e2047117065af4554d917001f2f3630
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sat Aug 8 10:06:48 2020 +0200

    package.loader: Log a failure summary report at the end of the task

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

Harbormaster completed remote builds in B14463: Diff 13197.Aug 8 2020, 1:12 PM
ardumont mentioned this in D3747: nixguix: Add unsupported file extensions configuration list.Aug 8 2020, 1:17 PM
ardumont edited the summary of this revision. (Show Details)Aug 8 2020, 1:17 PM
ardumont mentioned this in T2485: staging: Running nixguix on guix sources .Aug 8 2020, 1:23 PM
ardumont mentioned this in D2854: [wip] package.loader: introduce load_target and resolve_target_from.Aug 8 2020, 1:29 PM
ardumont added inline comments.Aug 8 2020, 1:31 PM
swh/loader/package/nixguix/tests/conftest.py
31

by the way, in the long run, how one could deal with those sources (on source code file) ?
Adding a snapshot branch which targets a Content

yes

Btw, attempt started at [1], in case you might be interested ;)

[1] https://forge.softwareheritage.org/D2854

vlorentz accepted this revision.Aug 8 2020, 1:37 PM
This revision is now accepted and ready to land.Aug 8 2020, 1:37 PM
ardumont edited the summary of this revision. (Show Details)Aug 8 2020, 2:35 PM
Closed by commit rDLDBASE22e2b0632ce7: nixguix: Make the unsupported artifact extensions configurable (authored by ardumont). · Explain WhyAug 8 2020, 2:46 PM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDLDBASE22e2b0632ce7: nixguix: Make the unsupported artifact extensions configurable.

Revision Contents
Changeset List

PathSize
swh/
loader/
package/
nixguix/
31 lines
tests/
33 lines
58 lines

Diff 13200

View Options

swh/loader/package/nixguix/loader.py

Loading...
View Options

swh/loader/package/nixguix/tests/conftest.py

Loading...
View Options

swh/loader/package/nixguix/tests/test_nixguix.py

Loading...
About · Developer information · Legal