Skipping 122 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-21 00:45:17,771 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-04-21 00:45:17,771 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-04-21 00:45:17,771 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-21 00:45:17,772 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-21 00:45:17,772 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-21 00:45:17,772 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-21 00:45:17,772 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-21 00:45:17,772 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-21 00:45:17,772 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-21 00:45:17,772 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-21 00:45:17,772 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-21 00:45:17,772 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-21 00:45:17,772 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-21 00:45:17,772 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-21 00:45:17,772 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-21 00:45:17,772 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-21 00:45:17,772 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-21 00:45:17,773 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-21 00:45:17,773 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-21 00:45:17,773 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-21 00:45:17,774 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-21 00:45:17,774 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-21 00:45:17,774 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-21 00:45:17,774 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-21 00:45:17,774 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-21 00:45:17,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:17,928 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09f4867b631d72d6a362989df0e7194f40aa36c1'
2024-04-21 00:45:17,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:17,948 [ 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) 09f4867b631d72d6a362989df0e7194f40aa36c1'
2024-04-21 00:45:17,973 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:45:17,977 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 ++++----
2024-04-21 00:45:17,977 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-04-21 00:45:18,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:18,329 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:45:18,371 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:18,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:18,379 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:45:18,422 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:45:18,436 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9451d07be0> has no local changes
2024-04-21 00:45:18,436 [ 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)
Updating ded0caab..87d179a0
Previously merged:
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
Generated by OMERO-plugins-push#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:45:18,447 [ scc.git] DEBUG [detached HEAD f77ef1b7] merge master -Dorg -Ssuccess-only
2024-04-21 00:45:18,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:45:18,447 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:45:18,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-21 00:45:19,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-21 00:45:19,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-21 00:45:20,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-21 00:45:20,730 [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-21 00:45:21,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-21 00:45:21,581 [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-21 00:45:21,582 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-21 00:45:21,582 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:45:21,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-21 00:45:21,583 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:21,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:21,589 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:45:21,594 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:45:21,595 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:45:21,600 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:45:21,605 [ scc.git] DEBUG Already up to date.
2024-04-21 00:45:21,605 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-21 00:45:22,007 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-21 00:45:22,007 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-21 00:45:22,012 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:45:22,013 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:22,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:22,018 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-21 00:45:22,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:22,030 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-21 00:45:22,066 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-21 00:45:22,067 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:45:22,069 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-21 00:45:22,070 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-21 00:45:22,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:22,220 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:45:22,263 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:22,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:22,269 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:45:22,310 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:45:22,317 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9451cbe550> has no local changes
2024-04-21 00:45:22,317 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:45:22,327 [ scc.git] DEBUG [detached HEAD f975850] merge master -Dorg -Ssuccess-only
2024-04-21 00:45:22,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:45:22,328 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:45:22,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-21 00:45:23,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-21 00:45:23,137 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-21 00:45:23,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-21 00:45:24,159 [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-21 00:45:24,680 [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-21 00:45:25,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-21 00:45:25,647 [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-21 00:45:25,648 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-21 00:45:25,648 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:45:25,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-21 00:45:25,649 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:25,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:25,655 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:45:25,661 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:45:25,661 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:45:25,667 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:45:25,673 [ scc.git] DEBUG Already up to date.
2024-04-21 00:45:25,674 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-21 00:45:26,055 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-21 00:45:26,055 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-21 00:45:26,060 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:45:26,060 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:26,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:26,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-21 00:45:26,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:26,079 [ 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-21 00:45:26,091 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:45:26,096 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-21 00:45:26,096 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-21 00:45:26,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:26,251 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:45:26,294 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:26,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:26,300 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:45:26,350 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:45:26,357 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9451cc6820> has no local changes
2024-04-21 00:45:26,358 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:45:26,368 [ scc.git] DEBUG [detached HEAD d3db3e6] merge master -Dorg -Ssuccess-only
2024-04-21 00:45:26,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:45:26,368 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:45:26,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-21 00:45:27,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-04-21 00:45:27,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-04-21 00:45:28,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-21 00:45:28,646 [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-21 00:45:29,109 [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-21 00:45:29,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-21 00:45:30,021 [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-21 00:45:30,022 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-21 00:45:30,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-21 00:45:30,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-21 00:45:31,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170 HTTP/1.1" 200 None
2024-04-21 00:45:31,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-21 00:45:32,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-21 00:45:32,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170 HTTP/1.1" 200 None
2024-04-21 00:45:33,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/44025ed69514a02ecbc5d4655d3da7519ebf9170?per_page=1 HTTP/1.1" 200 2
2024-04-21 00:45:33,253 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-21 00:45:33,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-21 00:45:34,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-21 00:45:34,692 [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-21 00:45:35,175 [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-21 00:45:35,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-21 00:45:36,023 [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-21 00:45:36,024 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-21 00:45:36,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-21 00:45:36,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-21 00:45:37,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-21 00:45:37,922 [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-21 00:45:38,383 [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-21 00:45:38,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-21 00:45:39,235 [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-21 00:45:39,235 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-21 00:45:39,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-21 00:45:40,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-21 00:45:40,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-21 00:45:41,054 [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-21 00:45:41,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-21 00:45:41,911 [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-21 00:45:41,912 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-21 00:45:41,912 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:45:41,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-21 00:45:41,913 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:41,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:41,918 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:45:41,924 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:45:41,924 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:45:41,930 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:45:41,937 [ scc.git] DEBUG Already up to date.
2024-04-21 00:45:41,937 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-21 00:45:42,384 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-21 00:45:42,384 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-21 00:45:42,389 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-21 00:45:43,371 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-21 00:45:43,371 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-21 00:45:43,376 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-21 00:45:43,815 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-21 00:45:43,815 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-21 00:45:43,822 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-21 00:45:44,499 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-21 00:45:44,499 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-21 00:45:44,504 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-04-21 00:45:44,918 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-21 00:45:44,918 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-04-21 00:45:44,923 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:45:44,923 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:44,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:44,929 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-21 00:45:44,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:44,943 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-21 00:45:44,956 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:45:44,959 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-21 00:45:44,959 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-21 00:45:44,959 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-21 00:45:45,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:45,114 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-21 00:45:45,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:45,128 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-21 00:45:45,221 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:45:45,227 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-21 00:45:45,227 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-21 00:45:45,227 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-21 00:45:45,227 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-21 00:45:45,227 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-21 00:45:45,227 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-21 00:45:45,227 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-21 00:45:45,227 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-21 00:45:45,227 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-21 00:45:45,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:45,521 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-21 00:45:45,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:45,535 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-21 00:45:45,567 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:45:45,570 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-21 00:45:45,570 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-21 00:45:45,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:45,936 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...44025ed69514a02ecbc5d4655d3da7519ebf9170'
2024-04-21 00:45:45,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:45,952 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 44025ed69514a02ecbc5d4655d3da7519ebf9170'
2024-04-21 00:45:46,020 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-21 00:45:46,021 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:45:46,026 [ scc.git] DEBUG css/app.css | 22 +++++
2024-04-21 00:45:46,026 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-21 00:45:46,026 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-21 00:45:46,026 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-21 00:45:46,026 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 160 ++++++++++++++++++++++++-------------
2024-04-21 00:45:46,026 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 42 +++++++++-
2024-04-21 00:45:46,027 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-21 00:45:46,027 [ scc.git] DEBUG 7 files changed, 190 insertions(+), 61 deletions(-)
2024-04-21 00:45:46,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:46,334 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-21 00:45:46,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:46,347 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-21 00:45:46,393 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:45:46,396 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-04-21 00:45:46,396 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-04-21 00:45:46,396 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-04-21 00:45:46,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:46,741 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:45:46,786 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:46,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:46,792 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:45:46,834 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:45:46,843 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9451c985b0> has no local changes
2024-04-21 00:45:46,844 [ 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'
Generated by OMERO-plugins-push#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:45:46,857 [ scc.git] DEBUG [detached HEAD 51330e6] merge master -Dorg -Ssuccess-only
2024-04-21 00:45:46,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:45:46,858 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:45:47,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-21 00:45:47,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-21 00:45:48,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-21 00:45:48,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-21 00:45:49,173 [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-21 00:45:49,615 [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-21 00:45:50,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-21 00:45:50,547 [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-21 00:45:50,548 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-21 00:45:50,548 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:45:50,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-21 00:45:50,548 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:50,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:50,554 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:45:50,560 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:45:50,561 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:45:50,567 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:45:50,573 [ scc.git] DEBUG Already up to date.
2024-04-21 00:45:50,574 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-21 00:45:50,948 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-21 00:45:50,949 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-21 00:45:50,953 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:45:50,954 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:50,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:50,959 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-21 00:45:50,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:50,971 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-21 00:45:50,982 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:45:50,985 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-21 00:45:50,985 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-21 00:45:50,985 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-21 00:45:50,985 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-21 00:45:50,985 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-21 00:45:50,987 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-21 00:45:51,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:51,146 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:45:51,186 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:51,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:51,192 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:45:51,231 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:45:51,239 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9451ccc4f0> has no local changes
2024-04-21 00:45:51,239 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:45:51,248 [ scc.git] DEBUG [detached HEAD d17833e] merge master -Dorg -Ssuccess-only
2024-04-21 00:45:51,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:45:51,249 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:45:51,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-21 00:45:52,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-21 00:45:52,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-21 00:45:53,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-21 00:45:53,580 [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-21 00:45:54,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-21 00:45:54,498 [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-21 00:45:54,499 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-21 00:45:54,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-21 00:45:55,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-21 00:45:55,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-21 00:45:56,341 [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-21 00:45:56,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-21 00:45:57,219 [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-21 00:45:57,220 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-21 00:45:57,221 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:45:57,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-21 00:45:57,221 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:57,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:57,228 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:45:57,234 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:45:57,234 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:45:57,240 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:45:57,246 [ scc.git] DEBUG Already up to date.
2024-04-21 00:45:57,247 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-21 00:45:57,779 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-21 00:45:57,780 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-21 00:45:57,785 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-21 00:45:58,265 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-21 00:45:58,265 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-21 00:45:58,271 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:45:58,272 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:58,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:58,278 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-21 00:45:58,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:58,291 [ 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-21 00:45:58,327 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-21 00:45:58,327 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-21 00:45:58,327 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-21 00:45:58,327 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-21 00:45:58,327 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-21 00:45:58,328 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-21 00:45:58,334 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-21 00:45:58,341 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-21 00:45:58,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:58,506 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-21 00:45:58,516 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-21 00:45:58,524 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#37](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-04-21 00:45:58,530 [ scc.config] DEBUG Found github.token
2024-04-21 00:45:58,530 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-21 00:45:58,530 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-21 00:45:58,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:58,544 [ 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-21 00:45:58,576 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-21 00:45:58,577 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-21 00:45:58,577 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-21 00:45:58,577 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-21 00:45:58,577 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-21 00:45:58,585 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-21 00:45:58,594 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-21 00:45:58,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:45:58,916 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-21 00:45:58,924 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-21 00:45:58,930 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#37](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/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-21 00:45:58,935 [ scc.config] DEBUG Found github.token
2024-04-21 00:45:58,936 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-21 00:45:58,936 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:45:58,978 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:45:58,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:45:58,985 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:45:59,027 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:45:59,035 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9451c98550> has no local changes
2024-04-21 00:45:59,035 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:45:59,045 [ scc.git] DEBUG [detached HEAD 3c15734] merge master -Dorg -Ssuccess-only
2024-04-21 00:45:59,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:45:59,045 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:45:59,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-21 00:45:59,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-21 00:45:59,901 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-21 00:46:00,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-21 00:46:00,913 [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-21 00:46:01,379 [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-21 00:46:01,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-21 00:46:02,253 [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-21 00:46:02,254 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-21 00:46:02,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-21 00:46:02,725 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-21 00:46:03,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-21 00:46:03,792 [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-21 00:46:04,225 [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-21 00:46:04,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-21 00:46:05,211 [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-21 00:46:05,212 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-21 00:46:05,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-21 00:46:05,685 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-21 00:46:06,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-21 00:46:06,696 [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-21 00:46:07,153 [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-21 00:46:07,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-21 00:46:08,117 [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-21 00:46:08,119 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-21 00:46:08,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-21 00:46:09,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-21 00:46:09,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-21 00:46:09,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-21 00:46:10,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-21 00:46:10,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-21 00:46:10,958 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:10,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-21 00:46:10,959 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:10,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:10,967 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:46:10,977 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:10,977 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:46:10,985 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:46:10,993 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:10,993 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-21 00:46:11,416 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-21 00:46:11,417 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-21 00:46:11,422 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-21 00:46:11,788 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-21 00:46:11,789 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-21 00:46:11,794 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-21 00:46:12,182 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-21 00:46:12,182 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-21 00:46:12,186 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:12,186 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:12,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:12,193 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-21 00:46:12,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:12,208 [ 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-21 00:46:12,219 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:46:12,222 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-21 00:46:12,222 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-21 00:46:12,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:12,371 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-21 00:46:12,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:12,389 [ 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-21 00:46:12,443 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-21 00:46:12,444 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:46:12,448 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-21 00:46:12,448 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-21 00:46:12,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:12,768 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-21 00:46:12,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:12,787 [ 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-21 00:46:12,820 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-21 00:46:12,820 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:46:12,824 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-21 00:46:12,824 [ scc.git] DEBUG package.json | 2 +-
2024-04-21 00:46:12,824 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-21 00:46:13,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:13,170 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:13,228 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:13,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:13,237 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:13,289 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:13,301 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9451c97fd0> has no local changes
2024-04-21 00:46:13,301 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:13,317 [ scc.git] DEBUG [detached HEAD 6e79564] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:13,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:13,318 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:46:13,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-21 00:46:14,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-21 00:46:14,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-21 00:46:15,119 [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-21 00:46:15,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-21 00:46:16,048 [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-21 00:46:16,049 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-21 00:46:16,049 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:16,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-21 00:46:16,050 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:16,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:16,058 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:46:16,069 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:16,070 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:46:16,079 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:46:16,090 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:16,091 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-21 00:46:16,473 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-21 00:46:16,473 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-21 00:46:16,480 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:16,480 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:16,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:16,489 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-21 00:46:16,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:16,509 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-21 00:46:16,522 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:46:16,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:16,680 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:16,739 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:16,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:16,746 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:16,822 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:16,833 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f945042d340> has no local changes
2024-04-21 00:46:16,834 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:16,845 [ scc.git] DEBUG [detached HEAD 368b87a] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:16,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:16,847 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:46:17,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-21 00:46:17,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-21 00:46:18,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-21 00:46:18,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-21 00:46:19,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-21 00:46:19,542 [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-21 00:46:20,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-21 00:46:20,465 [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-21 00:46:20,466 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-21 00:46:20,466 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:20,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-21 00:46:20,466 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:20,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:20,475 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:46:20,483 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:20,484 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:46:20,491 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:46:20,500 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:20,500 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-21 00:46:20,973 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-21 00:46:20,973 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-21 00:46:20,982 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:20,982 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:20,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:20,992 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-21 00:46:21,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:21,013 [ 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-21 00:46:21,027 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-21 00:46:21,027 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:46:21,030 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-21 00:46:21,030 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-21 00:46:21,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:21,191 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:21,236 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:21,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:21,243 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:21,295 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:21,303 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f94504805b0> has no local changes
2024-04-21 00:46:21,303 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:21,313 [ scc.git] DEBUG [detached HEAD 5b92357] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:21,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:21,314 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:46:21,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-21 00:46:22,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-21 00:46:22,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-21 00:46:23,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-21 00:46:23,554 [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-21 00:46:24,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-21 00:46:24,465 [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-21 00:46:24,466 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-21 00:46:24,467 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:24,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-21 00:46:24,467 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:24,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:24,475 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:46:24,484 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:24,484 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:46:24,491 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:46:24,499 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:24,499 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-21 00:46:24,895 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-21 00:46:24,896 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-21 00:46:24,902 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:24,902 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:24,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:24,911 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-21 00:46:24,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:24,928 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-21 00:46:24,963 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-21 00:46:24,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-21 00:46:24,963 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-21 00:46:24,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-21 00:46:24,963 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-21 00:46:24,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-21 00:46:24,964 [ scc.git] DEBUG Auto-merging setup.py
2024-04-21 00:46:24,964 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-21 00:46:24,964 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-21 00:46:24,964 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-21 00:46:24,974 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-21 00:46:24,984 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-21 00:46:25,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:25,156 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-21 00:46:25,164 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-21 00:46:25,170 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#37](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2024-04-21 00:46:25,176 [ scc.config] DEBUG Found github.token
2024-04-21 00:46:25,176 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-21 00:46:25,176 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:25,228 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:25,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:25,234 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:25,273 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:25,280 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9451cc6df0> has no local changes
2024-04-21 00:46:25,281 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:25,290 [ scc.git] DEBUG [detached HEAD a75557e] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:25,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:25,290 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:46:25,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-21 00:46:26,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-21 00:46:26,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-21 00:46:27,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-21 00:46:27,549 [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-21 00:46:28,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-21 00:46:28,476 [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-21 00:46:28,477 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-21 00:46:28,477 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:28,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-21 00:46:28,478 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:28,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:28,489 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:46:28,502 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:28,502 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:46:28,516 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:46:28,529 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:28,529 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-21 00:46:29,070 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-21 00:46:29,071 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-21 00:46:29,078 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:29,078 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:29,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:29,089 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-21 00:46:29,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:29,116 [ 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-21 00:46:29,155 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:46:29,159 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-21 00:46:29,162 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-21 00:46:29,163 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-21 00:46:29,163 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-21 00:46:29,164 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-21 00:46:29,165 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-21 00:46:29,165 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-21 00:46:29,165 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-21 00:46:29,165 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-21 00:46:29,165 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-21 00:46:29,165 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-21 00:46:29,165 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-21 00:46:29,165 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-21 00:46:29,166 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-21 00:46:29,166 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-21 00:46:29,166 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-21 00:46:29,166 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-21 00:46:29,166 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-21 00:46:29,166 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-21 00:46:29,166 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-21 00:46:29,166 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-21 00:46:29,166 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-21 00:46:29,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:29,326 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:29,404 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:29,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:29,416 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:29,485 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:29,497 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9451c97df0> has no local changes
2024-04-21 00:46:29,498 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:29,514 [ scc.git] DEBUG [detached HEAD 90b704d] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:29,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:29,515 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:46:29,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-21 00:46:29,751 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:29,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-21 00:46:29,751 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:29,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:29,764 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:46:29,777 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:29,778 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:46:29,791 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:46:29,805 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:29,805 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:29,805 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:29,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:29,819 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:29,896 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:29,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:29,915 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:29,979 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:29,995 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9450478fa0> has no local changes
2024-04-21 00:46:29,995 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:30,016 [ scc.git] DEBUG [detached HEAD 1d239b6] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:30,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:30,017 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:46:30,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-21 00:46:30,190 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:30,190 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-21 00:46:30,190 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:30,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:30,207 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:46:30,222 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:30,223 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:46:30,236 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:46:30,252 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:30,252 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:30,252 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:30,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:30,265 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:30,340 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:30,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:30,353 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:30,417 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:30,430 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9450424f70> has no local changes
2024-04-21 00:46:30,431 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:30,446 [ scc.git] DEBUG [detached HEAD 99ee414] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:30,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:30,447 [ scc.git] INFO Overriding base-branch from master to main
2024-04-21 00:46:30,447 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:46:30,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-21 00:46:31,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-21 00:46:31,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-21 00:46:32,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-21 00:46:32,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-21 00:46:33,021 [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-21 00:46:33,521 [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-21 00:46:33,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-21 00:46:34,389 [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-21 00:46:34,391 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-21 00:46:34,391 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:34,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-21 00:46:34,391 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:34,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:34,405 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-21 00:46:34,417 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:34,417 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-21 00:46:34,433 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-21 00:46:34,443 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:34,444 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-21 00:46:34,913 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-21 00:46:34,913 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-21 00:46:34,919 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:34,920 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:34,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:34,928 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-21 00:46:34,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:34,947 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-21 00:46:34,974 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-21 00:46:34,975 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-21 00:46:34,975 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-21 00:46:34,975 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-21 00:46:34,983 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-21 00:46:34,991 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-21 00:46:35,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:35,155 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-21 00:46:35,164 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-21 00:46:35,174 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#37](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-21 00:46:35,183 [ scc.config] DEBUG Found github.token
2024-04-21 00:46:35,184 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-21 00:46:35,184 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:35,252 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:35,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:35,266 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:35,339 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:35,349 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9450406430> has no local changes
2024-04-21 00:46:35,350 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:35,363 [ scc.git] DEBUG [detached HEAD 7153911] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:35,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:35,363 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:46:35,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-21 00:46:35,591 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:35,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-21 00:46:35,591 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:35,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:35,602 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:46:35,611 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:35,611 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:46:35,619 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:46:35,628 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:35,628 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:35,628 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:35,629 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:35,649 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:35,706 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:35,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:35,717 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:35,775 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:35,786 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9450442e50> has no local changes
2024-04-21 00:46:35,786 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:35,798 [ scc.git] DEBUG [detached HEAD c808637] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:35,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:35,799 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:46:36,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-21 00:46:36,016 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:36,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-21 00:46:36,016 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:36,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:36,025 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:46:36,034 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:36,035 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:46:36,045 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:46:36,076 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:36,076 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:36,077 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:36,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:36,092 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:36,155 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:36,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:36,166 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:36,245 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:36,259 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f945034e940> has no local changes
2024-04-21 00:46:36,260 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:36,277 [ scc.git] DEBUG [detached HEAD 1c6fa44] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:36,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:36,279 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:46:36,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-21 00:46:36,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-21 00:46:37,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-21 00:46:37,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-21 00:46:38,403 [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-21 00:46:38,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-21 00:46:39,246 [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-21 00:46:39,248 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-21 00:46:39,248 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:39,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-21 00:46:39,248 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:39,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:39,259 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:46:39,266 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:39,267 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:46:39,276 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:46:39,283 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:39,284 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-21 00:46:39,691 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-21 00:46:39,692 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-21 00:46:39,697 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:39,697 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:39,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:39,704 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-21 00:46:39,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:39,718 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-21 00:46:39,758 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-21 00:46:39,758 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-21 00:46:39,758 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-21 00:46:39,759 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-21 00:46:39,766 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-21 00:46:39,775 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-21 00:46:39,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:39,922 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-21 00:46:39,935 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-21 00:46:39,945 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#37](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-21 00:46:39,953 [ scc.config] DEBUG Found github.token
2024-04-21 00:46:39,954 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-21 00:46:39,954 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:40,003 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:40,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:40,012 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:40,093 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:40,106 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f94503959d0> has no local changes
2024-04-21 00:46:40,107 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:40,118 [ scc.git] DEBUG [detached HEAD 940da78] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:40,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:40,121 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-21 00:46:40,121 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:46:40,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-21 00:46:40,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-21 00:46:41,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-21 00:46:41,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-21 00:46:42,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-21 00:46:42,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-21 00:46:43,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-21 00:46:43,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-21 00:46:44,217 [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-21 00:46:44,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-21 00:46:45,113 [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-21 00:46:45,114 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-21 00:46:45,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-21 00:46:46,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-21 00:46:46,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-21 00:46:46,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-21 00:46:46,998 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:46:46,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-21 00:46:46,998 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:46,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:47,006 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-21 00:46:47,016 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:46:47,016 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-21 00:46:47,025 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-21 00:46:47,034 [ scc.git] DEBUG Already up to date.
2024-04-21 00:46:47,034 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-21 00:46:47,490 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-21 00:46:47,490 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-21 00:46:47,496 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:46:47,496 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:47,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:47,504 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-21 00:46:47,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:47,522 [ 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-21 00:46:47,579 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-21 00:46:47,579 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-21 00:46:47,579 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-21 00:46:47,580 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-21 00:46:47,589 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-21 00:46:47,599 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-21 00:46:47,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:47,769 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-21 00:46:47,781 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-21 00:46:47,790 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#37](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-21 00:46:47,799 [ scc.config] DEBUG Found github.token
2024-04-21 00:46:47,800 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-21 00:46:47,800 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:46:47,846 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:46:47,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:46:47,853 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:47,899 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:47,909 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f945034ebb0> has no local changes
2024-04-21 00:46:47,909 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:47,924 [ scc.git] DEBUG [detached HEAD 74791c0] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:47,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:47,924 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:46:48,019 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-21 00:46:48,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:48,198 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-21 00:46:48,207 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-21 00:46:48,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:48,606 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-21 00:46:48,613 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-21 00:46:48,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:49,009 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-21 00:46:49,020 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-21 00:46:49,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:49,418 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-21 00:46:49,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:49,837 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-21 00:46:49,843 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-21 00:46:50,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:50,229 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-21 00:46:50,243 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-21 00:46:50,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:50,634 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-21 00:46:50,639 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-21 00:46:51,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:51,042 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-21 00:46:51,049 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-21 00:46:51,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:51,464 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-21 00:46:51,473 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-21 00:46:51,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:51,876 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-21 00:46:51,882 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-21 00:46:52,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:52,281 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-21 00:46:52,294 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-21 00:46:52,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:52,683 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-21 00:46:52,695 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-21 00:46:53,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:53,077 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-21 00:46:53,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:53,493 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-21 00:46:53,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:53,880 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-21 00:46:53,886 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-21 00:46:54,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:54,327 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-21 00:46:54,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:54,730 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-21 00:46:55,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:55,134 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-21 00:46:55,144 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-21 00:46:55,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:55,552 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-21 00:46:55,563 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-21 00:46:55,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:55,965 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-21 00:46:55,981 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-21 00:46:56,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:56,380 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-21 00:46:56,395 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-21 00:46:56,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:46:56,777 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-21 00:46:56,777 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:46:56,906 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9455172460> has local changes
2024-04-21 00:46:56,907 [ 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`'
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)
Updating ded0caab..87d179a0
Previously merged:
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
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'
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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/37/)'
2024-04-21 00:46:56,929 [ scc.git] DEBUG [detached HEAD 2212a3f] merge master -Dorg -Ssuccess-only
2024-04-21 00:46:56,929 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-21 00:46:56,930 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-21 00:46:56,930 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,930 [ scc.merge] INFO
2024-04-21 00:46:56,930 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,930 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-04-21 00:46:56,930 [ scc.merge] INFO
2024-04-21 00:46:56,930 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-21 00:46:56,930 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,930 [ scc.merge] INFO
2024-04-21 00:46:56,930 [ scc.merge] INFO
2024-04-21 00:46:56,930 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-21 00:46:56,931 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:46:56,931 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-21 00:46:56,931 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,931 [ scc.merge] INFO
2024-04-21 00:46:56,931 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,931 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-21 00:46:56,931 [ scc.merge] INFO
2024-04-21 00:46:56,931 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-21 00:46:56,931 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:46:56,931 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-21 00:46:56,931 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-21 00:46:56,931 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-21 00:46:56,931 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-21 00:46:56,931 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,931 [ scc.merge] INFO
2024-04-21 00:46:56,931 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,931 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-21 00:46:56,931 [ scc.merge] INFO
2024-04-21 00:46:56,931 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-21 00:46:56,931 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:46:56,931 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-21 00:46:56,931 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-21 00:46:56,931 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,932 [ scc.merge] INFO
2024-04-21 00:46:56,932 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,932 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-21 00:46:56,932 [ scc.merge] INFO
2024-04-21 00:46:56,932 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-21 00:46:56,932 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-21 00:46:56,932 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-21 00:46:56,932 [ scc.merge] INFO
2024-04-21 00:46:56,932 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-21 00:46:56,932 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:46:56,932 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-21 00:46:56,932 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-21 00:46:56,932 [ scc.merge] INFO Updating ded0caab..87d179a0
2024-04-21 00:46:56,932 [ scc.merge] INFO Previously merged:
2024-04-21 00:46:56,932 [ scc.merge] INFO
2024-04-21 00:46:56,932 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,932 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-21 00:46:56,932 [ scc.merge] INFO - PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
2024-04-21 00:46:56,932 [ scc.merge] INFO
2024-04-21 00:46:56,932 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-21 00:46:56,932 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,932 [ scc.merge] INFO
2024-04-21 00:46:56,932 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,933 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-21 00:46:56,933 [ scc.merge] INFO
2024-04-21 00:46:56,933 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-21 00:46:56,933 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,933 [ scc.merge] INFO
2024-04-21 00:46:56,933 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,933 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-21 00:46:56,933 [ scc.merge] INFO
2024-04-21 00:46:56,933 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-21 00:46:56,933 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:46:56,933 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-21 00:46:56,933 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-21 00:46:56,933 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,933 [ scc.merge] INFO
2024-04-21 00:46:56,933 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,933 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-21 00:46:56,933 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-21 00:46:56,933 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-21 00:46:56,933 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-21 00:46:56,933 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-21 00:46:56,933 [ scc.merge] INFO
2024-04-21 00:46:56,933 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-21 00:46:56,934 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:46:56,934 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-21 00:46:56,934 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,934 [ scc.merge] INFO
2024-04-21 00:46:56,934 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,934 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-21 00:46:56,934 [ scc.merge] INFO
2024-04-21 00:46:56,934 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-21 00:46:56,934 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,934 [ scc.merge] INFO
2024-04-21 00:46:56,934 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-21 00:46:56,934 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-21 00:46:56,934 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-21 00:46:56,934 [ scc.merge] INFO
2024-04-21 00:46:56,934 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-21 00:46:56,934 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:46:56,934 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-21 00:46:56,934 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-21 00:46:56,934 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-21 00:46:56,934 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,935 [ scc.merge] INFO
2024-04-21 00:46:56,935 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,935 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-21 00:46:56,935 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-21 00:46:56,935 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-21 00:46:56,935 [ scc.merge] INFO
2024-04-21 00:46:56,935 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-21 00:46:56,935 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,935 [ scc.merge] INFO
2024-04-21 00:46:56,935 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,935 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-21 00:46:56,935 [ scc.merge] INFO
2024-04-21 00:46:56,935 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-21 00:46:56,935 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:46:56,935 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-21 00:46:56,935 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,935 [ scc.merge] INFO
2024-04-21 00:46:56,935 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,935 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-21 00:46:56,935 [ scc.merge] INFO
2024-04-21 00:46:56,936 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-21 00:46:56,936 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,936 [ scc.merge] INFO
2024-04-21 00:46:56,936 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-21 00:46:56,936 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-21 00:46:56,936 [ scc.merge] INFO
2024-04-21 00:46:56,936 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-21 00:46:56,936 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,936 [ scc.merge] INFO
2024-04-21 00:46:56,936 [ scc.merge] INFO Merged PRs:
2024-04-21 00:46:56,936 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-21 00:46:56,936 [ scc.merge] INFO
2024-04-21 00:46:56,936 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-21 00:46:56,936 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,936 [ scc.merge] INFO
2024-04-21 00:46:56,936 [ scc.merge] INFO
2024-04-21 00:46:56,936 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-21 00:46:56,936 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,936 [ scc.merge] INFO
2024-04-21 00:46:56,936 [ scc.merge] INFO
2024-04-21 00:46:56,937 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-21 00:46:56,937 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:46:56,937 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-21 00:46:56,937 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,937 [ scc.merge] INFO
2024-04-21 00:46:56,937 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-21 00:46:56,937 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-21 00:46:56,937 [ scc.merge] INFO
2024-04-21 00:46:56,937 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-21 00:46:56,937 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,937 [ scc.merge] INFO
2024-04-21 00:46:56,937 [ scc.merge] INFO
2024-04-21 00:46:56,937 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-21 00:46:56,937 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,937 [ scc.merge] INFO
2024-04-21 00:46:56,937 [ scc.merge] INFO
2024-04-21 00:46:56,937 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-21 00:46:56,937 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,937 [ scc.merge] INFO
2024-04-21 00:46:56,937 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-21 00:46:56,938 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-21 00:46:56,938 [ scc.merge] INFO
2024-04-21 00:46:56,938 [ scc.merge] INFO Repository: ome/scripts
2024-04-21 00:46:56,938 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:46:56,938 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-21 00:46:56,938 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-21 00:46:56,938 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-21 00:46:56,938 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-21 00:46:56,938 [ scc.merge] INFO Already up to date.
2024-04-21 00:46:56,938 [ scc.merge] INFO
2024-04-21 00:46:56,938 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-21 00:46:56,938 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-21 00:46:56,938 [ scc.merge] INFO
2024-04-21 00:46:56,938 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-21 00:46:56,939 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:56,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-21 00:46:56,954 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:56,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:56,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-21 00:46:56,966 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:56,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:56,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-21 00:46:56,975 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:56,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:56,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-21 00:46:56,983 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:56,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:56,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-21 00:46:56,991 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:56,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:56,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-21 00:46:56,999 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-21 00:46:57,006 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-21 00:46:57,013 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-21 00:46:57,019 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-21 00:46:57,025 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,030 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-21 00:46:57,031 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,036 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,036 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-21 00:46:57,036 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-21 00:46:57,041 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-21 00:46:57,048 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-21 00:46:57,054 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-21 00:46:57,060 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-21 00:46:57,066 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-21 00:46:57,072 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-21 00:46:57,079 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-21 00:46:57,092 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-21 00:46:57,103 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-21 00:46:57,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-21 00:46:57,114 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:46:57,124 [ 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 27ea3aa] 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 ded0caab
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 b473f15] 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-21 00:47:49,517 [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-21 00:47:58,316 [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-21 00:48:00,662 [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-21 00:48:05,264 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-21 00:48:51,514 [ 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/03a0bb70/images/svgs/logo.svg){kind=logo}
