Page MenuHomeSoftware Heritage

Update common configs from swh-py-template
AbandonedPublic

Authored by olasd on Thu, Sep 9, 10:30 AM.

Details

Summary

this found a missing swh.storage dependency

Test Plan

tox

Diff Detail

Repository
rDDATASET Datasets
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 23461
Build 36607: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 36606: arc lint + arc unit

Event Timeline

olasd requested review of this revision.Thu, Sep 9, 10:30 AM
olasd created this revision.
This revision is now accepted and ready to land.Thu, Sep 9, 10:36 AM

Build has FAILED

Patch application report for D6221 (id=22505)

Rebasing onto 671e8861a5...

First, rewinding head to replay your work on top of it...
Applying: Update common configs from swh-py-template
Using index info to reconstruct a base tree...
M	requirements-swh.txt
M	swh/__init__.py
Falling back to patching base and 3-way merge...
Auto-merging tox.ini
CONFLICT (add/add): Merge conflict in tox.ini
Patch failed at 0001 Update common configs from swh-py-template

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 671e8861a5...

Already up to date.
Changes applied before test
commit b28f7729f5b7086ac9bbb3959ff4311e32178251
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Sep 9 10:18:20 2021 +0200

    Update common configs from swh-py-template

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

Tests failed with 10:36:35 bash: line 1: pv: command not found. grmpf

Build is green

Patch application report for D6221 (id=22514)

Rebasing onto 671e8861a5...

First, rewinding head to replay your work on top of it...
Applying: Update common configs from swh-py-template
Using index info to reconstruct a base tree...
M	requirements-swh.txt
M	swh/__init__.py
Falling back to patching base and 3-way merge...
Auto-merging tox.ini
CONFLICT (add/add): Merge conflict in tox.ini
Patch failed at 0001 Update common configs from swh-py-template

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 671e8861a5...

Already up to date.
Changes applied before test
commit b28f7729f5b7086ac9bbb3959ff4311e32178251
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Sep 9 10:18:20 2021 +0200

    Update common configs from swh-py-template

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

olasd added subscribers: vlorentz, anlambert.

This was already done on the master branch by @vlorentz and @anlambert. D'oh.