Related to T3167
Details
- Reviewers
earthizflat - Group Reviewers
Reviewers - Maniphest Tasks
- T3167: Add a --version option to all the CLI commands
T2912: Next generation archive counters - Required Signatures
L3 Software Heritage Contributor License Agreement, version 1.0
Diff Detail
- Repository
- rDCNT Archive counters
- Branch
- version-cli-command-counters
- Lint
No Linters Available - Unit
No Unit Test Coverage - Build Status
Buildable 20185 Build 31335: Phabricator diff pipeline on jenkins Jenkins console · Jenkins Build 31334: arc lint + arc unit
Event Timeline
Build is green
Patch application report for D5326 (id=19094)
Rebasing onto 7dbe186b01...
First, rewinding head to replay your work on top of it... Applying: Add a --version option to all the CLI commands Using index info to reconstruct a base tree... M swh/counters/interface.py Falling back to patching base and 3-way merge... Auto-merging swh/counters/tests/test_server.py CONFLICT (add/add): Merge conflict in swh/counters/tests/test_server.py Auto-merging swh/counters/interface.py Auto-merging swh/counters/api/server.py CONFLICT (add/add): Merge conflict in swh/counters/api/server.py Patch failed at 0001 Add a --version option to all the CLI commands 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 7dbe186b01...
Already up to date.
Changes applied before test
commit b858559c7c5a5ad2e6d2bffce9e7b8b359a75561 Author: Vincent SELLIER <vincent.sellier@softwareheritage.org> Date: Mon Mar 15 17:50:41 2021 +0100 Add a --version option to all the CLI commands Related to T2912
See https://jenkins.softwareheritage.org/job/DCNT/job/tests-on-diff/15/ for more details.
Build is green
Patch application report for D5326 (id=19095)
Rebasing onto 7dbe186b01...
First, rewinding head to replay your work on top of it... Applying: Add a --version option to all the CLI commands Using index info to reconstruct a base tree... M swh/counters/interface.py Falling back to patching base and 3-way merge... Auto-merging swh/counters/interface.py
Changes applied before test
commit da3c1165f30e4e01bbb4ef39aad4707fc9e2cc40 Author: Vincent SELLIER <vincent.sellier@softwareheritage.org> Date: Mon Mar 15 17:50:41 2021 +0100 Add a --version option to all the CLI commands Related to T2912
See https://jenkins.softwareheritage.org/job/DCNT/job/tests-on-diff/16/ for more details.
Build is green
Patch application report for D5326 (id=19096)
Rebasing onto 7dbe186b01...
First, rewinding head to replay your work on top of it... Applying: Add a --version option to all the CLI commands
Changes applied before test
commit 7705230365f10fb911fe2e3564faadc145ae2407 Author: Vincent SELLIER <vincent.sellier@softwareheritage.org> Date: Mon Mar 15 17:50:41 2021 +0100 Add a --version option to all the CLI commands Related to T2912
See https://jenkins.softwareheritage.org/job/DCNT/job/tests-on-diff/17/ for more details.
And commit message too.
And there's an issue with the commit author name, you wrote Vincent SELLIER instead of your own name
Build is green
Patch application report for D5326 (id=19121)
Rebasing onto 7dbe186b01...
First, rewinding head to replay your work on top of it... Applying: Add a --version option to all the CLI commands
Changes applied before test
commit 56eab2bfecb5d2094db5c489ec6082f3f0bcba83 Author: Paulo Lima <paulojorgelima18@gmail.com> Date: Mon Mar 15 17:50:41 2021 +0100 Add a --version option to all the CLI commands Related to T2912
See https://jenkins.softwareheritage.org/job/DCNT/job/tests-on-diff/18/ for more details.
Build is green
Patch application report for D5326 (id=19122)
Rebasing onto 7dbe186b01...
First, rewinding head to replay your work on top of it... Applying: Version option to all cli commands
Changes applied before test
commit bb000b999efcb83ae7028891947f66b0191e0864 Author: Paulo Lima <paulojorgelima18@gmail.com> Date: Mon Mar 15 17:50:41 2021 +0100 Version option to all cli commands Related to T3167
See https://jenkins.softwareheritage.org/job/DCNT/job/tests-on-diff/19/ for more details.
Yes, indeed. @earthizflat, please add importlib-metadata to the requirements.txt file.
swh/counters/cli.py | ||
---|---|---|
22 | as well. |