Page MenuHomeSoftware Heritage
Differential D3436

nixguix/loader: Allow version both as string or integer
ClosedPublic
Actions

Authored by ardumont on Jul 6 2020, 4:51 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T2485: staging: Running nixguix on guix sources
Commits
rDLDBASEa3d2eb02654d: nixguix/loader: Allow version both as string or integer
Summary

Related to T2485

Related to [1]

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

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.Jul 6 2020, 4:51 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptJul 6 2020, 4:51 PM
swh-public-ci added a comment.Jul 6 2020, 4:53 PM

Build is green

Patch application report for D3436 (id=12161)

Could not rebase; Attempt merge onto aafac87f5c...

Updating aafac87..13fffa0
Fast-forward
 MANIFEST.in                                        |   1 +
 swh/loader/core/tests/__init__.py                  |   2 +-
 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               |   3 +-
 .../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                       | 160 +++++++++++++
 swh/loader/tests/common.py                         |  53 -----
 swh/loader/tests/data/0805nexter-1.1.0.tar.gz      |   1 +
 swh/loader/tests/test_common.py                    | 118 ----------
 swh/loader/tests/test_init.py                      | 253 +++++++++++++++++++++
 19 files changed, 443 insertions(+), 366 deletions(-)
 delete mode 100644 swh/loader/tests/common.py
 create mode 120000 swh/loader/tests/data/0805nexter-1.1.0.tar.gz
 delete mode 100644 swh/loader/tests/test_common.py
 create mode 100644 swh/loader/tests/test_init.py
Changes applied before test
commit 13fffa0b66b8817fc51575c559218e0ef3fb8468
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 d2bbe620b0185726b4b2428fd81b3845e7e6f362
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 373e9a16e967ad241865b69f1d8cbdf188b86bac
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

commit 3348e522ccfd8a217c015eada42731cbbc7ca0a3
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 14:41:05 2020 +0200

    Define common test helper function
    
    Related to T2481

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

Harbormaster completed remote builds in B13381: Diff 12161.Jul 6 2020, 4:53 PM
vlorentz added a subscriber: vlorentz.Jul 6 2020, 5:10 PM

If we need to support both, there should be a test for both

ardumont added a comment.Jul 6 2020, 5:12 PM

If we need to support both, there should be a test for both

well, it is, other sources.json have their value with an int (and not a string as this one declares).

ardumont added a comment.Jul 6 2020, 5:38 PM

If we need to support both, there should be a test for both

well, it is, other sources.json have their value with an int (and not a string as this one declares).

fine, i'll add explicitly the test cases for those ;)

ardumont updated this revision to Diff 12167.Jul 6 2020, 5:38 PM

Add test cases around the code change

ardumont updated this revision to Diff 12168.Jul 6 2020, 5:40 PM

Properly fix the test cases ¯\_(ツ)_/¯

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

Build is green

Patch application report for D3436 (id=12167)

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

Updating 3348e52..eb6b54e
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               |   3 +-
 .../nixpkgs-swh_sources.json                       |   2 +-
 swh/loader/package/nixguix/tests/test_nixguix.py   |  27 +--
 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, 373 insertions(+), 374 deletions(-)
 delete mode 100644 swh/loader/tests/common.py
 delete mode 100644 swh/loader/tests/test_common.py
Changes applied before test
commit eb6b54e2150a5fd4956a7d0557bff460f9c6be36
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/103/ for more details.

Harbormaster completed remote builds in B13387: Diff 12167.Jul 6 2020, 5:40 PM
swh-public-ci added a comment.Jul 6 2020, 5:42 PM

Build is green

Patch application report for D3436 (id=12168)

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

Updating 3348e52..1ee4166
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               |   3 +-
 .../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, 374 insertions(+), 374 deletions(-)
 delete mode 100644 swh/loader/tests/common.py
 delete mode 100644 swh/loader/tests/test_common.py
Changes applied before test
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/104/ for more details.

Harbormaster completed remote builds in B13388: Diff 12168.Jul 6 2020, 5:42 PM
vlorentz accepted this revision.Jul 7 2020, 9:39 AM
vlorentz added inline comments.
swh/loader/package/nixguix/tests/test_nixguix.py
65

s/are captured/raise an error/

This revision is now accepted and ready to land.Jul 7 2020, 9:39 AM
ardumont updated this revision to Diff 12179.Jul 7 2020, 10:10 AM

Adapt according to review

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

Build is green

Patch application report for D3436 (id=12179)

Rebasing onto d234a5c74c...

Current branch diff-target is up to date.
Changes applied before test
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/108/ for more details.

Harbormaster completed remote builds in B13399: Diff 12179.Jul 7 2020, 10:12 AM
Closed by commit rDLDBASEa3d2eb02654d: nixguix/loader: Allow version both as string or integer (authored by ardumont). · Explain WhyJul 7 2020, 10:12 AM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDLDBASEa3d2eb02654d: nixguix/loader: Allow version both as string or integer.

Revision Contents
Changeset List

PathSize
swh/
loader/
package/
nixguix/
3 lines
tests/
data/
https_nix-community.github.io/
2 lines
16 lines

Diff 12181

View Options

swh/loader/package/nixguix/loader.py

Loading...
View Options

swh/loader/package/nixguix/tests/data/https_nix-community.github.io/nixpkgs-swh_sources.json

Loading...
View Options

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

Loading...
About · Developer information · Legal