Page MenuHomeSoftware Heritage
Differential D8047

Indexer for Packagist(composer.json)
ClosedPublic
Actions

Authored by VickyMerzOwn on Jun 29 2022, 12:57 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T4357: Metadata Indexer for Composer
Commits
rDCIDX79499ea59658: metadata_dictionary: Add mappings for composer.json
Summary

Fixes T4357

Diff Detail

Repository
rDCIDX Metadata indexer
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 30234
Build 47259: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 47258: arc lint + arc unit

Unit TestsFailed
View All

TimeTest
1 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.indexer.tests.metadata_dictionary.test_codemeta::test_detect_metadata_codemeta_json_uppercase
def test_detect_metadata_codemeta_json_uppercase(): df = [ {
0 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.indexer.tests.metadata_dictionary.test_composer::test_compute_metadata_composer
file /var/lib/jenkins/workspace/DCIDX/tests-on-diff@3/.tox/py3/lib/python3.7/site-packages/swh/indexer/tests/metadata_dictionary/test_composer.py, line 9 def test_compute_metadata_composer(self): E fixture 'self' not found
1 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.indexer.tests.metadata_dictionary.test_npm::test_detect_metadata_package_json[PACKAGE.JSON]
filename = b'PACKAGE.JSON' @pytest.mark.parametrize(
1 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.indexer.tests.metadata_dictionary.test_npm::test_detect_metadata_package_json[PACKAGE.json]
filename = b'PACKAGE.json' @pytest.mark.parametrize(
1 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.indexer.tests.metadata_dictionary.test_npm::test_detect_metadata_package_json[Package.json]
filename = b'Package.json' @pytest.mark.parametrize(
View Full Test Results (16 Failed · 352 Passed · 15 Skipped)

Event Timeline

VickyMerzOwn created this revision.Jun 29 2022, 12:57 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptJun 29 2022, 12:57 PM
swh-public-ci added a comment.Jun 29 2022, 1:03 PM

Build is green

Patch application report for D8047 (id=29034)

Rebasing onto 1be4e184d4...

Current branch diff-target is up to date.
Changes applied before test
commit d5615ed2e79e093421d87b5d3f2ddc3edf95aa89
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    Update crosswalk and define ComposerMapping

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

Harbormaster completed remote builds in B30121: Diff 29034.Jun 29 2022, 1:03 PM
VickyMerzOwn requested review of this revision.Jun 29 2022, 1:03 PM
VickyMerzOwn updated this revision to Diff 29059.Jun 29 2022, 10:55 PM

Adds test for ideal behavior of indexer
Removes type attribute in Packagist column of crosswalk.

swh-public-ci added a comment.Jun 29 2022, 11:01 PM

Build has FAILED

Patch application report for D8047 (id=29059)

Rebasing onto 1be4e184d4...

Current branch diff-target is up to date.
Changes applied before test
commit 3d27e70f07058e875aba4bbef76daaac6cfe0188
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 02:18:29 2022 +0530

    Changes to crosswalk and test_metadata

commit d5615ed2e79e093421d87b5d3f2ddc3edf95aa89
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    Update crosswalk and define ComposerMapping

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

Harbormaster failed remote builds in B30145: Diff 29059!Jun 29 2022, 11:01 PM
VickyMerzOwn updated this revision to Diff 29094.Jun 30 2022, 7:09 PM

Adds composer mappings to metadata dictionary

swh-public-ci added a comment.Jun 30 2022, 7:15 PM

Build is green

Patch application report for D8047 (id=29094)

Rebasing onto 1be4e184d4...

Current branch diff-target is up to date.
Changes applied before test
commit 919ec49908cb5cbc24dcb2b379924903419fdd6a
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 22:35:42 2022 +0530

    Adds working indxer for composer

commit 3d27e70f07058e875aba4bbef76daaac6cfe0188
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 02:18:29 2022 +0530

    Changes to crosswalk and test_metadata

commit d5615ed2e79e093421d87b5d3f2ddc3edf95aa89
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    Update crosswalk and define ComposerMapping

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

Harbormaster completed remote builds in B30182: Diff 29094.Jun 30 2022, 7:15 PM
vlorentz requested changes to this revision.Jun 30 2022, 7:43 PM
vlorentz added a subscriber: vlorentz.
vlorentz added inline comments.
swh/indexer/data/codemeta/crosswalk.csv
68 ↗(On Diff #29094)

please don't change this file, it should not diverge from codemeta:

  1. it would make it hard to merge when codemeta updates its crosswalk
  2. it makes the citation inaccurate
swh/indexer/metadata_dictionary/composer.py
37–49

please do it without intermediary variables like other mappings, it's simpler

This revision now requires changes to proceed.Jun 30 2022, 7:43 PM
VickyMerzOwn added inline comments.Jun 30 2022, 7:56 PM
swh/indexer/data/codemeta/crosswalk.csv
68 ↗(On Diff #29094)

Should I just put the table in a separate file that goes to the data directory?
(I'll put only the relevant columns in this file if so)

VickyMerzOwn updated this revision to Diff 29096.Jun 30 2022, 9:32 PM

Composer mappings use a separate table

VickyMerzOwn updated this revision to Diff 29097.Jun 30 2022, 9:34 PM
VickyMerzOwn marked an inline comment as done.

Undo changes to crosswalk.csv

swh-public-ci added a comment.Jun 30 2022, 9:38 PM

Build is green

Patch application report for D8047 (id=29096)

Rebasing onto 1be4e184d4...

Current branch diff-target is up to date.
Changes applied before test
commit d45e779327d2508f5ba637e09aa6ac66edfd8b4f
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:00:29 2022 +0530

    Adds a crosswalk for composer mappings

commit 919ec49908cb5cbc24dcb2b379924903419fdd6a
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 22:35:42 2022 +0530

    Adds working indxer for composer

commit 3d27e70f07058e875aba4bbef76daaac6cfe0188
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 02:18:29 2022 +0530

    Changes to crosswalk and test_metadata

commit d5615ed2e79e093421d87b5d3f2ddc3edf95aa89
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    Update crosswalk and define ComposerMapping

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

Harbormaster completed remote builds in B30188: Diff 29096.Jun 30 2022, 9:38 PM
vlorentz added inline comments.Jun 30 2022, 9:38 PM
swh/indexer/data/codemeta/crosswalk.csv
68 ↗(On Diff #29094)

hmm, you could put it in swh/indexer/data/crosswalks/Composer.csv.

this way it still looks somewhat like https://github.com/codemeta/codemeta/tree/master/crosswalks and it will be easier to compare after they merge

swh-public-ci added a comment.Jun 30 2022, 9:40 PM

Build is green

Patch application report for D8047 (id=29097)

Rebasing onto 1be4e184d4...

Current branch diff-target is up to date.
Changes applied before test
commit de51688050da73f9b05dbfe77faca427abb061d3
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:04:18 2022 +0530

    Undo changes to crosswalk.csv

commit d45e779327d2508f5ba637e09aa6ac66edfd8b4f
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:00:29 2022 +0530

    Adds a crosswalk for composer mappings

commit 919ec49908cb5cbc24dcb2b379924903419fdd6a
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 22:35:42 2022 +0530

    Adds working indxer for composer

commit 3d27e70f07058e875aba4bbef76daaac6cfe0188
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 02:18:29 2022 +0530

    Changes to crosswalk and test_metadata

commit d5615ed2e79e093421d87b5d3f2ddc3edf95aa89
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    Update crosswalk and define ComposerMapping

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

Harbormaster completed remote builds in B30189: Diff 29097.Jun 30 2022, 9:40 PM
VickyMerzOwn updated this revision to Diff 29098.Jun 30 2022, 9:54 PM

Undo changes to crosswalk.csv

swh-public-ci added a comment.Jun 30 2022, 10:00 PM

Build is green

Patch application report for D8047 (id=29098)

Rebasing onto 1be4e184d4...

Current branch diff-target is up to date.
Changes applied before test
commit 0d8fd371bea5ca5e1715a2333af64585d510e325
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:09:01 2022 +0530

    Undo changes to crosswalk.csv

commit de51688050da73f9b05dbfe77faca427abb061d3
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:04:18 2022 +0530

    Undo changes to crosswalk.csv

commit d45e779327d2508f5ba637e09aa6ac66edfd8b4f
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:00:29 2022 +0530

    Adds a crosswalk for composer mappings

commit 919ec49908cb5cbc24dcb2b379924903419fdd6a
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 22:35:42 2022 +0530

    Adds working indxer for composer

commit 3d27e70f07058e875aba4bbef76daaac6cfe0188
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 02:18:29 2022 +0530

    Changes to crosswalk and test_metadata

commit d5615ed2e79e093421d87b5d3f2ddc3edf95aa89
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    Update crosswalk and define ComposerMapping

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

Harbormaster completed remote builds in B30190: Diff 29098.Jun 30 2022, 10:00 PM
vlorentz added inline comments.Jun 30 2022, 10:31 PM
swh/indexer/data/composer.csv
1

only keep the Property and Packagist columns (and rename Packagist to Composer)

swh/indexer/metadata_dictionary/composer.py
1

add copyright header (sorry, I forgot to mention it before)

VickyMerzOwn added inline comments.Jun 30 2022, 10:45 PM
swh/indexer/data/composer.csv
1

Have to leave the codemeta-v1 column too as it is asserted to be present in _read_crosstable(fd)

swh/indexer/metadata_dictionary/composer.py
1

no problem. in a moment.

VickyMerzOwn updated this revision to Diff 29099.Jun 30 2022, 10:46 PM

Adds license to composer.py
Excludes redundant columns from composer.csv

swh-public-ci added a comment.Jun 30 2022, 10:52 PM

Build is green

Patch application report for D8047 (id=29099)

Rebasing onto 1be4e184d4...

Current branch diff-target is up to date.
Changes applied before test
commit 4a28b00ab6bdd443659efb51a64b95afa87c6fc1
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 02:12:52 2022 +0530

    Changes to composer.csv and Adds license to composer.py

commit 0d8fd371bea5ca5e1715a2333af64585d510e325
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:09:01 2022 +0530

    Undo changes to crosswalk.csv

commit de51688050da73f9b05dbfe77faca427abb061d3
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:04:18 2022 +0530

    Undo changes to crosswalk.csv

commit d45e779327d2508f5ba637e09aa6ac66edfd8b4f
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:00:29 2022 +0530

    Adds a crosswalk for composer mappings

commit 919ec49908cb5cbc24dcb2b379924903419fdd6a
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 22:35:42 2022 +0530

    Adds working indxer for composer

commit 3d27e70f07058e875aba4bbef76daaac6cfe0188
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 02:18:29 2022 +0530

    Changes to crosswalk and test_metadata

commit d5615ed2e79e093421d87b5d3f2ddc3edf95aa89
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    Update crosswalk and define ComposerMapping

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

Harbormaster completed remote builds in B30191: Diff 29099.Jun 30 2022, 10:52 PM
VickyMerzOwn updated this revision to Diff 29100.Jun 30 2022, 11:13 PM

Corrects Copyright year

swh-public-ci added a comment.Jun 30 2022, 11:18 PM

Build is green

Patch application report for D8047 (id=29100)

Rebasing onto 1be4e184d4...

Current branch diff-target is up to date.
Changes applied before test
commit bcaf0b9ffe9a2bfd5208a0218c668be79a8beb2e
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 02:41:59 2022 +0530

    Edit Copyright year

commit 4a28b00ab6bdd443659efb51a64b95afa87c6fc1
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 02:12:52 2022 +0530

    Changes to composer.csv and Adds license to composer.py

commit 0d8fd371bea5ca5e1715a2333af64585d510e325
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:09:01 2022 +0530

    Undo changes to crosswalk.csv

commit de51688050da73f9b05dbfe77faca427abb061d3
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:04:18 2022 +0530

    Undo changes to crosswalk.csv

commit d45e779327d2508f5ba637e09aa6ac66edfd8b4f
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:00:29 2022 +0530

    Adds a crosswalk for composer mappings

commit 919ec49908cb5cbc24dcb2b379924903419fdd6a
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 22:35:42 2022 +0530

    Adds working indxer for composer

commit 3d27e70f07058e875aba4bbef76daaac6cfe0188
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 02:18:29 2022 +0530

    Changes to crosswalk and test_metadata

commit d5615ed2e79e093421d87b5d3f2ddc3edf95aa89
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    Update crosswalk and define ComposerMapping

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

Harbormaster completed remote builds in B30192: Diff 29100.Jun 30 2022, 11:18 PM
vlorentz added inline comments.Jul 1 2022, 8:39 AM
swh/indexer/data/composer.csv
1

I think you can remove the assertion. it was useful while I was prototyping the mappings, but now this is well covered by tests

swh/indexer/metadata_dictionary/composer.py
55

that property does not exist https://schema.org/role

VickyMerzOwn updated this revision to Diff 29101.Jul 1 2022, 9:01 AM

Excludes codemeta-v1 column from composer.csv

swh-public-ci added a comment.Jul 1 2022, 9:06 AM

Build is green

Patch application report for D8047 (id=29101)

Rebasing onto 1be4e184d4...

Current branch diff-target is up to date.
Changes applied before test
commit 5905866f3685b7a7ccccc5d1655b2b1142852527
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 03:14:29 2022 +0530

    Exclude codemeta-v1 column from composer.csv

commit bcaf0b9ffe9a2bfd5208a0218c668be79a8beb2e
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 02:41:59 2022 +0530

    Edit Copyright year

commit 4a28b00ab6bdd443659efb51a64b95afa87c6fc1
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 02:12:52 2022 +0530

    Changes to composer.csv and Adds license to composer.py

commit 0d8fd371bea5ca5e1715a2333af64585d510e325
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:09:01 2022 +0530

    Undo changes to crosswalk.csv

commit de51688050da73f9b05dbfe77faca427abb061d3
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:04:18 2022 +0530

    Undo changes to crosswalk.csv

commit d45e779327d2508f5ba637e09aa6ac66edfd8b4f
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:00:29 2022 +0530

    Adds a crosswalk for composer mappings

commit 919ec49908cb5cbc24dcb2b379924903419fdd6a
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 22:35:42 2022 +0530

    Adds working indxer for composer

commit 3d27e70f07058e875aba4bbef76daaac6cfe0188
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 02:18:29 2022 +0530

    Changes to crosswalk and test_metadata

commit d5615ed2e79e093421d87b5d3f2ddc3edf95aa89
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    Update crosswalk and define ComposerMapping

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

Harbormaster completed remote builds in B30193: Diff 29101.Jul 1 2022, 9:06 AM
VickyMerzOwn updated this revision to Diff 29104.Jul 1 2022, 12:54 PM

Excludes author.role from composer.py

swh-public-ci added a comment.Jul 1 2022, 1:05 PM

Build was aborted

Patch application report for D8047 (id=29104)

Rebasing onto 1be4e184d4...

Current branch diff-target is up to date.
Changes applied before test
commit 6446cd46846e8e2254a231fe3bca165aa147531a
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 15:55:22 2022 +0530

    Excludes author.role from composer.py

commit 5905866f3685b7a7ccccc5d1655b2b1142852527
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 03:14:29 2022 +0530

    Exclude codemeta-v1 column from composer.csv

commit bcaf0b9ffe9a2bfd5208a0218c668be79a8beb2e
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 02:41:59 2022 +0530

    Edit Copyright year

commit 4a28b00ab6bdd443659efb51a64b95afa87c6fc1
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 02:12:52 2022 +0530

    Changes to composer.csv and Adds license to composer.py

commit 0d8fd371bea5ca5e1715a2333af64585d510e325
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:09:01 2022 +0530

    Undo changes to crosswalk.csv

commit de51688050da73f9b05dbfe77faca427abb061d3
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:04:18 2022 +0530

    Undo changes to crosswalk.csv

commit d45e779327d2508f5ba637e09aa6ac66edfd8b4f
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Fri Jul 1 01:00:29 2022 +0530

    Adds a crosswalk for composer mappings

commit 919ec49908cb5cbc24dcb2b379924903419fdd6a
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 22:35:42 2022 +0530

    Adds working indxer for composer

commit 3d27e70f07058e875aba4bbef76daaac6cfe0188
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Thu Jun 30 02:18:29 2022 +0530

    Changes to crosswalk and test_metadata

commit d5615ed2e79e093421d87b5d3f2ddc3edf95aa89
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    Update crosswalk and define ComposerMapping

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

Harbormaster failed remote builds in B30196: Diff 29104!Jul 1 2022, 1:05 PM
VickyMerzOwn updated this revision to Diff 29142.Jul 4 2022, 2:08 PM

Rebasing

swh-public-ci added a comment.Jul 4 2022, 2:14 PM

Build has FAILED

Patch application report for D8047 (id=29142)

Rebasing onto 61b22345e7...

Current branch diff-target is up to date.
Changes applied before test
commit 4e1e2617eb90fcdb6394333a739e1fe6cacb9c43
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    metadata_dictionary: Add mappings for composer.json

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

Harbormaster failed remote builds in B30234: Diff 29142!Jul 4 2022, 2:14 PM
VickyMerzOwn updated this revision to Diff 29143.Jul 4 2022, 2:19 PM

Fix failed build: Corrects test in test_composer

vlorentz accepted this revision.Jul 4 2022, 2:28 PM
This revision is now accepted and ready to land.Jul 4 2022, 2:28 PM
swh-public-ci added a comment.Jul 4 2022, 2:30 PM

Build was aborted

Patch application report for D8047 (id=29143)

Rebasing onto 61b22345e7...

Current branch diff-target is up to date.
Changes applied before test
commit 79499ea596586386efb884eb07520cf39c513ad7
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    metadata_dictionary: Add mappings for composer.json

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

Harbormaster failed remote builds in B30235: Diff 29143!Jul 4 2022, 2:30 PM
This revision was landed with ongoing or failed builds.Jul 4 2022, 2:46 PM
Closed by commit rDCIDX79499ea59658: metadata_dictionary: Add mappings for composer.json (authored by VickyMerzOwn). · Explain Why
This revision was automatically updated to reflect the committed changes.
VickyMerzOwn added a commit: rDCIDX79499ea59658: metadata_dictionary: Add mappings for composer.json.
VickyMerzOwn reopened this revision.Jul 4 2022, 11:05 PM
This revision is now accepted and ready to land.Jul 4 2022, 11:05 PM
VickyMerzOwn updated this revision to Diff 29157.Jul 4 2022, 11:10 PM

Add SingleFileMapping as parent class to ComposerMapping

swh-public-ci added a comment.Jul 4 2022, 11:16 PM

Build is green

Patch application report for D8047 (id=29157)

Rebasing onto 79499ea596...

First, rewinding head to replay your work on top of it...
Applying: metadata_dictionary: Add mappings for composer.json
Using index info to reconstruct a base tree...
M	swh/indexer/codemeta.py
M	swh/indexer/metadata_dictionary/__init__.py
M	swh/indexer/tests/test_cli.py
Falling back to patching base and 3-way merge...
Auto-merging swh/indexer/metadata_dictionary/composer.py
CONFLICT (add/add): Merge conflict in swh/indexer/metadata_dictionary/composer.py
Patch failed at 0001 metadata_dictionary: Add mappings for composer.json

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Rebase failed (ret=1)!




Could not rebase; Attempt merge onto 79499ea596...



Already up to date.





Changes applied before test



commit fcd48a45a6305af70baff1d66de07d591a270929
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed Jun 29 16:25:28 2022 +0530

    metadata_dictionary: Add mappings for composer.json



See https://jenkins.softwareheritage.org/job/DCIDX/job/tests-on-diff/328/ for more details.
Harbormaster completed remote builds in B30247: Diff 29157.Jul 4 2022, 11:16 PM
vlorentz added a comment.Jul 4 2022, 11:16 PM
you already landed this diff, please open a new one
VickyMerzOwn added a comment.EditedJul 4 2022, 11:18 PM


In D8047#210030, @vlorentz wrote:


you already landed this diff, please open a new one





It is too little to open a new diff. Only one line is different between now and when it was landed.

Should I still do it?

Build is green now!
vlorentz added a comment.Jul 4 2022, 11:20 PM
yes. one diff = one commit, and this diff's commit is already in master
VickyMerzOwn updated this revision to Diff 29158.Jul 4 2022, 11:32 PM
Fixes build failures of D8047
VickyMerzOwn added a comment.Jul 4 2022, 11:34 PM
I'm sorry. I'll close this diff first.

The diff got updated without me specifying --update
VickyMerzOwn closed this revision.Jul 4 2022, 11:34 PM
vlorentz added a comment.Jul 4 2022, 11:35 PM
it's because your current commit is not on master but is in this diff, so Arcanist assumed you meant to update. Use --create to explicitly ask it to create a diff
VickyMerzOwn added a comment.Jul 4 2022, 11:37 PM


In D8047#210037, @vlorentz wrote:


it's because your current commit is not on master but is in this diff, so Arcanist assumed you meant to update. Use --create to explicitly ask it to create a diff





I'll keep this in mind, thank you. 

The new diff is D8078
swh-public-ci added a comment.Jul 4 2022, 11:38 PM
Build is green



Patch application report for D8047 (id=29158)



Rebasing onto 79499ea596...



Current branch diff-target is up to date.





Changes applied before test



commit ff2730c3f6e2514454ef2a8d17c077f860d34545
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Tue Jul 5 03:00:41 2022 +0530

    ComposerMapping: Adds SingleFileMapping as parent class



See https://jenkins.softwareheritage.org/job/DCIDX/job/tests-on-diff/329/ for more details.
Harbormaster completed remote builds in B30248: Diff 29158.Jul 4 2022, 11:38 PM
Revision Contents
Changeset List
PathSize
swh/
indexer/
1 line
data/
68 lines
metadata_dictionary/
3 lines
56 lines
tests/
metadata_dictionary/
84 lines
1 line
Diff 29142
View Options
swh/indexer/codemeta.py
Loading...
View Options
swh/indexer/data/composer.csv
Loading...
View Options
swh/indexer/metadata_dictionary/__init__.py
Loading...
View Options
swh/indexer/metadata_dictionary/composer.py
Loading...
View Options
swh/indexer/tests/metadata_dictionary/test_composer.py
Loading...
View Options
swh/indexer/tests/test_cli.py
Loading...
About · Developer information · Legal