Page MenuHomeSoftware Heritage
Differential D8281

Remove 'keywords' from test files
ClosedPublic
Actions

Authored by vlorentz on Aug 22 2022, 3:48 PM.

Details

Reviewers
ardumont
Group Reviewers
Reviewers
Commits
rDCIDX97f5fdcdcc3a: Remove 'keywords' from test files
Summary

Their order is nondeterministic, it just happens to work with
the way we use PyLD.

Diff Detail

Repository
rDCIDX Metadata indexer
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.Aug 22 2022, 3:48 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptAug 22 2022, 3:48 PM
vlorentz added a child revision: D8279: Refactor metadata mappings using rdflib.Graph instead of JSON-LD internally.Aug 22 2022, 3:48 PM
swh-public-ci added a comment.Aug 22 2022, 3:59 PM

Build was aborted

Patch application report for D8281 (id=29897)

Could not rebase; Attempt merge onto 7d7f29fb6a...

Updating 7d7f29f..b9f206b
Fast-forward
 swh/indexer/codemeta.py                            | 23 ++++----
 swh/indexer/metadata_dictionary/base.py            | 64 +++++++++++++++++-----
 swh/indexer/metadata_dictionary/cff.py             | 17 +++---
 swh/indexer/metadata_dictionary/composer.py        |  9 +--
 swh/indexer/metadata_dictionary/dart.py            | 13 +++--
 swh/indexer/metadata_dictionary/github.py          | 34 +++++-------
 swh/indexer/metadata_dictionary/maven.py           | 53 +++++++-----------
 swh/indexer/metadata_dictionary/npm.py             | 11 ++--
 swh/indexer/metadata_dictionary/nuget.py           | 27 +++------
 swh/indexer/metadata_dictionary/python.py          | 22 ++++----
 swh/indexer/metadata_dictionary/ruby.py            |  7 ++-
 swh/indexer/namespaces.py                          | 28 ++++++++++
 .../tests/metadata_dictionary/test_nuget.py        | 12 ++--
 swh/indexer/tests/test_origin_metadata.py          |  6 +-
 swh/indexer/tests/utils.py                         | 13 -----
 15 files changed, 183 insertions(+), 156 deletions(-)
 create mode 100644 swh/indexer/namespaces.py
Changes applied before test
commit b9f206bfe0a8e2592708e7f1728643654564f32a
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 15:47:49 2022 +0200

    Remove 'keywords' from test files
    
    Their order is nondeterministic, it just happens to work with
    the way we use PyLD.

commit d5207e9521d982d2c170399b4855de3b6d9e8005
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 13:20:14 2022 +0200

    Add base XmlMapping to deduplicate between MavenMapping and NugetMapping

commit c4cd68f6ae0ea92be6e312a37fcf0fe597e7616f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 13:18:39 2022 +0200

    nuget: Remove test-specific code from the main class

commit b09e2bcfc73d72a670dbedfe5f8334d0036ce195
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 13:14:05 2022 +0200

    nuget: Inherit directly from BaseIntrinsicMapping

commit c8a4571c8763c84c064e832f598e949407e0e429
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 19 12:18:30 2022 +0200

    Replace 'normalize' parameter of _translate_dict() with a hook method
    
    This parameter was only used to execute extra code before
    `normalize_translation` is called. This caused some duplication, and
    will not work when switching to a non-JSON-LD internal representation.
    
    Removing it also makes the code of mappings more consistent, by removing
    specific field handling from their implementation of the `translate`
    method itself.

commit 466108c1667c88be7ff272e565ffe076e16064d8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 19 12:13:33 2022 +0200

    python: Simplify translation logic of author metadata

commit 92b53419f6f9d699451609cb23a946978ecb6b07
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 19 11:37:06 2022 +0200

    metadata_dictionary: Simplify code using rdflib-style namespace classes

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

Harbormaster returned this revision to the author for changes because remote builds failed.Aug 22 2022, 3:59 PM
Harbormaster failed remote builds in B30950: Diff 29897!
swh-public-ci added a comment.Aug 22 2022, 4:28 PM

Build has FAILED

Patch application report for D8281 (id=29897)

Could not rebase; Attempt merge onto 7d7f29fb6a...

Updating 7d7f29f..b9f206b
Fast-forward
 swh/indexer/codemeta.py                            | 23 ++++----
 swh/indexer/metadata_dictionary/base.py            | 64 +++++++++++++++++-----
 swh/indexer/metadata_dictionary/cff.py             | 17 +++---
 swh/indexer/metadata_dictionary/composer.py        |  9 +--
 swh/indexer/metadata_dictionary/dart.py            | 13 +++--
 swh/indexer/metadata_dictionary/github.py          | 34 +++++-------
 swh/indexer/metadata_dictionary/maven.py           | 53 +++++++-----------
 swh/indexer/metadata_dictionary/npm.py             | 11 ++--
 swh/indexer/metadata_dictionary/nuget.py           | 27 +++------
 swh/indexer/metadata_dictionary/python.py          | 22 ++++----
 swh/indexer/metadata_dictionary/ruby.py            |  7 ++-
 swh/indexer/namespaces.py                          | 28 ++++++++++
 .../tests/metadata_dictionary/test_nuget.py        | 12 ++--
 swh/indexer/tests/test_origin_metadata.py          |  6 +-
 swh/indexer/tests/utils.py                         | 13 -----
 15 files changed, 183 insertions(+), 156 deletions(-)
 create mode 100644 swh/indexer/namespaces.py
Changes applied before test
commit b9f206bfe0a8e2592708e7f1728643654564f32a
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 15:47:49 2022 +0200

    Remove 'keywords' from test files
    
    Their order is nondeterministic, it just happens to work with
    the way we use PyLD.

commit d5207e9521d982d2c170399b4855de3b6d9e8005
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 13:20:14 2022 +0200

    Add base XmlMapping to deduplicate between MavenMapping and NugetMapping

commit c4cd68f6ae0ea92be6e312a37fcf0fe597e7616f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 13:18:39 2022 +0200

    nuget: Remove test-specific code from the main class

commit b09e2bcfc73d72a670dbedfe5f8334d0036ce195
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 13:14:05 2022 +0200

    nuget: Inherit directly from BaseIntrinsicMapping

commit c8a4571c8763c84c064e832f598e949407e0e429
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 19 12:18:30 2022 +0200

    Replace 'normalize' parameter of _translate_dict() with a hook method
    
    This parameter was only used to execute extra code before
    `normalize_translation` is called. This caused some duplication, and
    will not work when switching to a non-JSON-LD internal representation.
    
    Removing it also makes the code of mappings more consistent, by removing
    specific field handling from their implementation of the `translate`
    method itself.

commit 466108c1667c88be7ff272e565ffe076e16064d8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 19 12:13:33 2022 +0200

    python: Simplify translation logic of author metadata

commit 92b53419f6f9d699451609cb23a946978ecb6b07
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 19 11:37:06 2022 +0200

    metadata_dictionary: Simplify code using rdflib-style namespace classes

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

swh-public-ci added a comment.Aug 23 2022, 10:24 AM

Build has FAILED

Patch application report for D8281 (id=29897)

Rebasing onto d5207e9521...

Current branch diff-target is up to date.
Changes applied before test
commit b9f206bfe0a8e2592708e7f1728643654564f32a
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 15:47:49 2022 +0200

    Remove 'keywords' from test files
    
    Their order is nondeterministic, it just happens to work with
    the way we use PyLD.

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

vlorentz updated this revision to Diff 29922.Aug 23 2022, 10:52 AM

fix test

swh-public-ci added a comment.Aug 23 2022, 11:00 AM

Build is green

Patch application report for D8281 (id=29922)

Rebasing onto d5207e9521...

Current branch diff-target is up to date.
Changes applied before test
commit 97f5fdcdcc3ac76d2b4680dbcd4f2b5d4c557293
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 15:47:49 2022 +0200

    Remove 'keywords' from test files
    
    Their order is nondeterministic, it just happens to work with
    the way we use PyLD.

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

Harbormaster completed remote builds in B30974: Diff 29922.Aug 23 2022, 11:00 AM
vlorentz requested review of this revision.Aug 23 2022, 11:00 AM
ardumont accepted this revision.Aug 23 2022, 11:01 AM
This revision is now accepted and ready to land.Aug 23 2022, 11:01 AM
Closed by commit rDCIDX97f5fdcdcc3a: Remove 'keywords' from test files (authored by vlorentz). · Explain WhyAug 23 2022, 11:21 AM
This revision was automatically updated to reflect the committed changes.
vlorentz added a commit: rDCIDX97f5fdcdcc3a: Remove 'keywords' from test files.

Revision Contents
Changeset List

PathSize
swh/
indexer/
tests/
metadata_dictionary/
6 lines
6 lines
13 lines

Diff 29930

View Options

swh/indexer/tests/metadata_dictionary/test_npm.py

Loading...
View Options

swh/indexer/tests/test_origin_metadata.py

Loading...
View Options

swh/indexer/tests/utils.py

Loading...
About · Developer information · Legal