Skipping 134 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-26 00:44:51,908 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-26 00:44:51,908 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-26 00:44:51,908 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-26 00:44:51,908 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-26 00:44:51,908 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-26 00:44:51,908 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-26 00:44:51,908 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-26 00:44:51,908 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-26 00:44:51,908 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-26 00:44:51,908 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-26 00:44:51,908 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-26 00:44:51,908 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-26 00:44:51,909 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-26 00:44:51,909 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-26 00:44:51,909 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-26 00:44:51,909 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-26 00:44:51,909 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-26 00:44:51,909 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-26 00:44:51,909 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-26 00:44:51,909 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-26 00:44:51,909 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-26 00:44:51,909 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-26 00:44:51,909 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-26 00:44:51,909 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-26 00:44:51,909 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-26 00:44:52,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:44:52,076 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7d25b9fb49959ba7f143c70927573efb62c9667e'
2024-04-26 00:44:52,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:44:52,094 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 553 (Figure_To_Pdf: use max plane size to select the appropriate zoom level) 7d25b9fb49959ba7f143c70927573efb62c9667e'
2024-04-26 00:44:52,154 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:44:52,158 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-26 00:44:52,159 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-26 00:44:52,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:44:52,484 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-26 00:44:52,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:44:52,503 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-26 00:44:52,542 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:44:52,545 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-04-26 00:44:52,545 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-26 00:44:52,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:44:52,910 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...82f12dc78b15d251eadaf4ff5cb06371ee8eaa84'
2024-04-26 00:44:52,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:44:52,922 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 82f12dc78b15d251eadaf4ff5cb06371ee8eaa84'
2024-04-26 00:44:52,937 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:44:52,941 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-04-26 00:44:52,941 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-04-26 00:44:52,942 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-04-26 00:44:52,942 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 479 ++++++++++++++++++++++-
2024-04-26 00:44:52,942 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-04-26 00:44:52,942 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-04-26 00:44:52,942 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-04-26 00:44:52,942 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-04-26 00:44:52,942 [ scc.git] DEBUG 8 files changed, 501 insertions(+), 7 deletions(-)
2024-04-26 00:44:52,942 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-04-26 00:44:53,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:44:53,326 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:44:53,366 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:44:53,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:44:53,373 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:44:53,410 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:44:53,419 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a6b69be0> has no local changes
2024-04-26 00:44:53,419 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
Generated by OMERO-plugins-push#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:44:53,430 [ scc.git] DEBUG [detached HEAD 5805474f] merge master -Dorg -Ssuccess-only
2024-04-26 00:44:53,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:44:53,430 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:44:53,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-26 00:44:54,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-26 00:44:54,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-26 00:44:55,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-26 00:44:55,726 [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-04-26 00:44:56,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-26 00:44:56,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:44:56,655 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-26 00:44:56,655 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:44:56,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-26 00:44:56,655 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:44:56,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:44:56,662 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:44:56,668 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:44:56,668 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:44:56,675 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:44:56,682 [ scc.git] DEBUG Already up to date.
2024-04-26 00:44:56,682 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-26 00:44:57,053 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-26 00:44:57,053 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-26 00:44:57,058 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:44:57,058 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:44:57,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:44:57,063 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-26 00:44:57,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:44:57,073 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-26 00:44:57,106 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-26 00:44:57,107 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:44:57,109 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-26 00:44:57,109 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-26 00:44:57,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:44:57,268 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:44:57,309 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:44:57,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:44:57,315 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:44:57,359 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:44:57,367 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a6b38550> has no local changes
2024-04-26 00:44:57,367 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:44:57,376 [ scc.git] DEBUG [detached HEAD 78e1670] merge master -Dorg -Ssuccess-only
2024-04-26 00:44:57,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:44:57,377 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:44:57,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-26 00:44:58,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-26 00:44:58,211 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-26 00:44:58,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-26 00:44:59,263 [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-04-26 00:44:59,770 [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-04-26 00:45:00,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-26 00:45:00,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:00,667 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-26 00:45:00,667 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:45:00,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-26 00:45:00,668 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:00,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:00,674 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:45:00,679 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:45:00,680 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:45:00,685 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:45:00,691 [ scc.git] DEBUG Already up to date.
2024-04-26 00:45:00,692 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-26 00:45:01,081 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-26 00:45:01,081 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-26 00:45:01,087 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:45:01,087 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:01,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:01,092 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-26 00:45:01,098 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:01,103 [ 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-04-26 00:45:01,115 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:01,119 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-26 00:45:01,119 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-26 00:45:01,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:01,272 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:45:01,315 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:01,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:01,320 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:45:01,362 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:45:01,370 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a6b2b9d0> has no local changes
2024-04-26 00:45:01,370 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:45:01,380 [ scc.git] DEBUG [detached HEAD 0af40f4] merge master -Dorg -Ssuccess-only
2024-04-26 00:45:01,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:45:01,380 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:45:01,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-26 00:45:02,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474 HTTP/1.1" 200 None
2024-04-26 00:45:02,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1 HTTP/1.1" 200 None
2024-04-26 00:45:03,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 00:45:03,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 00:45:04,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1 HTTP/1.1" 200 None
2024-04-26 00:45:04,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/fb31a249bfe16120da3403c6e450afad9f8db7e1?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:04,763 [ scc.repo] DEBUG - PR 474 will-moore 'Img data error handling'
2024-04-26 00:45:05,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-04-26 00:45:05,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-04-26 00:45:06,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-26 00:45:06,676 [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-04-26 00:45:07,188 [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-04-26 00:45:07,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-26 00:45:08,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:08,126 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-26 00:45:08,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-26 00:45:09,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-26 00:45:09,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-26 00:45:10,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 00:45:10,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 00:45:11,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-26 00:45:11,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:11,543 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-26 00:45:11,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-26 00:45:12,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-26 00:45:13,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 00:45:13,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 00:45:13,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-26 00:45:14,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:14,336 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-26 00:45:14,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-26 00:45:15,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-26 00:45:15,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-26 00:45:16,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 00:45:16,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 00:45:17,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-26 00:45:17,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:17,710 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-26 00:45:18,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-26 00:45:18,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-26 00:45:19,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-26 00:45:19,529 [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-04-26 00:45:20,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-26 00:45:20,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:20,443 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-26 00:45:20,443 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:45:20,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-26 00:45:20,444 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:20,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:20,449 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:45:20,455 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:45:20,455 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:45:20,461 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:45:20,467 [ scc.git] DEBUG Already up to date.
2024-04-26 00:45:20,467 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-26 00:45:20,967 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 00:45:20,968 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-26 00:45:20,973 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-26 00:45:22,584 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 00:45:22,584 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-26 00:45:22,589 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-26 00:45:23,080 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 00:45:23,080 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-26 00:45:23,085 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-26 00:45:24,098 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 00:45:24,099 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-26 00:45:24,105 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-04-26 00:45:24,582 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 00:45:24,582 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-04-26 00:45:24,587 [ scc.git] DEBUG Calling 'git fetch origin pull/474/head'
2024-04-26 00:45:25,064 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 00:45:25,064 [ scc.git] DEBUG * branch refs/pull/474/head -> FETCH_HEAD
2024-04-26 00:45:25,069 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:45:25,069 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:25,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:25,075 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-26 00:45:25,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:25,086 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-26 00:45:25,111 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:25,114 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-26 00:45:25,114 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-26 00:45:25,114 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-26 00:45:25,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:25,286 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-26 00:45:25,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:25,298 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-26 00:45:25,461 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:25,466 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-26 00:45:25,466 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-26 00:45:25,466 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-26 00:45:25,466 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-26 00:45:25,466 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-26 00:45:25,466 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-26 00:45:25,466 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-26 00:45:25,466 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-26 00:45:25,466 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-26 00:45:25,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:25,703 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-26 00:45:25,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:25,715 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-26 00:45:25,746 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:25,748 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-26 00:45:25,748 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-26 00:45:26,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:26,108 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-26 00:45:26,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:26,123 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-26 00:45:26,238 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-26 00:45:26,238 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:26,244 [ scc.git] DEBUG css/app.css | 30 +++++++
2024-04-26 00:45:26,244 [ scc.git] DEBUG src/controls/dimension-slider.js | 6 +-
2024-04-26 00:45:26,244 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-26 00:45:26,244 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-26 00:45:26,244 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 4 +-
2024-04-26 00:45:26,244 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 165 +++++++++++++++++++++++++------------
2024-04-26 00:45:26,244 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 61 +++++++++++++-
2024-04-26 00:45:26,244 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-26 00:45:26,244 [ scc.git] DEBUG 8 files changed, 228 insertions(+), 63 deletions(-)
2024-04-26 00:45:26,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:26,528 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-26 00:45:26,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:26,543 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-26 00:45:26,614 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-04-26 00:45:26,614 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:26,618 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-04-26 00:45:26,618 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-04-26 00:45:26,618 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-04-26 00:45:26,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:26,938 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb31a249bfe16120da3403c6e450afad9f8db7e1'
2024-04-26 00:45:26,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:26,962 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 474 (Img data error handling) fb31a249bfe16120da3403c6e450afad9f8db7e1'
2024-04-26 00:45:27,064 [ scc.git] DEBUG Auto-merging css/app.css
2024-04-26 00:45:27,064 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-04-26 00:45:27,064 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-04-26 00:45:27,066 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:27,070 [ scc.git] DEBUG css/app.css | 4 ++++
2024-04-26 00:45:27,070 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 11 ++++++-----
2024-04-26 00:45:27,070 [ scc.git] DEBUG src/model/image_info.js | 41 +++++++++++++++++++++++++++++++++++++++++
2024-04-26 00:45:27,070 [ scc.git] DEBUG 3 files changed, 51 insertions(+), 5 deletions(-)
2024-04-26 00:45:27,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:27,380 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:45:27,423 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:27,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:27,429 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:45:27,473 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:45:27,481 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a6b2c5b0> has no local changes
2024-04-26 00:45:27,481 [ 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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
Generated by OMERO-plugins-push#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:45:27,492 [ scc.git] DEBUG [detached HEAD fd570b7] merge master -Dorg -Ssuccess-only
2024-04-26 00:45:27,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:45:27,493 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:45:27,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-26 00:45:28,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-26 00:45:28,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-26 00:45:29,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-26 00:45:29,840 [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-04-26 00:45:30,352 [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-04-26 00:45:30,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-26 00:45:31,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:31,253 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-26 00:45:31,253 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:45:31,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-26 00:45:31,253 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:31,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:31,259 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:45:31,264 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:45:31,264 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:45:31,269 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:45:31,275 [ scc.git] DEBUG Already up to date.
2024-04-26 00:45:31,275 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-26 00:45:31,645 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-26 00:45:31,645 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-26 00:45:31,649 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:45:31,649 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:31,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:31,655 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-26 00:45:31,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:31,666 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-26 00:45:31,675 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:31,678 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-26 00:45:31,678 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-26 00:45:31,678 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-26 00:45:31,678 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-26 00:45:31,678 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-26 00:45:31,678 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-26 00:45:31,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:31,837 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:45:31,879 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:31,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:31,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:45:31,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:45:31,935 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a6b264f0> has no local changes
2024-04-26 00:45:31,935 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:45:31,944 [ scc.git] DEBUG [detached HEAD b5603a8] merge master -Dorg -Ssuccess-only
2024-04-26 00:45:31,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:45:31,945 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:45:32,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-26 00:45:32,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-26 00:45:33,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-26 00:45:33,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-26 00:45:34,373 [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-04-26 00:45:34,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-26 00:45:35,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:35,503 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-26 00:45:35,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-26 00:45:36,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-26 00:45:36,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-26 00:45:37,390 [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-04-26 00:45:37,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-26 00:45:38,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:38,319 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-26 00:45:38,320 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:45:38,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-26 00:45:38,320 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:38,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:38,334 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:45:38,345 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:45:38,346 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:45:38,356 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:45:38,366 [ scc.git] DEBUG Already up to date.
2024-04-26 00:45:38,366 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-26 00:45:39,099 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-26 00:45:39,100 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-26 00:45:39,107 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-26 00:45:39,958 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-26 00:45:39,958 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-26 00:45:39,964 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:45:39,964 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:39,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:39,972 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-26 00:45:39,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:39,986 [ 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-04-26 00:45:40,093 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-26 00:45:40,093 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-26 00:45:40,093 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-26 00:45:40,093 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-26 00:45:40,093 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 00:45:40,094 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 00:45:40,100 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-26 00:45:40,108 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-26 00:45:40,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:40,276 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-26 00:45:40,284 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-26 00:45:40,292 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#42](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-04-26 00:45:40,299 [ scc.config] DEBUG Found github.token
2024-04-26 00:45:40,299 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-26 00:45:40,299 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-26 00:45:40,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:40,312 [ 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-04-26 00:45:40,398 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-26 00:45:40,398 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-26 00:45:40,399 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-26 00:45:40,399 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 00:45:40,400 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 00:45:40,417 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-26 00:45:40,434 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-26 00:45:40,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:40,689 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-26 00:45:40,698 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-26 00:45:40,707 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#42](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/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-04-26 00:45:40,715 [ scc.config] DEBUG Found github.token
2024-04-26 00:45:40,715 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-26 00:45:40,716 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:45:40,786 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:40,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:40,793 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:45:40,839 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:45:40,848 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a6b2c550> has no local changes
2024-04-26 00:45:40,848 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:45:40,860 [ scc.git] DEBUG [detached HEAD 66302a1] merge master -Dorg -Ssuccess-only
2024-04-26 00:45:40,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:45:40,861 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:45:41,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-26 00:45:41,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-26 00:45:41,729 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-26 00:45:42,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-26 00:45:42,794 [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-04-26 00:45:43,294 [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-04-26 00:45:43,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-26 00:45:44,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:44,315 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-26 00:45:44,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-26 00:45:44,778 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-26 00:45:45,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-26 00:45:45,798 [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-04-26 00:45:46,282 [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-04-26 00:45:46,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-26 00:45:47,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:47,256 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-26 00:45:47,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-26 00:45:47,724 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-26 00:45:48,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-26 00:45:48,797 [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-04-26 00:45:49,293 [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-04-26 00:45:49,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-26 00:45:50,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:45:50,304 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-26 00:45:50,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-26 00:45:51,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-26 00:45:51,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-26 00:45:52,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-26 00:45:52,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-26 00:45:53,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-26 00:45:53,227 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:45:53,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-26 00:45:53,227 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:53,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:53,251 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:45:53,257 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:45:53,257 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:45:53,262 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:45:53,268 [ scc.git] DEBUG Already up to date.
2024-04-26 00:45:53,268 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-26 00:45:53,654 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-26 00:45:53,654 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-26 00:45:53,659 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-26 00:45:54,034 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-26 00:45:54,035 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-26 00:45:54,040 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-26 00:45:54,407 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-26 00:45:54,407 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-26 00:45:54,413 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:45:54,413 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:54,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:54,421 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-26 00:45:54,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:54,438 [ 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-04-26 00:45:54,451 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:54,456 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-26 00:45:54,457 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-26 00:45:54,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:54,621 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-26 00:45:54,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:54,637 [ 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-04-26 00:45:54,694 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-26 00:45:54,694 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:54,699 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-26 00:45:54,699 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-26 00:45:55,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:55,069 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-26 00:45:55,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:55,095 [ 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-04-26 00:45:55,160 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-26 00:45:55,161 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:55,166 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-26 00:45:55,166 [ scc.git] DEBUG package.json | 2 +-
2024-04-26 00:45:55,166 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-26 00:45:55,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:55,488 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:45:55,540 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:55,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:55,548 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:45:55,594 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:45:55,604 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a6b0cfd0> has no local changes
2024-04-26 00:45:55,604 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:45:55,617 [ scc.git] DEBUG [detached HEAD a00e0f2] merge master -Dorg -Ssuccess-only
2024-04-26 00:45:55,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:45:55,618 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:45:55,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-26 00:45:56,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-26 00:45:56,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-26 00:45:57,446 [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-04-26 00:45:57,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-26 00:45:58,434 [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-04-26 00:45:58,435 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-26 00:45:58,436 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:45:58,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-26 00:45:58,436 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:58,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:58,443 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:45:58,450 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:45:58,450 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:45:58,457 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:45:58,464 [ scc.git] DEBUG Already up to date.
2024-04-26 00:45:58,465 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-26 00:45:58,862 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-26 00:45:58,862 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-26 00:45:58,868 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:45:58,868 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:58,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:58,876 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-26 00:45:58,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:58,887 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-26 00:45:58,897 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:45:59,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:45:59,061 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:45:59,110 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:45:59,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:45:59,121 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:45:59,163 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:45:59,172 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a42a6340> has no local changes
2024-04-26 00:45:59,172 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:45:59,184 [ scc.git] DEBUG [detached HEAD 065d956] merge master -Dorg -Ssuccess-only
2024-04-26 00:45:59,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:45:59,185 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:45:59,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-26 00:46:00,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-26 00:46:00,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-26 00:46:00,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-26 00:46:01,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-26 00:46:01,925 [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-04-26 00:46:02,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-26 00:46:02,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:46:02,869 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-26 00:46:02,870 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:46:02,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-26 00:46:02,870 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:02,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:02,877 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:46:02,882 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:46:02,882 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:46:02,888 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:46:02,895 [ scc.git] DEBUG Already up to date.
2024-04-26 00:46:02,895 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-26 00:46:03,379 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-26 00:46:03,379 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-26 00:46:03,385 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:46:03,386 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:03,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:03,394 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-26 00:46:03,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:03,413 [ 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-04-26 00:46:03,426 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-26 00:46:03,427 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:46:03,430 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-26 00:46:03,430 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-26 00:46:03,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:03,589 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:46:03,677 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:03,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:03,688 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:46:03,759 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:46:03,768 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a42e25b0> has no local changes
2024-04-26 00:46:03,769 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:46:03,780 [ scc.git] DEBUG [detached HEAD 897798d] merge master -Dorg -Ssuccess-only
2024-04-26 00:46:03,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:03,781 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:46:04,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-26 00:46:04,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-26 00:46:05,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-26 00:46:05,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-26 00:46:06,082 [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-04-26 00:46:06,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-26 00:46:07,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:46:07,028 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-26 00:46:07,028 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:46:07,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-26 00:46:07,029 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:07,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:07,035 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:46:07,041 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:46:07,042 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:46:07,049 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:46:07,057 [ scc.git] DEBUG Already up to date.
2024-04-26 00:46:07,057 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-26 00:46:07,463 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-26 00:46:07,463 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-26 00:46:07,468 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:46:07,468 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:07,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:07,476 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-26 00:46:07,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:07,488 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-26 00:46:07,588 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-26 00:46:07,588 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-26 00:46:07,588 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-26 00:46:07,588 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-26 00:46:07,588 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-26 00:46:07,588 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-26 00:46:07,588 [ scc.git] DEBUG Auto-merging setup.py
2024-04-26 00:46:07,588 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-26 00:46:07,588 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 00:46:07,589 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 00:46:07,595 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-26 00:46:07,602 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-26 00:46:07,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:07,764 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-26 00:46:07,771 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-26 00:46:07,777 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#42](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2024-04-26 00:46:07,783 [ scc.config] DEBUG Found github.token
2024-04-26 00:46:07,783 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-26 00:46:07,783 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:46:07,823 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:07,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:07,831 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:46:07,885 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:46:07,897 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a6b2be80> has no local changes
2024-04-26 00:46:07,898 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:46:07,912 [ scc.git] DEBUG [detached HEAD 1ba88ca] merge master -Dorg -Ssuccess-only
2024-04-26 00:46:07,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:07,912 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:46:08,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-26 00:46:08,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-26 00:46:09,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-26 00:46:09,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-26 00:46:10,122 [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-04-26 00:46:10,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-26 00:46:11,131 [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-04-26 00:46:11,132 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-26 00:46:11,132 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:46:11,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-26 00:46:11,132 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:11,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:11,143 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:46:11,153 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:46:11,153 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:46:11,162 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:46:11,172 [ scc.git] DEBUG Already up to date.
2024-04-26 00:46:11,172 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-26 00:46:11,674 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-26 00:46:11,675 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-26 00:46:11,683 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:46:11,683 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:11,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:11,693 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-26 00:46:11,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:11,714 [ 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-04-26 00:46:11,752 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-26 00:46:11,757 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-26 00:46:11,758 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-26 00:46:11,758 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-26 00:46:11,758 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-26 00:46:11,758 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-26 00:46:11,758 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-26 00:46:11,758 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-26 00:46:11,758 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-26 00:46:11,758 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-26 00:46:11,759 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-26 00:46:11,759 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-26 00:46:11,759 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-26 00:46:11,759 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-26 00:46:11,759 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-26 00:46:11,759 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-26 00:46:11,759 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-26 00:46:11,759 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-26 00:46:11,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:11,913 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:46:12,037 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:12,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:12,048 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:46:12,116 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:46:12,129 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a6b0cdf0> has no local changes
2024-04-26 00:46:12,129 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:46:12,158 [ scc.git] DEBUG [detached HEAD ad9b61b] merge master -Dorg -Ssuccess-only
2024-04-26 00:46:12,160 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:12,160 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:46:12,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-26 00:46:12,401 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:46:12,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-26 00:46:12,401 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:12,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:12,412 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:46:12,422 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:46:12,422 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:46:12,433 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:46:12,445 [ scc.git] DEBUG Already up to date.
2024-04-26 00:46:12,445 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:46:12,445 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:12,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:12,455 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:46:12,531 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:12,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:12,540 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:46:12,637 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:46:12,648 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a4301fa0> has no local changes
2024-04-26 00:46:12,649 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:46:12,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:12,665 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:46:12,667 [ scc.git] DEBUG [detached HEAD 761203a] merge master -Dorg -Ssuccess-only
2024-04-26 00:46:12,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-26 00:46:12,847 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:46:12,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-26 00:46:12,848 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:12,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:12,858 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:46:12,867 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:46:12,867 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:46:12,879 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:46:12,888 [ scc.git] DEBUG Already up to date.
2024-04-26 00:46:12,888 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:46:12,888 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:12,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:12,900 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:46:13,019 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:13,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:13,030 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:46:13,132 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:46:13,145 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a4285f70> has no local changes
2024-04-26 00:46:13,145 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:46:13,165 [ scc.git] DEBUG [detached HEAD 85f4ed2] merge master -Dorg -Ssuccess-only
2024-04-26 00:46:13,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:13,167 [ scc.git] INFO Overriding base-branch from master to main
2024-04-26 00:46:13,167 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:46:13,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-26 00:46:13,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-26 00:46:14,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-26 00:46:14,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-26 00:46:15,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-26 00:46:15,805 [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-04-26 00:46:16,262 [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-04-26 00:46:16,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-26 00:46:17,230 [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-04-26 00:46:17,232 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-26 00:46:17,232 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:46:17,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-26 00:46:17,233 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:17,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:17,247 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-26 00:46:17,256 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:46:17,256 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-26 00:46:17,265 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-26 00:46:17,272 [ scc.git] DEBUG Already up to date.
2024-04-26 00:46:17,272 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-26 00:46:17,794 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-26 00:46:17,795 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-26 00:46:17,803 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:46:17,803 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:17,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:17,810 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-26 00:46:17,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:17,829 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-26 00:46:17,902 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-26 00:46:17,902 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-26 00:46:17,902 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 00:46:17,903 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 00:46:17,916 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-26 00:46:17,928 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-26 00:46:18,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:18,096 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-26 00:46:18,106 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-26 00:46:18,117 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#42](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-26 00:46:18,124 [ scc.config] DEBUG Found github.token
2024-04-26 00:46:18,124 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-26 00:46:18,124 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:46:18,172 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:18,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:18,181 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:46:18,229 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:46:18,240 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a4279430> has no local changes
2024-04-26 00:46:18,241 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:46:18,256 [ scc.git] DEBUG [detached HEAD c609e33] merge master -Dorg -Ssuccess-only
2024-04-26 00:46:18,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:18,257 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:46:18,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-26 00:46:18,519 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:46:18,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-26 00:46:18,519 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:18,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:18,529 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:46:18,538 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:46:18,538 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:46:18,548 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:46:18,558 [ scc.git] DEBUG Already up to date.
2024-04-26 00:46:18,558 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:46:18,558 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:18,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:18,565 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:46:18,617 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:18,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:18,628 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:46:18,699 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:46:18,714 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a42a1e50> has no local changes
2024-04-26 00:46:18,715 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:46:18,732 [ scc.git] DEBUG [detached HEAD e6c72b6] merge master -Dorg -Ssuccess-only
2024-04-26 00:46:18,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:18,733 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:46:18,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-26 00:46:18,954 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:46:18,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-26 00:46:18,954 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:18,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:18,966 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:46:18,977 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:46:18,978 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:46:18,990 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:46:19,002 [ scc.git] DEBUG Already up to date.
2024-04-26 00:46:19,003 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:46:19,003 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:19,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:19,013 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:46:19,177 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:19,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:19,188 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:46:19,256 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:46:19,266 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a41c6940> has no local changes
2024-04-26 00:46:19,267 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:46:19,282 [ scc.git] DEBUG [detached HEAD f6a58eb] merge master -Dorg -Ssuccess-only
2024-04-26 00:46:19,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:19,282 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:46:19,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-26 00:46:20,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-26 00:46:20,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-26 00:46:21,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-26 00:46:21,702 [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-04-26 00:46:22,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-26 00:46:22,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:46:22,595 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-26 00:46:22,595 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:46:22,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-26 00:46:22,596 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:22,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:22,605 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:46:22,613 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:46:22,613 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:46:22,623 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:46:22,634 [ scc.git] DEBUG Already up to date.
2024-04-26 00:46:22,634 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-26 00:46:23,098 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-26 00:46:23,099 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-26 00:46:23,107 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:46:23,107 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:23,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:23,118 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-26 00:46:23,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:23,139 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-26 00:46:23,198 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-26 00:46:23,199 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-26 00:46:23,199 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 00:46:23,200 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 00:46:23,212 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-26 00:46:23,226 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-26 00:46:23,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:23,381 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-26 00:46:23,392 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-26 00:46:23,402 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#42](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-26 00:46:23,412 [ scc.config] DEBUG Found github.token
2024-04-26 00:46:23,412 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-26 00:46:23,412 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:46:23,490 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:23,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:23,499 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:46:23,591 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:46:23,602 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a42179d0> has no local changes
2024-04-26 00:46:23,602 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:46:23,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:23,621 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-26 00:46:23,621 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:46:23,624 [ scc.git] DEBUG [detached HEAD 07ca170] merge master -Dorg -Ssuccess-only
2024-04-26 00:46:23,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-26 00:46:24,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-26 00:46:24,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-26 00:46:25,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-26 00:46:25,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-26 00:46:26,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-26 00:46:26,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-26 00:46:27,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-26 00:46:27,665 [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-04-26 00:46:28,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-26 00:46:28,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-26 00:46:28,509 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-26 00:46:28,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-26 00:46:29,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-26 00:46:29,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-26 00:46:30,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-26 00:46:30,749 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:46:30,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-26 00:46:30,750 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:30,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:30,757 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-26 00:46:30,764 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:46:30,764 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-26 00:46:30,772 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-26 00:46:30,781 [ scc.git] DEBUG Already up to date.
2024-04-26 00:46:30,781 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-26 00:46:31,252 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-26 00:46:31,253 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-26 00:46:31,258 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:46:31,258 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:31,258 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:31,265 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-26 00:46:31,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:31,281 [ 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-04-26 00:46:31,328 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-26 00:46:31,329 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-26 00:46:31,329 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 00:46:31,329 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 00:46:31,336 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-26 00:46:31,344 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-26 00:46:31,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:31,502 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-26 00:46:31,512 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-26 00:46:31,518 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#42](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-26 00:46:31,524 [ scc.config] DEBUG Found github.token
2024-04-26 00:46:31,525 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-26 00:46:31,525 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:46:31,567 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:46:31,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:46:31,574 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:46:31,616 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:46:31,624 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a41c6bb0> has no local changes
2024-04-26 00:46:31,624 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:46:31,634 [ scc.git] DEBUG [detached HEAD 3bb5361] merge master -Dorg -Ssuccess-only
2024-04-26 00:46:31,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:31,634 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:46:31,713 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-26 00:46:31,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:31,958 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-26 00:46:31,963 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-26 00:46:32,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:32,406 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-26 00:46:32,412 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-26 00:46:32,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:32,818 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-26 00:46:32,823 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-26 00:46:33,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:33,232 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-26 00:46:33,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:33,633 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-26 00:46:33,639 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-26 00:46:34,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:34,041 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-26 00:46:34,046 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-26 00:46:34,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:34,449 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-26 00:46:34,456 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-26 00:46:34,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:34,862 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-26 00:46:34,867 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-26 00:46:35,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:35,269 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-26 00:46:35,275 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-26 00:46:35,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:35,682 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-26 00:46:35,688 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-26 00:46:36,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:36,099 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-26 00:46:36,112 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-26 00:46:36,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:36,515 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-26 00:46:36,522 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-26 00:46:36,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:36,937 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-26 00:46:37,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:37,339 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-26 00:46:37,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:37,746 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-26 00:46:37,752 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-26 00:46:38,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:38,164 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-26 00:46:38,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:38,565 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-26 00:46:38,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:38,971 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-26 00:46:38,978 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-26 00:46:39,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:39,388 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-26 00:46:39,393 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-26 00:46:39,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:39,792 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-26 00:46:39,796 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-26 00:46:40,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:40,200 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-26 00:46:40,205 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-26 00:46:40,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:46:40,619 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-26 00:46:40,619 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:46:40,711 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f80a7cc5ac0> has local changes
2024-04-26 00:46:40,711 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
- PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
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'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- 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 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/42/)'
2024-04-26 00:46:40,736 [ scc.git] DEBUG [detached HEAD 81afd95] merge master -Dorg -Ssuccess-only
2024-04-26 00:46:40,737 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-26 00:46:40,737 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-26 00:46:40,737 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,737 [ scc.merge] INFO
2024-04-26 00:46:40,737 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,737 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-04-26 00:46:40,737 [ scc.merge] INFO - PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
2024-04-26 00:46:40,737 [ scc.merge] INFO
2024-04-26 00:46:40,737 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-26 00:46:40,737 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,737 [ scc.merge] INFO
2024-04-26 00:46:40,737 [ scc.merge] INFO
2024-04-26 00:46:40,737 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-26 00:46:40,737 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:46:40,737 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-26 00:46:40,737 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,737 [ scc.merge] INFO
2024-04-26 00:46:40,737 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,737 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-26 00:46:40,737 [ scc.merge] INFO
2024-04-26 00:46:40,737 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-26 00:46:40,738 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-26 00:46:40,738 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,738 [ scc.merge] INFO
2024-04-26 00:46:40,738 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-26 00:46:40,738 [ scc.merge] INFO
2024-04-26 00:46:40,738 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-26 00:46:40,738 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-26 00:46:40,738 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,738 [ scc.merge] INFO
2024-04-26 00:46:40,738 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-26 00:46:40,738 [ scc.merge] INFO
2024-04-26 00:46:40,738 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-26 00:46:40,738 [ scc.merge] INFO
2024-04-26 00:46:40,738 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-26 00:46:40,738 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-26 00:46:40,738 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,738 [ scc.merge] INFO
2024-04-26 00:46:40,738 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-04-26 00:46:40,738 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-04-26 00:46:40,738 [ scc.merge] INFO
2024-04-26 00:46:40,739 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-26 00:46:40,739 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,739 [ scc.merge] INFO
2024-04-26 00:46:40,739 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-26 00:46:40,739 [ scc.merge] INFO
2024-04-26 00:46:40,739 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-26 00:46:40,739 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,739 [ scc.merge] INFO
2024-04-26 00:46:40,739 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-26 00:46:40,739 [ scc.merge] INFO
2024-04-26 00:46:40,739 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-26 00:46:40,739 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-26 00:46:40,739 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,739 [ scc.merge] INFO
2024-04-26 00:46:40,739 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 474 will-moore 'Img data error handling'
2024-04-26 00:46:40,739 [ scc.merge] INFO
2024-04-26 00:46:40,739 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-26 00:46:40,739 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-26 00:46:40,739 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,739 [ scc.merge] INFO
2024-04-26 00:46:40,739 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,739 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-26 00:46:40,739 [ scc.merge] INFO
2024-04-26 00:46:40,739 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-26 00:46:40,739 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,739 [ scc.merge] INFO
2024-04-26 00:46:40,739 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-26 00:46:40,740 [ scc.merge] INFO
2024-04-26 00:46:40,740 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-26 00:46:40,740 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-26 00:46:40,740 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,740 [ scc.merge] INFO
2024-04-26 00:46:40,740 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-26 00:46:40,740 [ scc.merge] INFO
2024-04-26 00:46:40,740 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-26 00:46:40,740 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,740 [ scc.merge] INFO
2024-04-26 00:46:40,740 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-26 00:46:40,740 [ scc.merge] INFO
2024-04-26 00:46:40,740 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-26 00:46:40,740 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-26 00:46:40,740 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,740 [ scc.merge] INFO
2024-04-26 00:46:40,740 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-26 00:46:40,740 [ scc.merge] INFO
2024-04-26 00:46:40,740 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-26 00:46:40,740 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,740 [ scc.merge] INFO
2024-04-26 00:46:40,740 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 00:46:40,740 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-26 00:46:40,740 [ scc.merge] INFO
2024-04-26 00:46:40,740 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-26 00:46:40,740 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,740 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO Merged PRs:
2024-04-26 00:46:40,741 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-26 00:46:40,741 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-26 00:46:40,741 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-26 00:46:40,741 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:46:40,741 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-26 00:46:40,741 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 00:46:40,741 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-26 00:46:40,741 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-26 00:46:40,741 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-26 00:46:40,741 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 00:46:40,741 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-26 00:46:40,741 [ scc.merge] INFO
2024-04-26 00:46:40,741 [ scc.merge] INFO Repository: ome/scripts
2024-04-26 00:46:40,741 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:46:40,741 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-26 00:46:40,741 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-26 00:46:40,742 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-26 00:46:40,742 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-26 00:46:40,742 [ scc.merge] INFO Already up to date.
2024-04-26 00:46:40,742 [ scc.merge] INFO
2024-04-26 00:46:40,742 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 00:46:40,742 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-26 00:46:40,742 [ scc.merge] INFO
2024-04-26 00:46:40,742 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-26 00:46:40,742 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-26 00:46:40,749 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-26 00:46:40,755 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-26 00:46:40,761 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-26 00:46:40,768 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,775 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-26 00:46:40,775 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-26 00:46:40,780 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-26 00:46:40,786 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-26 00:46:40,793 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-26 00:46:40,798 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-26 00:46:40,804 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-26 00:46:40,809 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-26 00:46:40,815 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-26 00:46:40,821 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-26 00:46:40,826 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-26 00:46:40,831 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-26 00:46:40,838 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,844 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-26 00:46:40,845 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-26 00:46:40,851 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-26 00:46:40,858 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-26 00:46:40,864 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-26 00:46:40,870 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 00:46:40,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-26 00:46:40,876 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:46:40,882 [ 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.8.2 to 5.9.1-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 0dac819] 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 2ca566b
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 87d179a0
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 9d8d147
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 a0148a6
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 5a90893
nothing to commit, working tree clean
[detached HEAD b024135] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-04-26 00:47:28,689 [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-04-26 00:47:37,755 [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-04-26 00:47:40,076 [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-04-26 00:47:44,606 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-26 00:48:31,933 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/28c89a1b/images/svgs/logo.svg){kind=logo}
