Page MenuHomeSoftware Heritage
Differential D3437

nixguix/loader: Check further the source entry only if it's valid
ClosedPublic
Actions

Authored by ardumont on Jul 6 2020, 5:24 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T2485: staging: Running nixguix on guix sources
Commits
rDLDBASEb5caab2756ac: nixguix/loader: Check further the source entry only if it's valid
Summary

This avoids issue like [1]

[1] https://sentry.softwareheritage.org/share/issue/03894999a9a84b15b208db383c7b1d1a/

Related to T2485

Test Plan

tox

Diff Detail

Event Timeline

ardumont created this revision.Jul 6 2020, 5:24 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptJul 6 2020, 5:24 PM
swh-public-ci added a comment.Jul 6 2020, 5:26 PM

Build is green

Patch application report for D3437 (id=12165)

Could not rebase; Attempt merge onto 3348e522cc...

Updating 3348e52..815f0ab
Fast-forward
 swh/loader/core/tests/test_loader.py               |   2 +-
 swh/loader/package/archive/tests/test_archive.py   |   6 +-
 swh/loader/package/cran/tests/test_cran.py         |   4 +-
 swh/loader/package/debian/tests/test_debian.py     |   4 +-
 swh/loader/package/deposit/tests/test_deposit.py   |   6 +-
 swh/loader/package/nixguix/loader.py               |   7 +-
 .../nixpkgs-swh_sources.json                       |   2 +-
 swh/loader/package/nixguix/tests/test_nixguix.py   |  11 +-
 swh/loader/package/npm/tests/test_npm.py           |   6 +-
 swh/loader/package/pypi/tests/test_pypi.py         |   6 +-
 swh/loader/package/tests/common.py                 |  82 --------
 swh/loader/package/tests/test_common.py            |  89 +--------
 swh/loader/tests/__init__.py                       | 132 ++++++++++++-
 swh/loader/tests/common.py                         |  53 ------
 swh/loader/tests/test_common.py                    | 118 ------------
 swh/loader/tests/test_init.py                      | 207 ++++++++++++++++++++-
 16 files changed, 365 insertions(+), 370 deletions(-)
 delete mode 100644 swh/loader/tests/common.py
 delete mode 100644 swh/loader/tests/test_common.py
Changes applied before test
commit 815f0abfdeb3d47220f9a77cd563547cbf5d42b2
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 17:24:31 2020 +0200

    nixguix/loader: Check further the source entry if it's valid
    
    This avoids issue like [1]
    
    [1] https://sentry.softwareheritage.org/share/issue/03894999a9a84b15b208db383c7b1d1a/
    
    Related to T2485

commit 668bf542401389330e688a9d54b2a993212a54c2
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 16:47:55 2020 +0200

    nixguix/loader: Allow version both as string or integer
    
    Related to T2485

commit d234a5c74c2b4bafb2f22b7061662062ebbda761
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 15:30:17 2020 +0200

    Move remaining common test utility functions to top-level arborescence
    
    It's shared amongst both package and core loaders.
    
    Related to T2481

commit 4084012c0ad7e451ed229c0dc8220543591adc65
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 14:49:40 2020 +0200

    Move common test utility function to the top-level arborescence
    
    It's shared amongst both package and core loaders.
    
    Related to T2481

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

Harbormaster completed remote builds in B13385: Diff 12165.Jul 6 2020, 5:26 PM
ardumont updated this revision to Diff 12166.Jul 6 2020, 5:33 PM

Add scenario that currently mimick the failure (and now it deals properly with it ;)

swh-public-ci added a comment.Jul 6 2020, 5:35 PM

Build is green

Patch application report for D3437 (id=12166)

Could not rebase; Attempt merge onto 3348e522cc...

Updating 3348e52..5af826e
Fast-forward
 swh/loader/core/tests/test_loader.py               |   2 +-
 swh/loader/package/archive/tests/test_archive.py   |   6 +-
 swh/loader/package/cran/tests/test_cran.py         |   4 +-
 swh/loader/package/debian/tests/test_debian.py     |   4 +-
 swh/loader/package/deposit/tests/test_deposit.py   |   6 +-
 swh/loader/package/nixguix/loader.py               |   7 +-
 .../nixpkgs-swh_sources.json                       |   2 +-
 swh/loader/package/nixguix/tests/test_nixguix.py   |  13 +-
 swh/loader/package/npm/tests/test_npm.py           |   6 +-
 swh/loader/package/pypi/tests/test_pypi.py         |   6 +-
 swh/loader/package/tests/common.py                 |  82 --------
 swh/loader/package/tests/test_common.py            |  89 +--------
 swh/loader/tests/__init__.py                       | 132 ++++++++++++-
 swh/loader/tests/common.py                         |  53 ------
 swh/loader/tests/test_common.py                    | 118 ------------
 swh/loader/tests/test_init.py                      | 207 ++++++++++++++++++++-
 16 files changed, 367 insertions(+), 370 deletions(-)
 delete mode 100644 swh/loader/tests/common.py
 delete mode 100644 swh/loader/tests/test_common.py
Changes applied before test
commit 5af826e99e07f69d567679307b17f1a84e85f919
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 17:24:31 2020 +0200

    nixguix/loader: Check further the source entry only if it's valid
    
    This avoids issues like [1]
    
    [1] https://sentry.softwareheritage.org/share/issue/03894999a9a84b15b208db383c7b1d1a/
    
    Related to T2485

commit 668bf542401389330e688a9d54b2a993212a54c2
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 16:47:55 2020 +0200

    nixguix/loader: Allow version both as string or integer
    
    Related to T2485

commit d234a5c74c2b4bafb2f22b7061662062ebbda761
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 15:30:17 2020 +0200

    Move remaining common test utility functions to top-level arborescence
    
    It's shared amongst both package and core loaders.
    
    Related to T2481

commit 4084012c0ad7e451ed229c0dc8220543591adc65
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 14:49:40 2020 +0200

    Move common test utility function to the top-level arborescence
    
    It's shared amongst both package and core loaders.
    
    Related to T2481

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

Harbormaster completed remote builds in B13386: Diff 12166.Jul 6 2020, 5:35 PM
ardumont updated this revision to Diff 12169.Jul 6 2020, 5:41 PM

Rebase

swh-public-ci added a comment.Jul 6 2020, 5:43 PM

Build is green

Patch application report for D3437 (id=12169)

Could not rebase; Attempt merge onto 3348e522cc...

Updating 3348e52..d52270c
Fast-forward
 swh/loader/core/tests/test_loader.py               |   2 +-
 swh/loader/package/archive/tests/test_archive.py   |   6 +-
 swh/loader/package/cran/tests/test_cran.py         |   4 +-
 swh/loader/package/debian/tests/test_debian.py     |   4 +-
 swh/loader/package/deposit/tests/test_deposit.py   |   6 +-
 swh/loader/package/nixguix/loader.py               |   7 +-
 .../nixpkgs-swh_sources.json                       |   2 +-
 swh/loader/package/nixguix/tests/test_nixguix.py   |  28 ++-
 swh/loader/package/npm/tests/test_npm.py           |   6 +-
 swh/loader/package/pypi/tests/test_pypi.py         |   6 +-
 swh/loader/package/tests/common.py                 |  82 --------
 swh/loader/package/tests/test_common.py            |  89 +--------
 swh/loader/tests/__init__.py                       | 132 ++++++++++++-
 swh/loader/tests/common.py                         |  53 ------
 swh/loader/tests/test_common.py                    | 118 ------------
 swh/loader/tests/test_init.py                      | 207 ++++++++++++++++++++-
 16 files changed, 377 insertions(+), 375 deletions(-)
 delete mode 100644 swh/loader/tests/common.py
 delete mode 100644 swh/loader/tests/test_common.py
Changes applied before test
commit d52270c6f2770a7997cbff53ec51c62a44ff2ffc
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 17:24:31 2020 +0200

    nixguix/loader: Check further the source entry only if it's valid
    
    This avoids issues like [1]
    
    [1] https://sentry.softwareheritage.org/share/issue/03894999a9a84b15b208db383c7b1d1a/
    
    Related to T2485

commit 1ee416613ca521fc978dd1a66d9d442ca314476e
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 16:47:55 2020 +0200

    nixguix/loader: Allow version both as string or integer
    
    Related to T2485

commit d234a5c74c2b4bafb2f22b7061662062ebbda761
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 15:30:17 2020 +0200

    Move remaining common test utility functions to top-level arborescence
    
    It's shared amongst both package and core loaders.
    
    Related to T2481

commit 4084012c0ad7e451ed229c0dc8220543591adc65
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 14:49:40 2020 +0200

    Move common test utility function to the top-level arborescence
    
    It's shared amongst both package and core loaders.
    
    Related to T2481

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

Harbormaster completed remote builds in B13389: Diff 12169.Jul 6 2020, 5:43 PM
ardumont retitled this revision from nixguix/loader: Check further the source entry if it's valid to nixguix/loader: Check further the source entry only if it's valid.Jul 6 2020, 5:51 PM
vlorentz accepted this revision.Jul 7 2020, 9:40 AM
This revision is now accepted and ready to land.Jul 7 2020, 9:40 AM
ardumont updated this revision to Diff 12180.Jul 7 2020, 10:11 AM

Rebase

swh-public-ci added a comment.Jul 7 2020, 10:13 AM

Build is green

Patch application report for D3437 (id=12180)

Could not rebase; Attempt merge onto d234a5c74c...

Updating d234a5c..b5caab2
Fast-forward
 swh/loader/package/nixguix/loader.py                     |  7 ++++---
 .../nixpkgs-swh_sources.json                             |  2 +-
 swh/loader/package/nixguix/tests/test_nixguix.py         | 16 +++++++++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)
Changes applied before test
commit b5caab2756ac5d6f3a5fb891ae2b5f1d4df6abf0
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 17:24:31 2020 +0200

    nixguix/loader: Check further the source entry only if it's valid
    
    This avoids issues like [1]
    
    [1] https://sentry.softwareheritage.org/share/issue/03894999a9a84b15b208db383c7b1d1a/
    
    Related to T2485

commit a3d2eb02654ddf8a9c7b4405815c587c3d8476d3
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 16:47:55 2020 +0200

    nixguix/loader: Allow version both as string or integer
    
    Related to T2485

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

Harbormaster completed remote builds in B13400: Diff 12180.Jul 7 2020, 10:13 AM
Closed by commit rDLDBASEb5caab2756ac: nixguix/loader: Check further the source entry only if it's valid (authored by ardumont). · Explain WhyJul 7 2020, 10:14 AM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDLDBASEb5caab2756ac: nixguix/loader: Check further the source entry only if it's valid.

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
loader/
package/
nixguix/
4 lines98%
Loading...

Diff 12165

View Options

swh/loader/package/nixguix/loader.py

Loading...
About · Developer information · Legal