Page MenuHomeSoftware Heritage
Differential D5170

identifiers.get_swhid: return QualifiedSWHID instead of the deprecated SWHID class
ClosedPublic
Actions

Authored by vlorentz on Mar 1 2021, 1:55 PM.

Details

Reviewers
anlambert
Group Reviewers
Reviewers
Commits
rDWAPPS7a7f3e357046: identifiers.get_swhid: return QualifiedSWHID instead of the deprecated SWHID…
Summary

and update every caller.

Diff Detail

Repository
rDWAPPS Web applications
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

vlorentz created this revision.Mar 1 2021, 1:55 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptMar 1 2021, 1:55 PM
vlorentz updated this revision to Diff 18491.Mar 1 2021, 1:59 PM

rebase + remove useless import

swh-public-ci added a comment.Mar 1 2021, 2:05 PM

Build has FAILED

Patch application report for D5170 (id=18489)

Could not rebase; Attempt merge onto 3b1ee65790...

Updating 3b1ee657..4b195bb6
Fast-forward
 swh/web/api/views/identifiers.py               |  20 ++-
 swh/web/common/identifiers.py                  | 167 +++++++++++++------------
 swh/web/misc/badges.py                         |  71 +++++------
 swh/web/tests/browse/views/test_content.py     |  31 +++--
 swh/web/tests/browse/views/test_directory.py   |  27 ++--
 swh/web/tests/browse/views/test_identifiers.py |   2 +-
 swh/web/tests/common/test_identifiers.py       |  37 +++---
 swh/web/tests/misc/test_badges.py              | 109 +++++++---------
 8 files changed, 239 insertions(+), 225 deletions(-)
Changes applied before test
commit 4b195bb6b79bfc8c38185a9bbfaf1cc151fe6ab0
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Mar 1 13:55:06 2021 +0100

    identifiers.get_swhid: return QualifiedSWHID instead of the deprecated SWHID class
    
    and update every caller.

commit 9203797fe45e93e9a459a50e80c8fa6371ff0cd2
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Mar 1 12:34:35 2021 +0100

    identifiers.gen_swhid: Use QualifiedSWHID instead of the deprecated swhid() function.
    
    Also fix tests using it with the wrong argument type (a dict with an
    "id" key, instead of just the object id).

commit a9298c4193bf43008501f52c734586b1dce44ebc
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Mar 1 12:11:44 2021 +0100

    badges: Use QualifiedSWHID instead of the old SWHID class.
    
    Also drops support for swh:1:ori: badges, because we shouldn't
    support them anyway.

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/596/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/596/console

Harbormaster failed remote builds in B19565: Diff 18489!Mar 1 2021, 2:05 PM
swh-public-ci added a comment.Mar 1 2021, 2:21 PM

Build is green

Patch application report for D5170 (id=18491)

Could not rebase; Attempt merge onto 3b1ee65790...

Updating 3b1ee657..8e568525
Fast-forward
 swh/web/api/views/identifiers.py               |  20 ++-
 swh/web/common/identifiers.py                  | 164 ++++++++++++-------------
 swh/web/misc/badges.py                         |  71 +++++------
 swh/web/tests/browse/views/test_content.py     |  31 +++--
 swh/web/tests/browse/views/test_directory.py   |  27 ++--
 swh/web/tests/browse/views/test_identifiers.py |   2 +-
 swh/web/tests/common/test_identifiers.py       |  37 +++---
 swh/web/tests/misc/test_badges.py              | 109 +++++++---------
 8 files changed, 234 insertions(+), 227 deletions(-)
Changes applied before test
commit 8e568525ea519ead517ba97504b28f51c6db81ee
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Mar 1 13:55:06 2021 +0100

    identifiers.get_swhid: return QualifiedSWHID instead of the deprecated SWHID class
    
    and update every caller.

commit 65fd22bb64cddae825c1b028cba9e39da702efad
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Mar 1 12:34:35 2021 +0100

    identifiers.gen_swhid: Use QualifiedSWHID instead of the deprecated swhid() function.
    
    Also fix tests using it with the wrong argument type (a dict with an
    "id" key, instead of just the object id).

commit a9298c4193bf43008501f52c734586b1dce44ebc
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Mar 1 12:11:44 2021 +0100

    badges: Use QualifiedSWHID instead of the old SWHID class.
    
    Also drops support for swh:1:ori: badges, because we shouldn't
    support them anyway.

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

Harbormaster completed remote builds in B19567: Diff 18491.Mar 1 2021, 2:21 PM
vlorentz requested review of this revision.Mar 1 2021, 2:21 PM
anlambert accepted this revision.Mar 1 2021, 2:43 PM
This revision is now accepted and ready to land.Mar 1 2021, 2:43 PM
vlorentz updated this revision to Diff 18495.Mar 1 2021, 2:54 PM

rebase

swh-public-ci added a comment.Mar 1 2021, 3:15 PM

Build is green

Patch application report for D5170 (id=18495)

Could not rebase; Attempt merge onto 3b1ee65790...

Updating 3b1ee657..7a7f3e35
Fast-forward
 swh/web/api/views/identifiers.py               |  20 ++-
 swh/web/common/identifiers.py                  | 164 ++++++++++++-------------
 swh/web/misc/badges.py                         |  58 ++++-----
 swh/web/tests/browse/views/test_content.py     |  31 +++--
 swh/web/tests/browse/views/test_directory.py   |  27 ++--
 swh/web/tests/browse/views/test_identifiers.py |   2 +-
 swh/web/tests/common/test_identifiers.py       |  37 +++---
 swh/web/tests/misc/test_badges.py              |  86 +++++++------
 8 files changed, 229 insertions(+), 196 deletions(-)
Changes applied before test
commit 7a7f3e35704698755a23930cfdeb729b1cd9d52c
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Mar 1 13:55:06 2021 +0100

    identifiers.get_swhid: return QualifiedSWHID instead of the deprecated SWHID class
    
    and update every caller.

commit 777d7e6ad9d94b62b0978458e413f4381e91fac7
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Mar 1 12:34:35 2021 +0100

    identifiers.gen_swhid: Use QualifiedSWHID instead of the deprecated swhid() function.
    
    Also fix tests using it with the wrong argument type (a dict with an
    "id" key, instead of just the object id).

commit fc8ac013e9970772e46017506a67c17c56de01b6
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Mar 1 12:11:44 2021 +0100

    badges: Use QualifiedSWHID instead of the old SWHID class.
    
    Also drops support for swh:1:ori: badges, because we shouldn't
    support them anyway.

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

Harbormaster completed remote builds in B19571: Diff 18495.Mar 1 2021, 3:15 PM
Closed by commit rDWAPPS7a7f3e357046: identifiers.get_swhid: return QualifiedSWHID instead of the deprecated SWHID… (authored by vlorentz). · Explain WhyMar 1 2021, 5:25 PM
This revision was automatically updated to reflect the committed changes.
vlorentz added a commit: rDWAPPS7a7f3e357046: identifiers.get_swhid: return QualifiedSWHID instead of the deprecated SWHID….

Revision Contents
Changeset List

PathSize
swh/
web/
api/
views/
20 lines
common/
143 lines
tests/
common/
37 lines

Diff 18506

View Options

swh/web/api/views/identifiers.py

Loading...
View Options

swh/web/common/identifiers.py

Loading...
View Options

swh/web/tests/common/test_identifiers.py

Loading...
About · Developer information · Legal