Skipping 116 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/backbone-1.0.0.js
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/backbone.mousetrap/README.md
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.css
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.min.css
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.js
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-04-15 11:30:10,506 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-15 11:30:10,507 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-15 11:30:10,507 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-15 11:30:10,507 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-15 11:30:10,508 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-15 11:30:10,508 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-15 11:30:10,508 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-15 11:30:10,508 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-15 11:30:10,508 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-15 11:30:10,509 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-15 11:30:10,509 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-15 11:30:10,509 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-15 11:30:10,509 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-15 11:30:10,509 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-15 11:30:10,509 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-15 11:30:10,509 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-15 11:30:10,509 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-15 11:30:10,509 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-15 11:30:10,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:30:10,666 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:30:10,713 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:10,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:10,719 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:30:10,760 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:30:10,773 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc25450be0> has no local changes
2024-04-15 11:30:10,773 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
Generated by OMERO-plugins-push#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:30:10,788 [ scc.git] DEBUG [detached HEAD e8d53a83] merge master -Dorg -Ssuccess-only
2024-04-15 11:30:10,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:30:10,789 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:30:11,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-15 11:30:11,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-15 11:30:12,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-15 11:30:12,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-15 11:30:13,079 [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-15 11:30:13,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-15 11:30:13,982 [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-15 11:30:13,982 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-15 11:30:13,983 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:30:13,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-15 11:30:13,983 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:13,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:13,989 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:30:13,995 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:30:13,995 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:30:14,003 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:30:14,010 [ scc.git] DEBUG Already up to date.
2024-04-15 11:30:14,010 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-15 11:30:14,472 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-15 11:30:14,472 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-15 11:30:14,477 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:30:14,477 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:14,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:14,482 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-15 11:30:14,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:14,493 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-15 11:30:14,510 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-15 11:30:14,511 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:30:14,514 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-15 11:30:14,514 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-15 11:30:14,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:30:14,682 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:30:14,724 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:14,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:14,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:30:14,773 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:30:14,781 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc25406550> has no local changes
2024-04-15 11:30:14,781 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:30:14,790 [ scc.git] DEBUG [detached HEAD 13732e9] merge master -Dorg -Ssuccess-only
2024-04-15 11:30:14,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:30:14,791 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:30:15,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-15 11:30:15,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-15 11:30:15,643 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-15 11:30:16,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-15 11:30:16,746 [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-15 11:30:17,258 [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-15 11:30:17,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-15 11:30:18,294 [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-15 11:30:18,295 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-15 11:30:18,295 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:30:18,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-15 11:30:18,295 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:18,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:18,301 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:30:18,306 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:30:18,306 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:30:18,311 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:30:18,318 [ scc.git] DEBUG Already up to date.
2024-04-15 11:30:18,318 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-15 11:30:18,709 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-15 11:30:18,709 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-15 11:30:18,714 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:30:18,714 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:18,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:18,720 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-15 11:30:18,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:18,730 [ 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-15 11:30:18,741 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:30:18,745 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-15 11:30:18,745 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-15 11:30:18,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:30:18,908 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:30:18,952 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:18,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:18,958 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:30:19,000 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:30:19,008 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc254159d0> has no local changes
2024-04-15 11:30:19,008 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:30:19,017 [ scc.git] DEBUG [detached HEAD 301ffe6] merge master -Dorg -Ssuccess-only
2024-04-15 11:30:19,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:30:19,018 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:30:19,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-15 11:30:19,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-15 11:30:20,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-15 11:30:20,886 [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-15 11:30:21,353 [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-15 11:30:21,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-15 11:30:22,271 [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-15 11:30:22,272 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-15 11:30:22,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-15 11:30:23,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-15 11:30:23,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2 HTTP/1.1" 200 None
2024-04-15 11:30:24,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 11:30:24,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 11:30:25,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2 HTTP/1.1" 200 None
2024-04-15 11:30:25,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/efda99710532f9743896717e88f0e68ca23ec3b2?per_page=1 HTTP/1.1" 200 2
2024-04-15 11:30:25,716 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-15 11:30:26,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-04-15 11:30:26,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-04-15 11:30:27,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-15 11:30:27,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 11:30:28,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 11:30:28,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-15 11:30:29,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/97542d9b749f93d4902f7dce703bbf2a04316a98?per_page=1 HTTP/1.1" 200 2
2024-04-15 11:30:29,058 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-04-15 11:30:29,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-15 11:30:29,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-15 11:30:30,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-15 11:30:30,921 [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-15 11:30:31,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-15 11:30:31,861 [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-15 11:30:31,862 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-15 11:30:32,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-04-15 11:30:32,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-04-15 11:30:33,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-15 11:30:33,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 11:30:34,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 11:30:34,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-15 11:30:35,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745?per_page=1 HTTP/1.1" 200 2
2024-04-15 11:30:35,095 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-15 11:30:35,095 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:30:35,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-15 11:30:35,096 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:35,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:35,103 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:30:35,108 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:30:35,109 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:30:35,114 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:30:35,119 [ scc.git] DEBUG Already up to date.
2024-04-15 11:30:35,119 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-04-15 11:30:35,574 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-15 11:30:35,574 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-04-15 11:30:35,580 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-15 11:30:35,988 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-15 11:30:35,989 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-15 11:30:35,996 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-04-15 11:30:36,465 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-15 11:30:36,465 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-04-15 11:30:36,471 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-15 11:30:37,325 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-15 11:30:37,325 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-15 11:30:37,330 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-15 11:30:37,755 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-15 11:30:37,755 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-15 11:30:37,760 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:30:37,760 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:37,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:37,766 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-15 11:30:37,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:37,778 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 456 (Don't use tiles for non-big movies) 2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-15 11:30:37,809 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:30:37,812 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-04-15 11:30:37,812 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-04-15 11:30:37,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:30:37,970 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-15 11:30:37,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:37,982 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-15 11:30:38,019 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:30:38,022 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-15 11:30:38,022 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-15 11:30:38,023 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-15 11:30:38,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:30:38,391 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-15 11:30:38,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:38,403 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-15 11:30:38,426 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:30:38,432 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-04-15 11:30:38,432 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-04-15 11:30:38,432 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-04-15 11:30:38,432 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-15 11:30:38,432 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-04-15 11:30:38,433 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-04-15 11:30:38,433 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-04-15 11:30:38,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:30:38,812 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...efda99710532f9743896717e88f0e68ca23ec3b2'
2024-04-15 11:30:38,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:38,826 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) efda99710532f9743896717e88f0e68ca23ec3b2'
2024-04-15 11:30:38,860 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-15 11:30:38,861 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:30:38,866 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-15 11:30:38,866 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-15 11:30:38,866 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-15 11:30:38,866 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-15 11:30:38,866 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-15 11:30:38,866 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-04-15 11:30:38,866 [ scc.git] DEBUG 6 files changed, 284 insertions(+), 6 deletions(-)
2024-04-15 11:30:38,866 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-15 11:30:39,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:30:39,233 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-15 11:30:39,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:39,245 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-15 11:30:39,258 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:30:39,260 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-15 11:30:39,260 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-15 11:30:39,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:30:39,639 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:30:39,682 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:39,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:39,689 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:30:39,730 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:30:39,738 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc253ff5b0> has no local changes
2024-04-15 11:30:39,738 [ 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 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
Generated by OMERO-plugins-push#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:30:39,748 [ scc.git] DEBUG [detached HEAD 5c1e9e2] merge master -Dorg -Ssuccess-only
2024-04-15 11:30:39,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:30:39,749 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:30:40,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-15 11:30:40,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-15 11:30:41,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-15 11:30:41,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-15 11:30:42,188 [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-15 11:30:42,651 [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-15 11:30:43,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-15 11:30:43,535 [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-15 11:30:43,536 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-15 11:30:43,536 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:30:43,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-15 11:30:43,536 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:43,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:43,542 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:30:43,547 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:30:43,548 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:30:43,552 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:30:43,557 [ scc.git] DEBUG Already up to date.
2024-04-15 11:30:43,557 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-15 11:30:43,975 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-15 11:30:43,975 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-15 11:30:43,980 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:30:43,980 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:43,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:43,985 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-15 11:30:43,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:43,996 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-15 11:30:44,009 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:30:44,012 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-15 11:30:44,012 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-15 11:30:44,012 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-15 11:30:44,012 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-15 11:30:44,012 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-15 11:30:44,012 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-15 11:30:44,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:30:44,241 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:30:44,282 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:44,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:44,288 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:30:44,327 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:30:44,334 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc253fb4f0> has no local changes
2024-04-15 11:30:44,335 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:30:44,343 [ scc.git] DEBUG [detached HEAD 71949ad] merge master -Dorg -Ssuccess-only
2024-04-15 11:30:44,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:30:44,343 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:30:44,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-15 11:30:45,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-15 11:30:45,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-15 11:30:46,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-15 11:30:46,686 [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-15 11:30:47,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-15 11:30:47,600 [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-15 11:30:47,601 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-15 11:30:48,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-15 11:30:48,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-15 11:30:49,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-15 11:30:49,532 [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-15 11:30:49,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-15 11:30:50,416 [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-15 11:30:50,416 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-15 11:30:50,416 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:30:50,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-15 11:30:50,417 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:50,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:50,423 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:30:50,427 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:30:50,428 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:30:50,433 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:30:50,438 [ scc.git] DEBUG Already up to date.
2024-04-15 11:30:50,438 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-15 11:30:50,992 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-15 11:30:50,992 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-15 11:30:50,999 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-15 11:30:51,588 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-15 11:30:51,589 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-15 11:30:51,593 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:30:51,593 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:51,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:51,599 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-15 11:30:51,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:51,609 [ 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-15 11:30:51,662 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-15 11:30:51,662 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-15 11:30:51,662 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-15 11:30:51,662 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-15 11:30:51,662 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 11:30:51,663 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 11:30:51,669 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-15 11:30:51,676 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-15 11:30:51,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:30:51,857 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-15 11:30:51,864 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-15 11:30:51,869 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#33](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-15 11:30:51,875 [ scc.config] DEBUG Found github.token
2024-04-15 11:30:51,875 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-15 11:30:51,875 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-15 11:30:51,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:51,889 [ 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-15 11:30:51,922 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-15 11:30:51,922 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-15 11:30:51,922 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-15 11:30:51,922 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 11:30:51,923 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 11:30:51,930 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-15 11:30:51,937 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-15 11:30:52,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:30:52,284 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-15 11:30:52,291 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-15 11:30:52,296 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#33](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/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-15 11:30:52,300 [ scc.config] DEBUG Found github.token
2024-04-15 11:30:52,301 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-15 11:30:52,301 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:30:52,337 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:30:52,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:30:52,343 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:30:52,381 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:30:52,388 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc253ff550> has no local changes
2024-04-15 11:30:52,389 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:30:52,397 [ scc.git] DEBUG [detached HEAD f6d3602] merge master -Dorg -Ssuccess-only
2024-04-15 11:30:52,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:30:52,398 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:30:52,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-15 11:30:53,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-15 11:30:53,304 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-15 11:30:53,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-15 11:30:54,335 [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-15 11:30:54,837 [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-15 11:30:55,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-15 11:30:55,700 [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-15 11:30:55,700 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-15 11:30:56,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-15 11:30:56,160 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-15 11:30:56,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-15 11:30:57,196 [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-15 11:30:57,667 [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-15 11:30:58,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-15 11:30:58,612 [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-15 11:30:58,613 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-15 11:30:59,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-15 11:30:59,093 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-15 11:30:59,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-15 11:31:00,161 [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-15 11:31:00,686 [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-15 11:31:01,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-15 11:31:01,693 [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-15 11:31:01,694 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-15 11:31:02,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-15 11:31:02,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-15 11:31:03,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-15 11:31:03,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-15 11:31:03,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-15 11:31:04,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-15 11:31:04,505 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:04,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-15 11:31:04,505 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:04,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:04,512 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:31:04,518 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:04,518 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:31:04,525 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:31:04,531 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:04,531 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-15 11:31:04,913 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-15 11:31:04,913 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-15 11:31:04,918 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-15 11:31:05,300 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-15 11:31:05,301 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-15 11:31:05,308 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-15 11:31:05,728 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-15 11:31:05,728 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-15 11:31:05,734 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:05,734 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:05,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:05,740 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-15 11:31:05,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:05,750 [ 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-15 11:31:05,761 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:31:05,764 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-15 11:31:05,764 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-15 11:31:05,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:05,915 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-15 11:31:05,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:05,927 [ 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-15 11:31:05,968 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-15 11:31:05,968 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:31:05,972 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-15 11:31:05,972 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-15 11:31:06,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:06,329 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-15 11:31:06,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:06,341 [ 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-15 11:31:06,353 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-15 11:31:06,354 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:31:06,357 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-15 11:31:06,357 [ scc.git] DEBUG package.json | 2 +-
2024-04-15 11:31:06,357 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-15 11:31:06,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:06,753 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:06,794 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:06,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:06,800 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:06,838 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:06,845 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc253d7fd0> has no local changes
2024-04-15 11:31:06,845 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:06,855 [ scc.git] DEBUG [detached HEAD 51d07b7] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:06,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:06,856 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:31:07,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-15 11:31:07,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-15 11:31:08,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-15 11:31:08,804 [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-15 11:31:09,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-15 11:31:09,724 [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-15 11:31:09,725 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-15 11:31:09,726 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:09,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-15 11:31:09,726 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:09,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:09,732 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:31:09,738 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:09,738 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:31:09,745 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:31:09,752 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:09,752 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-15 11:31:10,137 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-15 11:31:10,137 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-15 11:31:10,145 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:10,145 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:10,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:10,155 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-15 11:31:10,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:10,175 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-15 11:31:10,202 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:31:10,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:10,418 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:10,467 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:10,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:10,474 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:10,516 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:10,523 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc24377340> has no local changes
2024-04-15 11:31:10,523 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:10,533 [ scc.git] DEBUG [detached HEAD d918c4c] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:10,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:10,534 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:31:10,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-15 11:31:11,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-15 11:31:11,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-15 11:31:12,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-15 11:31:12,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-15 11:31:13,370 [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-15 11:31:13,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-15 11:31:14,297 [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-15 11:31:14,297 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-15 11:31:14,297 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:14,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-15 11:31:14,298 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:14,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:14,303 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:31:14,308 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:14,308 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:31:14,313 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:31:14,317 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:14,318 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-15 11:31:14,770 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-15 11:31:14,771 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-15 11:31:14,777 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:14,777 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:14,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:14,783 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-15 11:31:14,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:14,796 [ 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-15 11:31:14,806 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-15 11:31:14,806 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:31:14,809 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-15 11:31:14,809 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-15 11:31:14,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:14,978 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:15,019 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:15,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:15,026 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:15,068 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:15,075 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc243b4b20> has no local changes
2024-04-15 11:31:15,075 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:15,083 [ scc.git] DEBUG [detached HEAD f0d257f] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:15,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:15,084 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:31:15,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-15 11:31:15,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-15 11:31:16,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-15 11:31:17,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-15 11:31:17,468 [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-15 11:31:17,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-15 11:31:18,352 [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-15 11:31:18,353 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-15 11:31:18,353 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:18,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-15 11:31:18,353 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:18,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:18,361 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:31:18,366 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:18,367 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:31:18,371 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:31:18,376 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:18,376 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-15 11:31:18,794 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-15 11:31:18,795 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-15 11:31:18,799 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:18,800 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:18,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:18,806 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-15 11:31:18,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:18,819 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-15 11:31:18,853 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-15 11:31:18,854 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-15 11:31:18,854 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-15 11:31:18,854 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-15 11:31:18,854 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-15 11:31:18,854 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-15 11:31:18,854 [ scc.git] DEBUG Auto-merging setup.py
2024-04-15 11:31:18,854 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-15 11:31:18,854 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 11:31:18,854 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 11:31:18,862 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-15 11:31:18,869 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-15 11:31:19,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:19,024 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-15 11:31:19,032 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-15 11:31:19,038 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#33](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
--conflicts
2024-04-15 11:31:19,043 [ scc.config] DEBUG Found github.token
2024-04-15 11:31:19,044 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-15 11:31:19,044 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:19,083 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:19,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:19,090 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:19,127 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:19,133 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc25415e80> has no local changes
2024-04-15 11:31:19,133 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:19,141 [ scc.git] DEBUG [detached HEAD 04313d2] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:19,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:19,142 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:31:19,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-15 11:31:20,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-15 11:31:20,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-15 11:31:20,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-15 11:31:21,407 [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-15 11:31:21,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-15 11:31:22,260 [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-15 11:31:22,261 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-15 11:31:22,261 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:22,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-15 11:31:22,262 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:22,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:22,272 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:31:22,279 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:22,279 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:31:22,286 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:31:22,291 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:22,292 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-15 11:31:22,756 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-15 11:31:22,756 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-15 11:31:22,762 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:22,763 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:22,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:22,770 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-15 11:31:22,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:22,785 [ 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-15 11:31:22,812 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 11:31:22,816 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-15 11:31:22,817 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-15 11:31:22,819 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-15 11:31:22,819 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-15 11:31:22,819 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-15 11:31:22,820 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-15 11:31:22,820 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-15 11:31:22,820 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-15 11:31:22,820 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-15 11:31:22,820 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-15 11:31:22,820 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-15 11:31:22,820 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-15 11:31:22,820 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-15 11:31:22,821 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-15 11:31:22,821 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-15 11:31:22,821 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-15 11:31:22,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:22,976 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:23,096 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:23,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:23,105 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:23,145 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:23,166 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc253d7df0> has no local changes
2024-04-15 11:31:23,167 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:23,176 [ scc.git] DEBUG [detached HEAD 27da711] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:23,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:23,177 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:31:23,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-15 11:31:23,412 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:23,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-15 11:31:23,412 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:23,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:23,419 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:31:23,426 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:23,426 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:31:23,435 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:31:23,443 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:23,443 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:23,443 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:23,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:23,449 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:23,491 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:23,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:23,497 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:23,535 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:23,542 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc2439bfa0> has no local changes
2024-04-15 11:31:23,543 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:23,554 [ scc.git] DEBUG [detached HEAD 41d3502] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:23,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:23,555 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:31:23,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-15 11:31:23,840 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:23,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-15 11:31:23,840 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:23,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:23,848 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:31:23,855 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:23,855 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:31:23,861 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:31:23,867 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:23,867 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:23,867 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:23,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:23,873 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:23,921 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:23,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:23,928 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:23,977 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:23,986 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc24361f70> has no local changes
2024-04-15 11:31:23,987 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:23,997 [ scc.git] DEBUG [detached HEAD ad5997b] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:23,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:23,998 [ scc.git] INFO Overriding base-branch from master to main
2024-04-15 11:31:23,998 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:31:24,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-15 11:31:24,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-15 11:31:25,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-15 11:31:25,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-15 11:31:26,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-15 11:31:26,780 [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-15 11:31:27,224 [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-15 11:31:27,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-15 11:31:28,210 [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-15 11:31:28,210 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-15 11:31:28,211 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:28,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-15 11:31:28,211 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:28,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:28,217 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-15 11:31:28,223 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:28,223 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-15 11:31:28,232 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-15 11:31:28,240 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:28,240 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-15 11:31:28,790 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-15 11:31:28,790 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-15 11:31:28,798 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:28,798 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:28,798 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:28,808 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-15 11:31:28,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:28,823 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-15 11:31:28,861 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-15 11:31:28,861 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-15 11:31:28,861 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 11:31:28,862 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 11:31:28,869 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-15 11:31:28,879 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-15 11:31:29,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:29,043 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-15 11:31:29,050 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-15 11:31:29,056 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#33](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-15 11:31:29,061 [ scc.config] DEBUG Found github.token
2024-04-15 11:31:29,061 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-15 11:31:29,062 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:29,104 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:29,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:29,111 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:29,167 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:29,175 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc24350220> has no local changes
2024-04-15 11:31:29,175 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:29,185 [ scc.git] DEBUG [detached HEAD 42fb663] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:29,186 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:29,186 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:31:29,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-15 11:31:29,477 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:29,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-15 11:31:29,477 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:29,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:29,484 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:31:29,495 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:29,496 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:31:29,506 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:31:29,516 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:29,516 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:29,516 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:29,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:29,525 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:29,581 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:29,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:29,589 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:29,672 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:29,686 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc2437ee50> has no local changes
2024-04-15 11:31:29,686 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:29,704 [ scc.git] DEBUG [detached HEAD 25a07cb] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:29,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:29,704 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:31:29,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-15 11:31:29,900 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:29,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-15 11:31:29,901 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:29,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:29,917 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:31:29,927 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:29,928 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:31:29,940 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:31:29,954 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:29,954 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:29,954 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:29,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:29,967 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:30,089 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:30,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:30,099 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:30,151 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:30,159 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc24297940> has no local changes
2024-04-15 11:31:30,159 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:30,171 [ scc.git] DEBUG [detached HEAD 622b2d8] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:30,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:30,172 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:31:30,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-15 11:31:30,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-15 11:31:31,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-15 11:31:31,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-15 11:31:32,299 [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-15 11:31:32,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-15 11:31:33,180 [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-15 11:31:33,181 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-15 11:31:33,182 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:33,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-15 11:31:33,182 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:33,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:33,192 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 11:31:33,202 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:33,203 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 11:31:33,216 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 11:31:33,232 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:33,233 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-15 11:31:33,701 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-15 11:31:33,701 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-15 11:31:33,705 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:33,706 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:33,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:33,712 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-15 11:31:33,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:33,724 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-15 11:31:33,811 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-15 11:31:33,811 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-15 11:31:33,811 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 11:31:33,811 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 11:31:33,817 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-15 11:31:33,825 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-15 11:31:34,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:34,004 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-15 11:31:34,014 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-15 11:31:34,020 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#33](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-15 11:31:34,028 [ scc.config] DEBUG Found github.token
2024-04-15 11:31:34,029 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-15 11:31:34,029 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:34,076 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:34,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:34,086 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:34,140 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:34,148 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc242f7310> has no local changes
2024-04-15 11:31:34,149 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:34,160 [ scc.git] DEBUG [detached HEAD e43f6f8] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:34,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:34,161 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-15 11:31:34,161 [ scc.repo] DEBUG ## PRs found:
2024-04-15 11:31:34,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-15 11:31:35,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-15 11:31:35,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-15 11:31:35,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-15 11:31:36,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-15 11:31:36,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-15 11:31:37,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-15 11:31:37,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-15 11:31:38,265 [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-15 11:31:38,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-15 11:31:39,122 [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-15 11:31:39,123 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-15 11:31:39,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-15 11:31:40,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-15 11:31:40,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-15 11:31:41,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-15 11:31:41,050 [ scc.repo] DEBUG ## Branches found:
2024-04-15 11:31:41,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-15 11:31:41,050 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:41,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:41,061 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-15 11:31:41,071 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 11:31:41,071 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-15 11:31:41,079 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-15 11:31:41,088 [ scc.git] DEBUG Already up to date.
2024-04-15 11:31:41,089 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-15 11:31:41,508 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-15 11:31:41,509 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-15 11:31:41,515 [ scc.git] DEBUG ## Unique users: []
2024-04-15 11:31:41,515 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:41,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:41,523 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-15 11:31:41,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:41,538 [ 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-15 11:31:41,577 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-15 11:31:41,578 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-15 11:31:41,578 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 11:31:41,578 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 11:31:41,587 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-15 11:31:41,594 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-15 11:31:41,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:41,757 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-15 11:31:41,770 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-15 11:31:41,782 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#33](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-15 11:31:41,794 [ scc.config] DEBUG Found github.token
2024-04-15 11:31:41,794 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-15 11:31:41,795 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 11:31:41,872 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 11:31:41,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 11:31:41,885 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:41,950 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:41,960 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc24297bb0> has no local changes
2024-04-15 11:31:41,960 [ 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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:41,972 [ scc.git] DEBUG [detached HEAD 2ed9ecc] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:41,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:41,973 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 11:31:42,060 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-15 11:31:42,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:42,244 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-15 11:31:42,250 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-15 11:31:42,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:42,671 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-15 11:31:42,676 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-15 11:31:43,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:43,092 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-15 11:31:43,097 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-15 11:31:43,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:43,517 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-15 11:31:43,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:43,919 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-15 11:31:43,925 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-15 11:31:44,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:44,334 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-15 11:31:44,340 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-15 11:31:44,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:44,741 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-15 11:31:44,747 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-15 11:31:45,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:45,145 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-15 11:31:45,150 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-15 11:31:45,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:45,566 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-15 11:31:45,572 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-15 11:31:45,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:45,982 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-15 11:31:45,988 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-15 11:31:46,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:46,389 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-15 11:31:46,395 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-15 11:31:46,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:46,790 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-15 11:31:46,794 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-15 11:31:47,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:47,200 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-15 11:31:47,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:47,608 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-15 11:31:48,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:48,023 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-15 11:31:48,027 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-15 11:31:48,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:48,468 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-15 11:31:48,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:48,883 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-15 11:31:49,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:49,284 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-15 11:31:49,289 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-15 11:31:49,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:49,694 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-15 11:31:49,700 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-15 11:31:50,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:50,112 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-15 11:31:50,119 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-15 11:31:50,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:50,515 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-15 11:31:50,519 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-15 11:31:50,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 11:31:50,926 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-15 11:31:50,927 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 11:31:51,007 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdc26594ac0> has local changes
2024-04-15 11:31:51,007 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
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 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
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#33 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/33/)'
2024-04-15 11:31:51,024 [ scc.git] DEBUG [detached HEAD e8247d0] merge master -Dorg -Ssuccess-only
2024-04-15 11:31:51,025 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-15 11:31:51,025 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-15 11:31:51,025 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,025 [ scc.merge] INFO
2024-04-15 11:31:51,025 [ scc.merge] INFO
2024-04-15 11:31:51,025 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-15 11:31:51,025 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,025 [ scc.merge] INFO
2024-04-15 11:31:51,025 [ scc.merge] INFO
2024-04-15 11:31:51,025 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-15 11:31:51,025 [ scc.merge] INFO Excluded PRs:
2024-04-15 11:31:51,025 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-15 11:31:51,025 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,025 [ scc.merge] INFO
2024-04-15 11:31:51,025 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,025 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-15 11:31:51,025 [ scc.merge] INFO
2024-04-15 11:31:51,025 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-15 11:31:51,025 [ scc.merge] INFO Excluded PRs:
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-15 11:31:51,026 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,026 [ scc.merge] INFO
2024-04-15 11:31:51,026 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-15 11:31:51,026 [ scc.merge] INFO
2024-04-15 11:31:51,026 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-15 11:31:51,026 [ scc.merge] INFO Excluded PRs:
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-15 11:31:51,026 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,026 [ scc.merge] INFO
2024-04-15 11:31:51,026 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-15 11:31:51,026 [ scc.merge] INFO
2024-04-15 11:31:51,026 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-15 11:31:51,026 [ scc.merge] INFO
2024-04-15 11:31:51,026 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-15 11:31:51,026 [ scc.merge] INFO Excluded PRs:
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-15 11:31:51,026 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,026 [ scc.merge] INFO
2024-04-15 11:31:51,026 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-15 11:31:51,026 [ scc.merge] INFO
2024-04-15 11:31:51,026 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-15 11:31:51,026 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,026 [ scc.merge] INFO
2024-04-15 11:31:51,026 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,026 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-15 11:31:51,027 [ scc.merge] INFO
2024-04-15 11:31:51,027 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-15 11:31:51,027 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,027 [ scc.merge] INFO
2024-04-15 11:31:51,027 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-15 11:31:51,027 [ scc.merge] INFO
2024-04-15 11:31:51,027 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-15 11:31:51,027 [ scc.merge] INFO Excluded PRs:
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-15 11:31:51,027 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,027 [ scc.merge] INFO
2024-04-15 11:31:51,027 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-15 11:31:51,027 [ scc.merge] INFO
2024-04-15 11:31:51,027 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-15 11:31:51,027 [ scc.merge] INFO Excluded PRs:
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-15 11:31:51,027 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,027 [ scc.merge] INFO
2024-04-15 11:31:51,027 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-15 11:31:51,027 [ scc.merge] INFO
2024-04-15 11:31:51,027 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-15 11:31:51,027 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,027 [ scc.merge] INFO
2024-04-15 11:31:51,027 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-15 11:31:51,027 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-15 11:31:51,027 [ scc.merge] INFO
2024-04-15 11:31:51,027 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-15 11:31:51,027 [ scc.merge] INFO Excluded PRs:
2024-04-15 11:31:51,028 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-15 11:31:51,028 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-15 11:31:51,028 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-15 11:31:51,028 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,028 [ scc.merge] INFO
2024-04-15 11:31:51,028 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,028 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-15 11:31:51,028 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-15 11:31:51,028 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-15 11:31:51,028 [ scc.merge] INFO
2024-04-15 11:31:51,028 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-15 11:31:51,028 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,028 [ scc.merge] INFO
2024-04-15 11:31:51,028 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,028 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-15 11:31:51,028 [ scc.merge] INFO
2024-04-15 11:31:51,028 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-15 11:31:51,028 [ scc.merge] INFO Excluded PRs:
2024-04-15 11:31:51,028 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-15 11:31:51,028 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,028 [ scc.merge] INFO
2024-04-15 11:31:51,028 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,028 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-15 11:31:51,028 [ scc.merge] INFO
2024-04-15 11:31:51,028 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-15 11:31:51,028 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,028 [ scc.merge] INFO
2024-04-15 11:31:51,028 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 11:31:51,028 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-15 11:31:51,028 [ scc.merge] INFO
2024-04-15 11:31:51,028 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-15 11:31:51,028 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,028 [ scc.merge] INFO
2024-04-15 11:31:51,028 [ scc.merge] INFO Merged PRs:
2024-04-15 11:31:51,028 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-15 11:31:51,028 [ scc.merge] INFO
2024-04-15 11:31:51,028 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-15 11:31:51,029 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-15 11:31:51,029 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-15 11:31:51,029 [ scc.merge] INFO Excluded PRs:
2024-04-15 11:31:51,029 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-15 11:31:51,029 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 11:31:51,029 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-15 11:31:51,029 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-15 11:31:51,029 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-15 11:31:51,029 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 11:31:51,029 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO Repository: ome/scripts
2024-04-15 11:31:51,029 [ scc.merge] INFO Excluded PRs:
2024-04-15 11:31:51,029 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-15 11:31:51,029 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-15 11:31:51,029 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-15 11:31:51,029 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-15 11:31:51,029 [ scc.merge] INFO Already up to date.
2024-04-15 11:31:51,029 [ scc.merge] INFO
2024-04-15 11:31:51,029 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 11:31:51,030 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-15 11:31:51,030 [ scc.merge] INFO
2024-04-15 11:31:51,030 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-15 11:31:51,030 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,036 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-15 11:31:51,036 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-15 11:31:51,043 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-15 11:31:51,048 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-15 11:31:51,054 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-15 11:31:51,059 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-15 11:31:51,065 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-15 11:31:51,071 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-15 11:31:51,076 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-15 11:31:51,080 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-15 11:31:51,085 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-15 11:31:51,090 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-15 11:31:51,096 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-15 11:31:51,103 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-15 11:31:51,109 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-15 11:31:51,113 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-15 11:31:51,118 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-15 11:31:51,123 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-15 11:31:51,127 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-15 11:31:51,132 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-15 11:31:51,136 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-15 11:31:51,141 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 11:31:51,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-15 11:31:51,146 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 11:31:51,152 [ 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 1b2c27a] 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 2078ac7
nothing to commit, working tree clean
[detached HEAD 8c46a00] 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-15 11:32:40,256 [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-15 11:32:49,435 [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-15 11:32:52,851 [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-15 11:32:57,501 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-15 11:33:45,026 [ 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/d0200910/images/svgs/logo.svg){kind=logo}
