Console Output
Skipping 81 KB..
Full Logxport tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- src/omero_zarr/raw_pixels.py
- .isort.cfg
--conflicts
2024-07-05 00:44:45,096 [ scc.config] DEBUG Found github.token
2024-07-05 00:44:45,097 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-07-05 00:44:45,097 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-07-05 00:44:45,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:44:45,108 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-07-05 00:44:45,122 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-07-05 00:44:45,123 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-07-05 00:44:45,123 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:44:45,127 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-07-05 00:44:45,127 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-07-05 00:44:45,127 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-07-05 00:44:45,127 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-07-05 00:44:45,127 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-07-05 00:44:45,127 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-07-05 00:44:45,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:44:45,482 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:44:45,524 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:44:45,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:44:45,531 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:44:45,573 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:44:45,583 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ee6df4c0> has no local changes
2024-07-05 00:44:45,583 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:44:45,594 [ scc.git] DEBUG [detached HEAD a5d6c9e] merge master -Dorg -Ssuccess-only
2024-07-05 00:44:45,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:44:45,595 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:44:45,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-07-05 00:44:46,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/575 HTTP/1.1" 200 None
2024-07-05 00:44:46,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568 HTTP/1.1" 200 None
2024-07-05 00:44:47,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568/comments HTTP/1.1" 200 None
2024-07-05 00:44:47,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-07-05 00:44:48,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:44:48,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:44:49,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-07-05 00:44:49,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:44:49,757 [ scc.repo] DEBUG - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-05 00:44:50,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-07-05 00:44:50,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-07-05 00:44:51,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-07-05 00:44:51,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:44:52,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:44:52,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-07-05 00:44:53,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:44:53,078 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-07-05 00:44:53,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-07-05 00:44:53,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549/comments HTTP/1.1" 200 None
2024-07-05 00:44:54,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-05 00:44:55,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:44:55,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:44:56,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-05 00:44:56,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:44:56,434 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-07-05 00:44:56,435 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:44:56,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-05 00:44:56,435 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:44:56,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:44:56,441 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:44:56,446 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:44:56,446 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:44:56,453 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:44:56,460 [ scc.git] DEBUG Already up to date.
2024-07-05 00:44:56,461 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-05 00:44:56,899 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-05 00:44:56,899 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-05 00:44:56,904 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-05 00:44:57,716 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-05 00:44:57,716 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-05 00:44:57,724 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-05 00:44:58,124 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-05 00:44:58,124 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-05 00:44:58,129 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:44:58,129 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:44:58,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:44:58,138 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-05 00:44:58,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:44:58,152 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-05 00:44:58,253 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:44:58,259 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-05 00:44:58,259 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-05 00:44:58,259 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-05 00:44:58,259 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-05 00:44:58,259 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-05 00:44:58,259 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-05 00:44:58,259 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-05 00:44:58,260 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-05 00:44:58,262 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-05 00:44:58,262 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-05 00:44:58,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:44:58,419 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-05 00:44:58,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:44:58,435 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-05 00:44:58,572 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-05 00:44:58,573 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-05 00:44:58,573 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-05 00:44:58,573 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:44:58,579 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-05 00:44:58,579 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-05 00:44:58,579 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-05 00:44:58,579 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-05 00:44:58,579 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-05 00:44:58,579 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-05 00:44:58,579 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-05 00:44:58,579 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-05 00:44:58,579 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-05 00:44:58,579 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-05 00:44:58,579 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-05 00:44:58,580 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-05 00:44:58,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:44:58,875 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-05 00:44:58,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:44:58,895 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-05 00:44:58,941 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:44:58,945 [ scc.git] DEBUG setup.py | 2 +-
2024-07-05 00:44:58,945 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-05 00:44:59,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:44:59,294 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:44:59,339 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:44:59,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:44:59,346 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:44:59,385 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:44:59,395 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ee6db430> has no local changes
2024-07-05 00:44:59,395 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 575 Tom-TBT 'Label sorting with drag and drop' (user: Tom-TBT)
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:44:59,407 [ scc.git] DEBUG [detached HEAD 0cf0a68f] merge master -Dorg -Ssuccess-only
2024-07-05 00:44:59,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:44:59,407 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:44:59,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-05 00:45:00,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-05 00:45:00,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-05 00:45:01,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-05 00:45:01,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:02,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-05 00:45:02,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:02,678 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-05 00:45:02,679 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:45:02,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-05 00:45:02,679 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:02,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:02,685 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:45:02,691 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:45:02,691 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:45:02,697 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:45:02,703 [ scc.git] DEBUG Already up to date.
2024-07-05 00:45:02,703 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-05 00:45:03,113 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-05 00:45:03,114 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-05 00:45:03,119 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:45:03,119 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:03,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:03,125 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-05 00:45:03,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:03,137 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-05 00:45:03,168 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-05 00:45:03,169 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:45:03,171 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-05 00:45:03,172 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-05 00:45:03,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:03,366 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:45:03,408 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:03,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:03,416 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:45:03,458 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:45:03,465 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ee718a60> has no local changes
2024-07-05 00:45:03,466 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:45:03,475 [ scc.git] DEBUG [detached HEAD fd39a80] merge master -Dorg -Ssuccess-only
2024-07-05 00:45:03,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:45:03,475 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:45:03,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-05 00:45:04,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-05 00:45:04,331 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-05 00:45:04,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-05 00:45:05,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:05,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:45:06,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-05 00:45:06,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:06,861 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-05 00:45:06,861 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:45:06,861 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-05 00:45:06,861 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:06,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:06,867 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:45:06,872 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:45:06,872 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:45:06,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:45:06,883 [ scc.git] DEBUG Already up to date.
2024-07-05 00:45:06,883 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-05 00:45:07,249 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-05 00:45:07,250 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-05 00:45:07,254 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:45:07,255 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:07,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:07,260 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-05 00:45:07,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:07,270 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-05 00:45:07,280 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:45:07,284 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-05 00:45:07,284 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-05 00:45:07,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:07,438 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:45:07,479 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:07,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:07,484 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:45:07,523 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:45:07,530 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec698fd0> has no local changes
2024-07-05 00:45:07,530 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:45:07,539 [ scc.git] DEBUG [detached HEAD be316bb] merge master -Dorg -Ssuccess-only
2024-07-05 00:45:07,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:45:07,540 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:45:08,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-05 00:45:08,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-05 00:45:08,580 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-05 00:45:09,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-05 00:45:09,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:10,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:45:10,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-05 00:45:11,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:11,258 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-05 00:45:11,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-05 00:45:11,721 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-05 00:45:12,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-05 00:45:12,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:13,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:45:13,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-05 00:45:14,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:14,275 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-05 00:45:14,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-05 00:45:15,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-05 00:45:15,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-05 00:45:16,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:16,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:45:17,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-05 00:45:17,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:17,598 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-05 00:45:18,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-05 00:45:18,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-05 00:45:19,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-05 00:45:19,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:20,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:45:20,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-05 00:45:21,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:21,202 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-05 00:45:21,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-05 00:45:22,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-05 00:45:22,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-05 00:45:23,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:23,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-05 00:45:24,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:24,031 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-05 00:45:24,032 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:45:24,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-05 00:45:24,032 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:24,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:24,043 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:45:24,051 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:45:24,052 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:45:24,060 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:45:24,067 [ scc.git] DEBUG Already up to date.
2024-07-05 00:45:24,068 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-05 00:45:24,779 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-05 00:45:24,780 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-05 00:45:24,788 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-05 00:45:25,805 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-05 00:45:25,807 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-05 00:45:25,817 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-05 00:45:26,261 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-05 00:45:26,262 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-05 00:45:26,270 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-05 00:45:26,769 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-05 00:45:26,770 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-05 00:45:26,777 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-05 00:45:27,148 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-05 00:45:27,148 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-05 00:45:27,158 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:45:27,159 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:27,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:27,172 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-05 00:45:27,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:27,201 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-05 00:45:27,261 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-05 00:45:27,263 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:45:27,268 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-05 00:45:27,268 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-05 00:45:27,268 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-05 00:45:27,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:27,452 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-05 00:45:27,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:27,466 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-05 00:45:27,573 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-05 00:45:27,574 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-05 00:45:27,574 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-05 00:45:27,574 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-05 00:45:27,575 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:45:27,580 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-05 00:45:27,580 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-05 00:45:27,580 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-05 00:45:27,580 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-05 00:45:27,580 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-05 00:45:27,580 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-05 00:45:27,580 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-05 00:45:27,580 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-05 00:45:27,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:27,868 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-05 00:45:27,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:27,882 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-05 00:45:27,968 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-05 00:45:27,970 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:45:27,975 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-05 00:45:27,975 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-05 00:45:27,975 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-05 00:45:28,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:28,302 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-05 00:45:28,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:28,367 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-05 00:45:28,420 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:45:28,430 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-05 00:45:28,430 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-05 00:45:28,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:28,714 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-05 00:45:28,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:28,746 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-05 00:45:28,816 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-05 00:45:28,817 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:45:29,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:29,115 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:45:29,156 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:29,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:29,163 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:45:29,224 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:45:29,237 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ee716bb0> has no local changes
2024-07-05 00:45:29,237 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:45:29,250 [ scc.git] DEBUG [detached HEAD 44b01e6] merge master -Dorg -Ssuccess-only
2024-07-05 00:45:29,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:45:29,251 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:45:29,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-05 00:45:30,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-05 00:45:30,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-05 00:45:31,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-05 00:45:31,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:32,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:45:32,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-05 00:45:32,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:32,998 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-05 00:45:32,999 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:45:32,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-05 00:45:32,999 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:33,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:33,015 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:45:33,028 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:45:33,029 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:45:33,041 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:45:33,055 [ scc.git] DEBUG Already up to date.
2024-07-05 00:45:33,056 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-05 00:45:33,435 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-05 00:45:33,435 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-05 00:45:33,444 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:45:33,444 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:33,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:33,455 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-05 00:45:33,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:33,490 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-05 00:45:33,516 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:45:33,521 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-05 00:45:33,521 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-05 00:45:33,521 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-05 00:45:33,521 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-05 00:45:33,521 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-05 00:45:33,522 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-05 00:45:33,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:33,699 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:45:33,780 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:33,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:33,791 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:45:33,861 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:45:33,873 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec651610> has no local changes
2024-07-05 00:45:33,874 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:45:33,888 [ scc.git] DEBUG [detached HEAD 7090dfe] merge master -Dorg -Ssuccess-only
2024-07-05 00:45:33,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:45:33,890 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:45:34,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-05 00:45:34,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-05 00:45:35,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-05 00:45:35,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-05 00:45:36,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:36,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-05 00:45:37,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:37,107 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-05 00:45:37,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-05 00:45:38,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-05 00:45:38,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-05 00:45:39,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:39,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-05 00:45:40,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:40,010 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-05 00:45:40,010 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:45:40,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-05 00:45:40,010 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:40,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:40,019 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:45:40,028 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:45:40,029 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:45:40,040 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:45:40,053 [ scc.git] DEBUG Already up to date.
2024-07-05 00:45:40,056 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-05 00:45:40,641 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-05 00:45:40,641 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-05 00:45:40,649 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-05 00:45:41,314 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-05 00:45:41,314 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-05 00:45:41,323 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:45:41,324 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:41,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:41,335 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-05 00:45:41,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:41,361 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-05 00:45:41,472 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-05 00:45:41,473 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-05 00:45:41,473 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-05 00:45:41,473 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-05 00:45:41,473 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-05 00:45:41,474 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-05 00:45:41,486 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-05 00:45:41,498 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-05 00:45:41,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:41,668 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-05 00:45:41,682 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-05 00:45:41,693 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#116](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-07-05 00:45:41,700 [ scc.config] DEBUG Found github.token
2024-07-05 00:45:41,700 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-05 00:45:41,700 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-05 00:45:41,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:41,719 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-05 00:45:41,744 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-05 00:45:41,745 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-05 00:45:41,745 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-05 00:45:41,745 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-05 00:45:41,746 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-05 00:45:41,755 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-05 00:45:41,766 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-05 00:45:42,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:42,085 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-05 00:45:42,097 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-05 00:45:42,106 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#116](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-07-05 00:45:42,116 [ scc.config] DEBUG Found github.token
2024-07-05 00:45:42,116 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-05 00:45:42,116 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:45:42,188 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:42,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:42,196 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:45:42,282 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:45:42,297 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec6518b0> has no local changes
2024-07-05 00:45:42,297 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:45:42,316 [ scc.git] DEBUG [detached HEAD 4706c66] merge master -Dorg -Ssuccess-only
2024-07-05 00:45:42,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:45:42,318 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:45:42,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-05 00:45:43,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-05 00:45:43,090 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-05 00:45:43,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-05 00:45:44,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:44,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:45:45,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-05 00:45:45,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:45,580 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-05 00:45:46,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-05 00:45:46,127 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-05 00:45:46,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-05 00:45:47,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:47,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:45:48,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-05 00:45:48,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:48,697 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-05 00:45:49,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-05 00:45:49,158 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-05 00:45:49,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-05 00:45:50,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:50,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:45:51,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-05 00:45:51,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:51,587 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-05 00:45:52,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-05 00:45:52,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-05 00:45:52,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-05 00:45:53,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-05 00:45:53,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-05 00:45:54,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-05 00:45:54,422 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:45:54,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-05 00:45:54,422 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:54,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:54,429 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:45:54,437 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:45:54,437 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:45:54,444 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:45:54,451 [ scc.git] DEBUG Already up to date.
2024-07-05 00:45:54,451 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-05 00:45:54,843 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-05 00:45:54,843 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-05 00:45:54,848 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-05 00:45:55,241 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-05 00:45:55,241 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-05 00:45:55,246 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-05 00:45:55,635 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-05 00:45:55,635 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-05 00:45:55,640 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:45:55,640 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:55,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:55,646 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-05 00:45:55,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:55,656 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-05 00:45:55,667 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:45:55,670 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-05 00:45:55,670 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-05 00:45:55,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:55,837 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-05 00:45:55,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:55,849 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-05 00:45:55,901 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-05 00:45:55,902 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:45:55,905 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-05 00:45:55,905 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-05 00:45:56,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:56,250 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-05 00:45:56,256 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:56,261 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-05 00:45:56,288 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-05 00:45:56,289 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:45:56,294 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-05 00:45:56,294 [ scc.git] DEBUG package.json | 2 +-
2024-07-05 00:45:56,294 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-05 00:45:56,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:45:56,653 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:45:56,695 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:56,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:56,701 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:45:56,740 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:45:56,748 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec651670> has no local changes
2024-07-05 00:45:56,749 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:45:56,759 [ scc.git] DEBUG [detached HEAD c62116a] merge master -Dorg -Ssuccess-only
2024-07-05 00:45:56,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:45:56,759 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:45:57,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-05 00:45:57,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-05 00:45:58,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-05 00:45:58,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:45:59,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-05 00:45:59,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:45:59,553 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-05 00:45:59,553 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:45:59,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-05 00:45:59,553 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:59,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:59,560 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:45:59,564 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:45:59,565 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:45:59,570 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:45:59,575 [ scc.git] DEBUG Already up to date.
2024-07-05 00:45:59,576 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-05 00:45:59,978 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-05 00:45:59,978 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-05 00:45:59,985 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:45:59,985 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:45:59,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:45:59,993 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-05 00:46:00,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:00,008 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-05 00:46:00,022 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:46:00,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:00,190 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:46:00,232 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:00,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:00,240 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:00,283 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:00,290 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ee6d5a30> has no local changes
2024-07-05 00:46:00,291 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:00,300 [ scc.git] DEBUG [detached HEAD 27dad8a] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:00,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:00,301 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:46:00,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-05 00:46:01,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-05 00:46:01,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-05 00:46:02,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-05 00:46:02,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-05 00:46:03,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:46:03,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-05 00:46:04,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:46:04,130 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-05 00:46:04,130 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:46:04,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-05 00:46:04,130 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:04,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:04,136 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:46:04,141 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:46:04,141 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:46:04,147 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:46:04,152 [ scc.git] DEBUG Already up to date.
2024-07-05 00:46:04,152 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-05 00:46:04,605 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-05 00:46:04,605 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-05 00:46:04,610 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:46:04,610 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:04,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:04,617 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-05 00:46:04,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:04,632 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-05 00:46:04,645 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-05 00:46:04,646 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:46:04,649 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-05 00:46:04,649 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-05 00:46:04,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:04,813 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:46:04,860 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:04,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:04,866 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:04,908 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:04,917 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec662b80> has no local changes
2024-07-05 00:46:04,918 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:04,931 [ scc.git] DEBUG [detached HEAD 49a70e9] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:04,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:04,932 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:46:05,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-05 00:46:05,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-05 00:46:06,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-05 00:46:06,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-05 00:46:07,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:46:07,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-05 00:46:08,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:46:08,201 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-05 00:46:08,201 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:46:08,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-05 00:46:08,202 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:08,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:08,208 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:46:08,214 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:46:08,214 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:46:08,221 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:46:08,228 [ scc.git] DEBUG Already up to date.
2024-07-05 00:46:08,228 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-05 00:46:08,660 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-05 00:46:08,660 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-05 00:46:08,666 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:46:08,666 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:08,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:08,672 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-05 00:46:08,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:08,686 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-05 00:46:08,719 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-05 00:46:08,720 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-05 00:46:08,720 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-05 00:46:08,720 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-05 00:46:08,720 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-05 00:46:08,720 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-05 00:46:08,720 [ scc.git] DEBUG Auto-merging setup.py
2024-07-05 00:46:08,720 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-05 00:46:08,720 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-05 00:46:08,720 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-05 00:46:08,727 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-05 00:46:08,735 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-05 00:46:08,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:08,897 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-05 00:46:08,905 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-05 00:46:08,913 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#116](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2024-07-05 00:46:08,918 [ scc.config] DEBUG Found github.token
2024-07-05 00:46:08,919 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-05 00:46:08,919 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:46:08,959 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:08,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:08,965 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:09,008 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:09,016 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec6bcf40> has no local changes
2024-07-05 00:46:09,016 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:09,026 [ scc.git] DEBUG [detached HEAD e0dc642] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:09,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:09,026 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:46:09,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-05 00:46:09,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-05 00:46:10,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-05 00:46:10,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-05 00:46:11,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:46:11,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-05 00:46:12,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:46:12,172 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-05 00:46:12,172 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:46:12,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-05 00:46:12,172 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:12,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:12,178 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:46:12,183 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:46:12,183 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:46:12,190 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:46:12,196 [ scc.git] DEBUG Already up to date.
2024-07-05 00:46:12,196 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-05 00:46:12,665 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-05 00:46:12,665 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-05 00:46:12,670 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:46:12,670 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:12,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:12,675 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-05 00:46:12,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:12,688 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-07-05 00:46:12,701 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-05 00:46:12,704 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-05 00:46:12,704 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-05 00:46:12,704 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-05 00:46:12,704 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-05 00:46:12,705 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-05 00:46:12,705 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-05 00:46:12,705 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-05 00:46:12,705 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-05 00:46:12,707 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-05 00:46:12,707 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-05 00:46:12,707 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-05 00:46:12,707 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-05 00:46:12,707 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-05 00:46:12,707 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-05 00:46:12,707 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-05 00:46:12,708 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-05 00:46:12,708 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-05 00:46:12,708 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-05 00:46:12,708 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-05 00:46:12,708 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-05 00:46:12,708 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-05 00:46:12,708 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-05 00:46:12,708 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-05 00:46:12,708 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-05 00:46:12,708 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-05 00:46:12,708 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-05 00:46:12,708 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-05 00:46:12,708 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-05 00:46:12,708 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-05 00:46:12,708 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-05 00:46:12,708 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-05 00:46:12,708 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-05 00:46:12,709 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-05 00:46:12,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:12,867 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:46:12,920 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:12,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:12,929 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:12,971 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:12,982 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec668700> has no local changes
2024-07-05 00:46:12,983 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:12,994 [ scc.git] DEBUG [detached HEAD 5b12670] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:12,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:12,995 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:46:13,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-05 00:46:13,284 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:46:13,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-05 00:46:13,284 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:13,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:13,291 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:46:13,297 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:46:13,298 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:46:13,304 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:46:13,310 [ scc.git] DEBUG Already up to date.
2024-07-05 00:46:13,310 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:46:13,310 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:13,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:13,317 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:46:13,363 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:13,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:13,371 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:13,415 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:13,423 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec64ee50> has no local changes
2024-07-05 00:46:13,423 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-upload
Already up to date.
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:13,433 [ scc.git] DEBUG [detached HEAD 195ba14] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:13,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:13,434 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:46:13,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-05 00:46:13,709 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:46:13,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-05 00:46:13,709 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:13,709 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:13,716 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:46:13,722 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:46:13,722 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:46:13,730 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:46:13,737 [ scc.git] DEBUG Already up to date.
2024-07-05 00:46:13,737 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:46:13,737 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:13,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:13,744 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:46:13,792 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:13,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:13,800 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:13,846 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:13,855 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec62c4f0> has no local changes
2024-07-05 00:46:13,855 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:13,866 [ scc.git] DEBUG [detached HEAD b9c03ec] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:13,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:13,867 [ scc.git] INFO Overriding base-branch from master to main
2024-07-05 00:46:13,867 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:46:14,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-05 00:46:14,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-05 00:46:15,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-05 00:46:15,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-05 00:46:16,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-05 00:46:16,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:46:17,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-05 00:46:17,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-05 00:46:18,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:46:18,003 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-05 00:46:18,004 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:46:18,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-05 00:46:18,004 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:18,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:18,011 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-05 00:46:18,024 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:46:18,025 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-05 00:46:18,039 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-05 00:46:18,049 [ scc.git] DEBUG Already up to date.
2024-07-05 00:46:18,049 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-05 00:46:18,477 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-05 00:46:18,478 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-05 00:46:18,483 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:46:18,483 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:18,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:18,491 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-05 00:46:18,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:18,504 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-05 00:46:18,538 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-05 00:46:18,538 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-05 00:46:18,538 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-05 00:46:18,539 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-05 00:46:18,550 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-05 00:46:18,562 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-05 00:46:18,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:18,753 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-05 00:46:18,766 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-05 00:46:18,777 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#116](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-05 00:46:18,786 [ scc.config] DEBUG Found github.token
2024-07-05 00:46:18,786 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-05 00:46:18,787 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:46:18,848 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:18,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:18,858 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:18,918 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:18,928 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec5db4f0> has no local changes
2024-07-05 00:46:18,929 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:18,946 [ scc.git] DEBUG [detached HEAD 81143a6] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:18,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:18,947 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:46:19,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-05 00:46:19,199 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:46:19,199 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-05 00:46:19,199 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:19,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:19,208 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:46:19,217 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:46:19,217 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:46:19,226 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:46:19,234 [ scc.git] DEBUG Already up to date.
2024-07-05 00:46:19,234 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:46:19,234 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:19,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:19,241 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:46:19,287 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:19,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:19,294 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:19,340 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:19,347 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec63cf40> has no local changes
2024-07-05 00:46:19,348 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Already up to date.
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:19,358 [ scc.git] DEBUG [detached HEAD 0719e40] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:19,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:19,358 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:46:19,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-05 00:46:19,627 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:46:19,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-05 00:46:19,627 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:19,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:19,635 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:46:19,641 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:46:19,641 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:46:19,647 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:46:19,655 [ scc.git] DEBUG Already up to date.
2024-07-05 00:46:19,655 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:46:19,655 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:19,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:19,661 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:46:19,709 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:19,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:19,718 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:19,761 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:19,772 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec605700> has no local changes
2024-07-05 00:46:19,773 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-webtest
Already up to date.
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:19,783 [ scc.git] DEBUG [detached HEAD fdee7f8] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:19,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:19,784 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:46:20,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-05 00:46:20,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-05 00:46:21,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-05 00:46:21,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-05 00:46:22,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:46:22,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-05 00:46:22,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:46:22,881 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-05 00:46:22,881 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:46:22,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-05 00:46:22,881 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:22,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:22,888 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-05 00:46:22,894 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:46:22,894 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-05 00:46:22,901 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-05 00:46:22,911 [ scc.git] DEBUG Already up to date.
2024-07-05 00:46:22,911 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-05 00:46:23,315 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-05 00:46:23,316 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-05 00:46:23,321 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:46:23,321 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:23,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:23,328 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-05 00:46:23,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:23,343 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-05 00:46:23,356 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-05 00:46:23,357 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-05 00:46:23,357 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-05 00:46:23,357 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-05 00:46:23,365 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-05 00:46:23,376 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-05 00:46:23,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:23,539 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-05 00:46:23,546 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-05 00:46:23,555 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#116](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-05 00:46:23,562 [ scc.config] DEBUG Found github.token
2024-07-05 00:46:23,562 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-05 00:46:23,563 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:46:23,616 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:23,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:23,625 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:23,679 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:23,691 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec596df0> has no local changes
2024-07-05 00:46:23,692 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:23,707 [ scc.git] DEBUG [detached HEAD ae0f26a] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:23,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:23,708 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-05 00:46:23,708 [ scc.repo] DEBUG ## PRs found:
2024-07-05 00:46:24,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-05 00:46:24,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-05 00:46:25,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-05 00:46:25,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-05 00:46:26,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-05 00:46:26,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-05 00:46:27,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-05 00:46:27,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-05 00:46:27,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-05 00:46:28,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-05 00:46:28,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-05 00:46:28,764 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-05 00:46:29,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-05 00:46:29,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-05 00:46:30,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-05 00:46:30,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-05 00:46:30,777 [ scc.repo] DEBUG ## Branches found:
2024-07-05 00:46:30,778 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-05 00:46:30,778 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:30,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:30,784 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-05 00:46:30,790 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-05 00:46:30,790 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-05 00:46:30,801 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-05 00:46:30,811 [ scc.git] DEBUG Already up to date.
2024-07-05 00:46:30,811 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-05 00:46:31,241 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-05 00:46:31,241 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-05 00:46:31,245 [ scc.git] DEBUG ## Unique users: []
2024-07-05 00:46:31,246 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:31,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:31,252 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-05 00:46:31,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:31,266 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-05 00:46:31,277 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-05 00:46:31,278 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-05 00:46:31,278 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-05 00:46:31,278 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-05 00:46:31,284 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-05 00:46:31,292 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-05 00:46:31,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:31,469 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-05 00:46:31,477 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-05 00:46:31,483 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#116](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-05 00:46:31,489 [ scc.config] DEBUG Found github.token
2024-07-05 00:46:31,489 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-05 00:46:31,489 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-05 00:46:31,531 [ scc.git] DEBUG Get sha1 of %s
2024-07-05 00:46:31,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-05 00:46:31,537 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:31,579 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:31,587 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ec5f3ee0> has no local changes
2024-07-05 00:46:31,587 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:31,598 [ scc.git] DEBUG [detached HEAD 4fcec75] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:31,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:31,598 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-05 00:46:31,686 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-05 00:46:31,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:31,885 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-05 00:46:31,890 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-05 00:46:32,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:32,303 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-05 00:46:32,309 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-05 00:46:32,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:32,726 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-05 00:46:32,732 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-05 00:46:33,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:33,148 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-05 00:46:33,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:33,561 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-05 00:46:33,567 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-05 00:46:33,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:33,973 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-05 00:46:33,979 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-05 00:46:34,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:34,389 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-05 00:46:34,395 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-05 00:46:34,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:34,801 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-05 00:46:34,807 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-05 00:46:35,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:35,216 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-05 00:46:35,224 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-05 00:46:35,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:35,622 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-05 00:46:35,628 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-05 00:46:36,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:36,023 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-05 00:46:36,029 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-05 00:46:36,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:36,436 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-05 00:46:36,445 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-05 00:46:36,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:36,851 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-05 00:46:37,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:37,261 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-05 00:46:37,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:37,674 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-05 00:46:37,681 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-05 00:46:38,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:38,108 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-05 00:46:38,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:38,524 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-05 00:46:38,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:38,928 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-05 00:46:38,936 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-05 00:46:39,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:39,351 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-05 00:46:39,358 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-05 00:46:39,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:39,770 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-05 00:46:39,776 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-05 00:46:40,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:40,180 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-05 00:46:40,186 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-05 00:46:40,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-05 00:46:40,598 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-05 00:46:40,598 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-05 00:46:40,685 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3ef7fad60> has local changes
2024-07-05 00:46:40,686 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 575 Tom-TBT 'Label sorting with drag and drop' (user: Tom-TBT)
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#116 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/116/)'
2024-07-05 00:46:40,703 [ scc.git] DEBUG [detached HEAD 2229f5c] merge master -Dorg -Ssuccess-only
2024-07-05 00:46:40,704 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-05 00:46:40,704 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-05 00:46:40,704 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,704 [ scc.merge] INFO
2024-07-05 00:46:40,704 [ scc.merge] INFO
2024-07-05 00:46:40,704 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-05 00:46:40,704 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,704 [ scc.merge] INFO
2024-07-05 00:46:40,704 [ scc.merge] INFO
2024-07-05 00:46:40,704 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-05 00:46:40,704 [ scc.merge] INFO Excluded PRs:
2024-07-05 00:46:40,704 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-05 00:46:40,704 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,704 [ scc.merge] INFO
2024-07-05 00:46:40,705 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-05 00:46:40,705 [ scc.merge] INFO
2024-07-05 00:46:40,705 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-05 00:46:40,705 [ scc.merge] INFO Excluded PRs:
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-05 00:46:40,705 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,705 [ scc.merge] INFO
2024-07-05 00:46:40,705 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-05 00:46:40,705 [ scc.merge] INFO
2024-07-05 00:46:40,705 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-05 00:46:40,705 [ scc.merge] INFO Excluded PRs:
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-05 00:46:40,705 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,705 [ scc.merge] INFO
2024-07-05 00:46:40,705 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-05 00:46:40,705 [ scc.merge] INFO
2024-07-05 00:46:40,705 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-05 00:46:40,705 [ scc.merge] INFO
2024-07-05 00:46:40,705 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-05 00:46:40,705 [ scc.merge] INFO Excluded PRs:
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 575 Tom-TBT 'Label sorting with drag and drop' (user: Tom-TBT)
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-05 00:46:40,705 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,705 [ scc.merge] INFO
2024-07-05 00:46:40,705 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-05 00:46:40,705 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-05 00:46:40,706 [ scc.merge] INFO
2024-07-05 00:46:40,706 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-05 00:46:40,706 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,706 [ scc.merge] INFO
2024-07-05 00:46:40,706 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-05 00:46:40,706 [ scc.merge] INFO
2024-07-05 00:46:40,706 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-05 00:46:40,706 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,706 [ scc.merge] INFO
2024-07-05 00:46:40,706 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-05 00:46:40,706 [ scc.merge] INFO
2024-07-05 00:46:40,706 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-05 00:46:40,706 [ scc.merge] INFO Excluded PRs:
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-05 00:46:40,706 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,706 [ scc.merge] INFO
2024-07-05 00:46:40,706 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-05 00:46:40,706 [ scc.merge] INFO
2024-07-05 00:46:40,706 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-05 00:46:40,706 [ scc.merge] INFO Excluded PRs:
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-05 00:46:40,706 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,706 [ scc.merge] INFO
2024-07-05 00:46:40,706 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,706 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-05 00:46:40,706 [ scc.merge] INFO
2024-07-05 00:46:40,706 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-05 00:46:40,707 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,707 [ scc.merge] INFO
2024-07-05 00:46:40,707 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-05 00:46:40,707 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-05 00:46:40,707 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-05 00:46:40,707 [ scc.merge] INFO
2024-07-05 00:46:40,707 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-05 00:46:40,707 [ scc.merge] INFO Excluded PRs:
2024-07-05 00:46:40,707 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-05 00:46:40,707 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-05 00:46:40,707 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-05 00:46:40,707 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,707 [ scc.merge] INFO
2024-07-05 00:46:40,707 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,707 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-05 00:46:40,707 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-05 00:46:40,707 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-05 00:46:40,707 [ scc.merge] INFO
2024-07-05 00:46:40,707 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-05 00:46:40,707 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,707 [ scc.merge] INFO
2024-07-05 00:46:40,707 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,707 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-05 00:46:40,707 [ scc.merge] INFO
2024-07-05 00:46:40,707 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-05 00:46:40,707 [ scc.merge] INFO Excluded PRs:
2024-07-05 00:46:40,707 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-05 00:46:40,707 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,707 [ scc.merge] INFO
2024-07-05 00:46:40,707 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,707 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-05 00:46:40,707 [ scc.merge] INFO
2024-07-05 00:46:40,707 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-05 00:46:40,707 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,707 [ scc.merge] INFO
2024-07-05 00:46:40,707 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-05 00:46:40,708 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-05 00:46:40,708 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO Merged PRs:
2024-07-05 00:46:40,708 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-05 00:46:40,708 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-05 00:46:40,708 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-05 00:46:40,708 [ scc.merge] INFO Excluded PRs:
2024-07-05 00:46:40,708 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-05 00:46:40,708 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-05 00:46:40,708 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-05 00:46:40,708 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-05 00:46:40,708 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-05 00:46:40,708 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,708 [ scc.merge] INFO
2024-07-05 00:46:40,708 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-05 00:46:40,708 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-05 00:46:40,709 [ scc.merge] INFO
2024-07-05 00:46:40,709 [ scc.merge] INFO Repository: ome/scripts
2024-07-05 00:46:40,709 [ scc.merge] INFO Excluded PRs:
2024-07-05 00:46:40,709 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-05 00:46:40,709 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-05 00:46:40,709 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-05 00:46:40,709 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-05 00:46:40,709 [ scc.merge] INFO Already up to date.
2024-07-05 00:46:40,709 [ scc.merge] INFO
2024-07-05 00:46:40,709 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-05 00:46:40,709 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-05 00:46:40,709 [ scc.merge] INFO
2024-07-05 00:46:40,709 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-05 00:46:40,709 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-05 00:46:40,716 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,723 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-05 00:46:40,724 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-05 00:46:40,731 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-05 00:46:40,739 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-05 00:46:40,748 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-05 00:46:40,754 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-05 00:46:40,762 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-05 00:46:40,770 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,778 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-05 00:46:40,778 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,785 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,785 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-05 00:46:40,785 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-05 00:46:40,794 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-05 00:46:40,801 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-05 00:46:40,808 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-05 00:46:40,815 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-05 00:46:40,823 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-05 00:46:40,832 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-05 00:46:40,841 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-05 00:46:40,850 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-05 00:46:40,858 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-05 00:46:40,863 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-05 00:46:40,868 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-05 00:46:40,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-05 00:46:40,882 [ scc.git] DEBUG Calling 'git remote'
2024-07-05 00:46:40,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.1 to 5.9.2-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 06fe94a] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 64566080
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from c20d273
nothing to commit, working tree clean
[detached HEAD 46db43f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-07-05 00:47:29,929 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-07-05 00:47:38,978 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-07-05 00:47:41,312 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-05 00:47:45,896 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-05 00:48:35,846 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
