Skipping 117 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-03-25 00:43:55,236 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-03-25 00:43:55,236 [ scc.git] DEBUG create mode 100644 src/.env
2024-03-25 00:43:55,236 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-03-25 00:43:55,236 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG create mode 100644 src/index.html
2024-03-25 00:43:55,237 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-03-25 00:43:55,237 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-03-25 00:43:55,237 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-03-25 00:43:55,237 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-03-25 00:43:55,237 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-03-25 00:43:55,237 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-03-25 00:43:55,237 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-03-25 00:43:55,237 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-25 00:43:55,237 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-03-25 00:43:55,237 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-03-25 00:43:55,237 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-03-25 00:43:55,238 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-03-25 00:43:55,238 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-03-25 00:43:55,238 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-03-25 00:43:55,238 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-03-25 00:43:55,238 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-03-25 00:43:55,238 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-03-25 00:43:55,238 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-03-25 00:43:55,238 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-03-25 00:43:55,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:43:55,396 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-25 00:43:55,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:43:55,410 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 548 (Fix cropping of panel labels and float usage for shape labels) 32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-25 00:43:55,431 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:43:55,436 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-03-25 00:43:55,436 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-03-25 00:43:55,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:43:55,806 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:43:55,849 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:43:55,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:43:55,855 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:43:55,896 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:43:55,908 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38ff4f5fd0> has no local changes
2024-03-25 00:43:55,908 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
Generated by OMERO-plugins-push#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:43:55,921 [ scc.git] DEBUG [detached HEAD 956bcbe2] merge master -Dorg -Ssuccess-only
2024-03-25 00:43:55,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:43:55,922 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:43:56,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-03-25 00:43:56,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-03-25 00:43:57,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-03-25 00:43:57,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-25 00:43:58,130 [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-03-25 00:43:58,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-25 00:43:59,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:43:59,009 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-03-25 00:43:59,009 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:43:59,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-25 00:43:59,009 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:43:59,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:43:59,015 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:43:59,020 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:43:59,020 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:43:59,025 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:43:59,031 [ scc.git] DEBUG Already up to date.
2024-03-25 00:43:59,031 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-03-25 00:43:59,441 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-03-25 00:43:59,441 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-03-25 00:43:59,447 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:43:59,447 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:43:59,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:43:59,454 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-25 00:43:59,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:43:59,466 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-25 00:43:59,492 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-03-25 00:43:59,492 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:43:59,495 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-03-25 00:43:59,495 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-03-25 00:43:59,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:43:59,652 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:43:59,701 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:43:59,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:43:59,708 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:43:59,753 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:43:59,762 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fe46c4f0> has no local changes
2024-03-25 00:43:59,763 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:43:59,772 [ scc.git] DEBUG [detached HEAD 1e51ab4] merge master -Dorg -Ssuccess-only
2024-03-25 00:43:59,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:43:59,773 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:44:00,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-03-25 00:44:00,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-03-25 00:44:00,615 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-25 00:44:01,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-25 00:44:01,636 [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-03-25 00:44:02,120 [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-03-25 00:44:02,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-25 00:44:03,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:03,052 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-25 00:44:03,052 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:44:03,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-25 00:44:03,052 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:03,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:03,058 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:44:03,064 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:44:03,065 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:44:03,072 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:44:03,079 [ scc.git] DEBUG Already up to date.
2024-03-25 00:44:03,079 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-03-25 00:44:03,468 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-03-25 00:44:03,469 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-03-25 00:44:03,474 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:44:03,474 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:03,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:03,482 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-03-25 00:44:03,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:03,495 [ 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-03-25 00:44:03,505 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:03,509 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-03-25 00:44:03,509 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-03-25 00:44:03,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:03,663 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:44:03,703 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:03,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:03,708 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:44:03,750 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:44:03,760 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fe46fa90> has no local changes
2024-03-25 00:44:03,760 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:44:03,774 [ scc.git] DEBUG [detached HEAD 29feb78] merge master -Dorg -Ssuccess-only
2024-03-25 00:44:03,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:44:03,775 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:44:04,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-03-25 00:44:04,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-03-25 00:44:04,629 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-25 00:44:05,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-25 00:44:05,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-25 00:44:06,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-25 00:44:06,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-25 00:44:07,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/78e253cccecbd349db3bcb16514f5c8b2c4185e6?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:07,088 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-25 00:44:07,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-03-25 00:44:08,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061 HTTP/1.1" 200 None
2024-03-25 00:44:08,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-25 00:44:08,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-25 00:44:09,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061 HTTP/1.1" 200 None
2024-03-25 00:44:09,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/9f22ba44a88528bde6fa49c5bab1736ee00e9061?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:09,813 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-03-25 00:44:10,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-03-25 00:44:10,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-03-25 00:44:11,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-25 00:44:11,831 [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-03-25 00:44:12,293 [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-03-25 00:44:12,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-25 00:44:13,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/97542d9b749f93d4902f7dce703bbf2a04316a98?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:13,126 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-03-25 00:44:13,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-03-25 00:44:14,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-03-25 00:44:14,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-25 00:44:14,960 [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-03-25 00:44:15,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-25 00:44:15,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:15,924 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-03-25 00:44:16,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-03-25 00:44:16,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-03-25 00:44:17,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-25 00:44:17,824 [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-03-25 00:44:18,292 [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-03-25 00:44:18,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-25 00:44:19,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:19,139 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-25 00:44:19,139 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:44:19,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-25 00:44:19,139 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:19,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:19,146 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:44:19,152 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:44:19,152 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:44:19,159 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:44:19,166 [ scc.git] DEBUG Already up to date.
2024-03-25 00:44:19,166 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-03-25 00:44:19,677 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-25 00:44:19,677 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-03-25 00:44:19,683 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-03-25 00:44:20,170 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-25 00:44:20,170 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-03-25 00:44:20,176 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-03-25 00:44:20,718 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-25 00:44:20,718 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-03-25 00:44:20,726 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-03-25 00:44:21,458 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-25 00:44:21,458 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-03-25 00:44:21,464 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-03-25 00:44:21,858 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-25 00:44:21,858 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-03-25 00:44:21,862 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:44:21,863 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:21,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:21,869 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-03-25 00:44:21,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:21,881 [ 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-03-25 00:44:21,900 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:21,904 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-03-25 00:44:21,904 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-03-25 00:44:22,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:22,061 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-25 00:44:22,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:22,073 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-25 00:44:22,120 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:22,124 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-03-25 00:44:22,124 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-03-25 00:44:22,124 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-03-25 00:44:22,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:22,473 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-25 00:44:22,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:22,486 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-25 00:44:22,560 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:22,565 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-03-25 00:44:22,566 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-03-25 00:44:22,566 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-03-25 00:44:22,566 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-03-25 00:44:22,566 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-03-25 00:44:22,566 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-03-25 00:44:22,566 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-03-25 00:44:22,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:22,885 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f22ba44a88528bde6fa49c5bab1736ee00e9061'
2024-03-25 00:44:22,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:22,899 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 9f22ba44a88528bde6fa49c5bab1736ee00e9061'
2024-03-25 00:44:22,968 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-03-25 00:44:22,969 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:22,974 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 7 +-
2024-03-25 00:44:22,974 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-03-25 00:44:22,974 [ scc.git] DEBUG src/app/header.html | 5 ++
2024-03-25 00:44:22,974 [ scc.git] DEBUG src/app/header.js | 45 +++++++++-
2024-03-25 00:44:22,974 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-03-25 00:44:22,974 [ scc.git] DEBUG src/utils/figure.js | 203 ++++++++++++++++++++++++++++++++++++++++++
2024-03-25 00:44:22,974 [ scc.git] DEBUG 6 files changed, 269 insertions(+), 3 deletions(-)
2024-03-25 00:44:22,974 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-03-25 00:44:23,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:23,297 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-25 00:44:23,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:23,323 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 467 (Bump webpack-dev-middleware from 5.3.3 to 5.3.4) 78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-25 00:44:23,354 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:23,364 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-03-25 00:44:23,364 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-03-25 00:44:23,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:23,722 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:44:23,768 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:23,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:23,774 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:44:23,817 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:44:23,827 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38ff4b6f40> has no local changes
2024-03-25 00:44:23,827 [ 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 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
Generated by OMERO-plugins-push#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:44:23,840 [ scc.git] DEBUG [detached HEAD 7a60905] merge master -Dorg -Ssuccess-only
2024-03-25 00:44:23,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:44:23,840 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:44:24,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-03-25 00:44:24,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-03-25 00:44:25,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-03-25 00:44:25,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-25 00:44:26,327 [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-03-25 00:44:26,811 [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-03-25 00:44:27,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-25 00:44:27,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:27,739 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-03-25 00:44:27,739 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:44:27,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-25 00:44:27,739 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:27,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:27,745 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:44:27,751 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:44:27,752 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:44:27,758 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:44:27,765 [ scc.git] DEBUG Already up to date.
2024-03-25 00:44:27,765 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-03-25 00:44:28,159 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-03-25 00:44:28,159 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-03-25 00:44:28,165 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:44:28,165 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:28,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:28,176 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-25 00:44:28,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:28,228 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-25 00:44:28,239 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:28,242 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-03-25 00:44:28,243 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-03-25 00:44:28,243 [ scc.git] DEBUG requirements.txt | 2 +-
2024-03-25 00:44:28,243 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-03-25 00:44:28,243 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-03-25 00:44:28,243 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-03-25 00:44:28,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:28,396 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:44:28,440 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:28,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:28,447 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:44:28,488 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:44:28,495 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38ff4c1220> has no local changes
2024-03-25 00:44:28,496 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:44:28,505 [ scc.git] DEBUG [detached HEAD cd90d7e] merge master -Dorg -Ssuccess-only
2024-03-25 00:44:28,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:44:28,506 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:44:28,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-03-25 00:44:29,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-03-25 00:44:29,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-03-25 00:44:30,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-25 00:44:30,865 [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-03-25 00:44:31,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-25 00:44:31,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-25 00:44:32,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:32,288 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-25 00:44:32,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-03-25 00:44:33,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-03-25 00:44:33,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-25 00:44:34,094 [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-03-25 00:44:34,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-25 00:44:35,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:35,006 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-25 00:44:35,006 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:44:35,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-25 00:44:35,006 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:35,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:35,013 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:44:35,018 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:44:35,019 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:44:35,024 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:44:35,029 [ scc.git] DEBUG Already up to date.
2024-03-25 00:44:35,029 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-03-25 00:44:35,586 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-25 00:44:35,586 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-03-25 00:44:35,592 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-03-25 00:44:36,202 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-25 00:44:36,203 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-03-25 00:44:36,208 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:44:36,208 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:36,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:36,215 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-25 00:44:36,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:36,229 [ 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-03-25 00:44:36,331 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-03-25 00:44:36,331 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-03-25 00:44:36,331 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-25 00:44:36,332 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-25 00:44:36,332 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-25 00:44:36,332 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-25 00:44:36,338 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-25 00:44:36,347 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-25 00:44:36,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:36,498 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-25 00:44:36,505 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-25 00:44:36,512 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#10](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-03-25 00:44:36,518 [ scc.config] DEBUG Found github.token
2024-03-25 00:44:36,518 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-03-25 00:44:36,518 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-25 00:44:36,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:36,531 [ 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-03-25 00:44:36,551 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-25 00:44:36,552 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-25 00:44:36,552 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-03-25 00:44:36,552 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-25 00:44:36,552 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-25 00:44:36,559 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-25 00:44:36,567 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-25 00:44:36,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:36,909 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-25 00:44:36,917 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-25 00:44:36,925 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#10](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/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-03-25 00:44:36,931 [ scc.config] DEBUG Found github.token
2024-03-25 00:44:36,931 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-03-25 00:44:36,932 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:44:36,976 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:36,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:37,004 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:44:37,061 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:44:37,070 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38ff4b8e80> has no local changes
2024-03-25 00:44:37,071 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:44:37,081 [ scc.git] DEBUG [detached HEAD 659a504] merge master -Dorg -Ssuccess-only
2024-03-25 00:44:37,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:44:37,082 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:44:37,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-03-25 00:44:37,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-03-25 00:44:37,867 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-25 00:44:38,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-25 00:44:38,909 [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-03-25 00:44:39,387 [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-03-25 00:44:39,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-25 00:44:40,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:40,318 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-25 00:44:40,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-03-25 00:44:40,785 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-25 00:44:41,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-25 00:44:41,756 [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-03-25 00:44:42,252 [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-03-25 00:44:42,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-25 00:44:43,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:43,138 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-25 00:44:43,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-03-25 00:44:43,612 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-25 00:44:44,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-25 00:44:44,622 [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-03-25 00:44:45,137 [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-03-25 00:44:45,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-25 00:44:46,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:46,106 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-25 00:44:46,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-03-25 00:44:46,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-03-25 00:44:47,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-03-25 00:44:47,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-03-25 00:44:48,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-03-25 00:44:48,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-03-25 00:44:48,931 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:44:48,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-25 00:44:48,931 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:48,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:48,937 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:44:48,942 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:44:48,943 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:44:48,949 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:44:48,956 [ scc.git] DEBUG Already up to date.
2024-03-25 00:44:48,956 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-03-25 00:44:49,348 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-25 00:44:49,349 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-03-25 00:44:49,353 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-03-25 00:44:49,744 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-25 00:44:49,744 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-03-25 00:44:49,749 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-03-25 00:44:50,135 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-25 00:44:50,135 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-03-25 00:44:50,140 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:44:50,140 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:50,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:50,146 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-03-25 00:44:50,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:50,157 [ 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-03-25 00:44:50,169 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:50,171 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-03-25 00:44:50,172 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-03-25 00:44:50,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:50,330 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-03-25 00:44:50,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:50,346 [ 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-03-25 00:44:50,391 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-25 00:44:50,391 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:50,395 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-03-25 00:44:50,395 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-03-25 00:44:50,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:50,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-03-25 00:44:50,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:50,768 [ 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-03-25 00:44:50,798 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-25 00:44:50,799 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:50,802 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-03-25 00:44:50,802 [ scc.git] DEBUG package.json | 2 +-
2024-03-25 00:44:50,802 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-03-25 00:44:51,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:51,171 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:44:51,215 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:51,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:51,221 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:44:51,265 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:44:51,272 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc3caf10> has no local changes
2024-03-25 00:44:51,273 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:44:51,282 [ scc.git] DEBUG [detached HEAD c25facd] merge master -Dorg -Ssuccess-only
2024-03-25 00:44:51,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:44:51,283 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:44:51,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-03-25 00:44:52,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-03-25 00:44:52,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-25 00:44:53,084 [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-03-25 00:44:53,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-25 00:44:53,969 [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-03-25 00:44:53,969 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-03-25 00:44:53,969 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:44:53,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-25 00:44:53,970 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:53,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:53,976 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:44:53,982 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:44:53,982 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:44:53,987 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:44:53,994 [ scc.git] DEBUG Already up to date.
2024-03-25 00:44:53,994 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-25 00:44:54,372 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-03-25 00:44:54,372 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-25 00:44:54,376 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:44:54,376 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:54,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:54,382 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-25 00:44:54,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:54,393 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-25 00:44:54,403 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:54,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:54,564 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:44:54,604 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:54,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:54,610 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:44:54,651 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:44:54,657 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc41a250> has no local changes
2024-03-25 00:44:54,657 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:44:54,665 [ scc.git] DEBUG [detached HEAD 20a8802] merge master -Dorg -Ssuccess-only
2024-03-25 00:44:54,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:44:54,666 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:44:55,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-03-25 00:44:55,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-03-25 00:44:55,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-03-25 00:44:56,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-03-25 00:44:56,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-25 00:44:57,345 [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-03-25 00:44:57,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-25 00:44:58,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:44:58,182 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-25 00:44:58,182 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:44:58,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-25 00:44:58,182 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:58,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:58,188 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:44:58,193 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:44:58,193 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:44:58,198 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:44:58,203 [ scc.git] DEBUG Already up to date.
2024-03-25 00:44:58,204 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-03-25 00:44:58,657 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-03-25 00:44:58,657 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-03-25 00:44:58,662 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:44:58,662 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:58,662 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:58,668 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-03-25 00:44:58,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:58,680 [ 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-03-25 00:44:58,690 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-03-25 00:44:58,690 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:44:58,693 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-03-25 00:44:58,693 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-03-25 00:44:58,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:44:58,858 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:44:58,902 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:44:58,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:44:58,908 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:44:58,951 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:44:58,958 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc428550> has no local changes
2024-03-25 00:44:58,958 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:44:58,967 [ scc.git] DEBUG [detached HEAD 33e225c] merge master -Dorg -Ssuccess-only
2024-03-25 00:44:58,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:44:58,968 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:44:59,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-03-25 00:44:59,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-03-25 00:45:00,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-03-25 00:45:00,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-25 00:45:01,288 [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-03-25 00:45:01,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-25 00:45:02,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:45:02,247 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-25 00:45:02,247 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:45:02,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-25 00:45:02,247 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:02,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:02,254 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:45:02,259 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:45:02,259 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:45:02,265 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:45:02,272 [ scc.git] DEBUG Already up to date.
2024-03-25 00:45:02,272 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-25 00:45:02,682 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-03-25 00:45:02,682 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-25 00:45:02,687 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:45:02,687 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:02,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:02,695 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-25 00:45:02,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:02,704 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-25 00:45:02,766 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-03-25 00:45:02,766 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-03-25 00:45:02,766 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-03-25 00:45:02,766 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-03-25 00:45:02,766 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-03-25 00:45:02,766 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-03-25 00:45:02,766 [ scc.git] DEBUG Auto-merging setup.py
2024-03-25 00:45:02,766 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-03-25 00:45:02,766 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-25 00:45:02,767 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-25 00:45:02,773 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-25 00:45:02,782 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-03-25 00:45:02,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:02,945 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-25 00:45:02,953 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-25 00:45:02,960 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#10](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-03-25 00:45:02,966 [ scc.config] DEBUG Found github.token
2024-03-25 00:45:02,966 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-03-25 00:45:02,967 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:45:03,012 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:03,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:03,018 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:45:03,059 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:45:03,066 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc41a490> has no local changes
2024-03-25 00:45:03,066 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:45:03,074 [ scc.git] DEBUG [detached HEAD f4f6368] merge master -Dorg -Ssuccess-only
2024-03-25 00:45:03,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:03,075 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:45:03,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-03-25 00:45:03,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-03-25 00:45:04,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-03-25 00:45:04,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-25 00:45:05,353 [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-03-25 00:45:05,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-25 00:45:06,244 [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-03-25 00:45:06,244 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-25 00:45:06,245 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:45:06,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-25 00:45:06,245 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:06,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:06,250 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:45:06,255 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:45:06,255 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:45:06,261 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:45:06,267 [ scc.git] DEBUG Already up to date.
2024-03-25 00:45:06,267 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-03-25 00:45:06,773 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-03-25 00:45:06,773 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-03-25 00:45:06,778 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:45:06,778 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:06,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:06,784 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-03-25 00:45:06,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:06,796 [ 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-03-25 00:45:06,829 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-25 00:45:06,832 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-03-25 00:45:06,833 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-03-25 00:45:06,833 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-03-25 00:45:06,833 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-03-25 00:45:06,833 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-03-25 00:45:06,833 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-03-25 00:45:06,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-03-25 00:45:06,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-03-25 00:45:06,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-03-25 00:45:06,833 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-03-25 00:45:06,835 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-03-25 00:45:06,835 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-03-25 00:45:06,835 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-03-25 00:45:06,835 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-03-25 00:45:06,835 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-03-25 00:45:06,836 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-03-25 00:45:06,836 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-03-25 00:45:06,836 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-03-25 00:45:06,836 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-03-25 00:45:06,836 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-03-25 00:45:06,836 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-03-25 00:45:06,836 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-03-25 00:45:06,836 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-03-25 00:45:06,836 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-03-25 00:45:06,837 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-03-25 00:45:06,837 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-03-25 00:45:06,837 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-03-25 00:45:06,837 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-03-25 00:45:06,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:06,996 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:45:07,037 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:07,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:07,043 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:45:07,087 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:45:07,095 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc3ca370> has no local changes
2024-03-25 00:45:07,095 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:45:07,118 [ scc.git] DEBUG [detached HEAD 91562f9] merge master -Dorg -Ssuccess-only
2024-03-25 00:45:07,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:07,119 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:45:07,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-03-25 00:45:07,421 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:45:07,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-25 00:45:07,421 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:07,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:07,428 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:45:07,433 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:45:07,433 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:45:07,440 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:45:07,455 [ scc.git] DEBUG Already up to date.
2024-03-25 00:45:07,455 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:45:07,455 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:07,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:07,462 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:45:07,505 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:07,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:07,511 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:45:07,554 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:45:07,560 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc419fa0> has no local changes
2024-03-25 00:45:07,561 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:45:07,570 [ scc.git] DEBUG [detached HEAD f9ce20b] merge master -Dorg -Ssuccess-only
2024-03-25 00:45:07,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:07,570 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:45:07,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-03-25 00:45:07,837 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:45:07,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-25 00:45:07,837 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:07,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:07,843 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:45:07,849 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:45:07,849 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:45:07,854 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:45:07,859 [ scc.git] DEBUG Already up to date.
2024-03-25 00:45:07,859 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:45:07,859 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:07,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:07,863 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:45:07,904 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:07,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:07,911 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:45:07,960 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:45:07,967 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc3dbfd0> has no local changes
2024-03-25 00:45:07,967 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:45:07,976 [ scc.git] DEBUG [detached HEAD d38f50a] merge master -Dorg -Ssuccess-only
2024-03-25 00:45:07,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:07,976 [ scc.git] INFO Overriding base-branch from master to main
2024-03-25 00:45:07,977 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:45:08,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-03-25 00:45:08,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-03-25 00:45:09,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-03-25 00:45:09,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-03-25 00:45:10,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-25 00:45:10,704 [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-03-25 00:45:11,155 [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-03-25 00:45:11,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-25 00:45:12,070 [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-03-25 00:45:12,071 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-25 00:45:12,071 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:45:12,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-25 00:45:12,072 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:12,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:12,079 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-03-25 00:45:12,085 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:45:12,086 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-03-25 00:45:12,092 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-03-25 00:45:12,099 [ scc.git] DEBUG Already up to date.
2024-03-25 00:45:12,100 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-03-25 00:45:12,555 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-03-25 00:45:12,556 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-03-25 00:45:12,561 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:45:12,561 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:12,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:12,567 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-25 00:45:12,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:12,580 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-25 00:45:12,603 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-03-25 00:45:12,603 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-03-25 00:45:12,603 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-25 00:45:12,604 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-25 00:45:12,611 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-25 00:45:12,618 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-03-25 00:45:12,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:12,773 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-25 00:45:12,781 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-25 00:45:12,787 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#10](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-03-25 00:45:12,792 [ scc.config] DEBUG Found github.token
2024-03-25 00:45:12,792 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-03-25 00:45:12,792 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:45:12,837 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:12,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:12,843 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:45:12,889 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:45:12,896 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc355fd0> has no local changes
2024-03-25 00:45:12,896 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:45:12,906 [ scc.git] DEBUG [detached HEAD 4ffb686] merge master -Dorg -Ssuccess-only
2024-03-25 00:45:12,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:12,907 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:45:13,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-03-25 00:45:13,208 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:45:13,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-25 00:45:13,209 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:13,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:13,215 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:45:13,220 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:45:13,221 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:45:13,226 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:45:13,230 [ scc.git] DEBUG Already up to date.
2024-03-25 00:45:13,231 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:45:13,231 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:13,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:13,235 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:45:13,274 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:13,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:13,279 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:45:13,315 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:45:13,322 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc3dbf10> has no local changes
2024-03-25 00:45:13,322 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:45:13,329 [ scc.git] DEBUG [detached HEAD da2c13c] merge master -Dorg -Ssuccess-only
2024-03-25 00:45:13,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:13,330 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:45:13,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-03-25 00:45:13,620 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:45:13,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-25 00:45:13,620 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:13,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:13,627 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:45:13,633 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:45:13,633 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:45:13,638 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:45:13,643 [ scc.git] DEBUG Already up to date.
2024-03-25 00:45:13,643 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:45:13,643 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:13,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:13,648 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:45:13,685 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:13,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:13,692 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:45:13,727 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:45:13,734 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc369520> has no local changes
2024-03-25 00:45:13,734 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:45:13,742 [ scc.git] DEBUG [detached HEAD e1c6bf9] merge master -Dorg -Ssuccess-only
2024-03-25 00:45:13,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:13,742 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:45:14,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-03-25 00:45:14,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-03-25 00:45:15,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-03-25 00:45:15,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-25 00:45:15,958 [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-03-25 00:45:16,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-25 00:45:16,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:45:16,947 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-03-25 00:45:16,947 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:45:16,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-25 00:45:16,948 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:16,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:16,954 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-25 00:45:16,960 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:45:16,960 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-25 00:45:16,967 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-25 00:45:16,973 [ scc.git] DEBUG Already up to date.
2024-03-25 00:45:16,973 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-03-25 00:45:17,453 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-03-25 00:45:17,453 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-03-25 00:45:17,459 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:45:17,459 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:17,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:17,467 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-25 00:45:17,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:17,479 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-25 00:45:17,531 [ scc.git] DEBUG Auto-merging Dockerfile
2024-03-25 00:45:17,531 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-03-25 00:45:17,531 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-25 00:45:17,532 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-25 00:45:17,538 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-25 00:45:17,546 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-03-25 00:45:17,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:17,708 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-25 00:45:17,714 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-25 00:45:17,719 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#10](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-03-25 00:45:17,724 [ scc.config] DEBUG Found github.token
2024-03-25 00:45:17,724 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-03-25 00:45:17,724 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:45:17,761 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:17,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:17,766 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:45:17,802 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:45:17,809 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc36ebb0> has no local changes
2024-03-25 00:45:17,809 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:45:17,817 [ scc.git] DEBUG [detached HEAD c23a959] merge master -Dorg -Ssuccess-only
2024-03-25 00:45:17,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:17,818 [ scc.git] INFO Overriding base-branch from master to develop
2024-03-25 00:45:17,818 [ scc.repo] DEBUG ## PRs found:
2024-03-25 00:45:18,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-03-25 00:45:18,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-03-25 00:45:19,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-03-25 00:45:19,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-03-25 00:45:20,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-03-25 00:45:20,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-03-25 00:45:21,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-03-25 00:45:21,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-25 00:45:21,937 [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-03-25 00:45:22,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-25 00:45:22,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-03-25 00:45:22,809 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-25 00:45:23,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-03-25 00:45:23,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-03-25 00:45:24,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-03-25 00:45:24,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-03-25 00:45:24,722 [ scc.repo] DEBUG ## Branches found:
2024-03-25 00:45:24,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-25 00:45:24,723 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:24,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:24,729 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-03-25 00:45:24,736 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-25 00:45:24,736 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-03-25 00:45:24,742 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-03-25 00:45:24,749 [ scc.git] DEBUG Already up to date.
2024-03-25 00:45:24,750 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-03-25 00:45:25,247 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-03-25 00:45:25,248 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-03-25 00:45:25,253 [ scc.git] DEBUG ## Unique users: []
2024-03-25 00:45:25,254 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:25,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:25,261 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-25 00:45:25,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:25,275 [ 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-03-25 00:45:25,320 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-03-25 00:45:25,320 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-03-25 00:45:25,320 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-25 00:45:25,321 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-25 00:45:25,328 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-25 00:45:25,335 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-03-25 00:45:25,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:25,509 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-25 00:45:25,517 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-25 00:45:25,524 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#10](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-03-25 00:45:25,529 [ scc.config] DEBUG Found github.token
2024-03-25 00:45:25,530 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-03-25 00:45:25,530 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-25 00:45:25,572 [ scc.git] DEBUG Get sha1 of %s
2024-03-25 00:45:25,572 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-25 00:45:25,578 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:45:25,621 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:45:25,628 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f38fc379b50> has no local changes
2024-03-25 00:45:25,629 [ 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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:45:25,637 [ scc.git] DEBUG [detached HEAD e136ccd] merge master -Dorg -Ssuccess-only
2024-03-25 00:45:25,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:25,638 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-25 00:45:25,752 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-03-25 00:45:25,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:25,966 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-03-25 00:45:25,972 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-03-25 00:45:26,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:26,386 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-03-25 00:45:26,390 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-03-25 00:45:26,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:26,799 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-03-25 00:45:26,804 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-03-25 00:45:27,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:27,215 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-03-25 00:45:27,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:27,609 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-03-25 00:45:27,615 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-03-25 00:45:28,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:28,018 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-03-25 00:45:28,022 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-03-25 00:45:28,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:28,430 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-03-25 00:45:28,435 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-03-25 00:45:28,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:28,846 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-03-25 00:45:28,852 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-03-25 00:45:29,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:29,248 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-03-25 00:45:29,253 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-03-25 00:45:29,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:29,658 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-03-25 00:45:29,664 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-03-25 00:45:30,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:30,063 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-03-25 00:45:30,070 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-03-25 00:45:30,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:30,464 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-03-25 00:45:30,470 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-03-25 00:45:30,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:30,923 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-03-25 00:45:31,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:31,328 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-03-25 00:45:31,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:31,723 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-03-25 00:45:31,730 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-03-25 00:45:32,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:32,135 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-03-25 00:45:32,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:32,536 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-03-25 00:45:32,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:32,939 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-03-25 00:45:32,943 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-03-25 00:45:33,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:33,343 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-03-25 00:45:33,349 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-03-25 00:45:33,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:33,748 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-03-25 00:45:33,753 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-03-25 00:45:34,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:34,154 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-03-25 00:45:34,159 [ scc.config] DEBUG Found submodule.scripts.url
2024-03-25 00:45:34,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-25 00:45:34,567 [ scc.config] DEBUG Found submodule.scripts.branch
2024-03-25 00:45:34,567 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-25 00:45:34,660 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f390079baf0> has local changes
2024-03-25 00:45:34,660 [ 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 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 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
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 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
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#10 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/10/)'
2024-03-25 00:45:34,676 [ scc.git] DEBUG [detached HEAD cd668ba] merge master -Dorg -Ssuccess-only
2024-03-25 00:45:34,676 [ scc.merge] INFO Repository: ome/omero-plugins
2024-03-25 00:45:34,676 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-03-25 00:45:34,676 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,676 [ scc.merge] INFO
2024-03-25 00:45:34,676 [ scc.merge] INFO
2024-03-25 00:45:34,676 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-03-25 00:45:34,676 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,676 [ scc.merge] INFO
2024-03-25 00:45:34,676 [ scc.merge] INFO
2024-03-25 00:45:34,676 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-03-25 00:45:34,676 [ scc.merge] INFO Excluded PRs:
2024-03-25 00:45:34,676 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-03-25 00:45:34,676 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,677 [ scc.merge] INFO
2024-03-25 00:45:34,677 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-03-25 00:45:34,677 [ scc.merge] INFO
2024-03-25 00:45:34,677 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-03-25 00:45:34,677 [ scc.merge] INFO Excluded PRs:
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-03-25 00:45:34,677 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,677 [ scc.merge] INFO
2024-03-25 00:45:34,677 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-03-25 00:45:34,677 [ scc.merge] INFO
2024-03-25 00:45:34,677 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-03-25 00:45:34,677 [ scc.merge] INFO Excluded PRs:
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-03-25 00:45:34,677 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,677 [ scc.merge] INFO
2024-03-25 00:45:34,677 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-03-25 00:45:34,677 [ scc.merge] INFO
2024-03-25 00:45:34,677 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-03-25 00:45:34,677 [ scc.merge] INFO
2024-03-25 00:45:34,677 [ scc.merge] INFO Repository: ome/omero-figure
2024-03-25 00:45:34,677 [ scc.merge] INFO Excluded PRs:
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-03-25 00:45:34,677 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,677 [ scc.merge] INFO
2024-03-25 00:45:34,677 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,677 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-03-25 00:45:34,678 [ scc.merge] INFO
2024-03-25 00:45:34,678 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-03-25 00:45:34,678 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,678 [ scc.merge] INFO
2024-03-25 00:45:34,678 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-03-25 00:45:34,678 [ scc.merge] INFO
2024-03-25 00:45:34,678 [ scc.merge] INFO Repository: ome/omero-gallery
2024-03-25 00:45:34,678 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,678 [ scc.merge] INFO
2024-03-25 00:45:34,678 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-25 00:45:34,678 [ scc.merge] INFO
2024-03-25 00:45:34,678 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-03-25 00:45:34,678 [ scc.merge] INFO Excluded PRs:
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-03-25 00:45:34,678 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,678 [ scc.merge] INFO
2024-03-25 00:45:34,678 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-25 00:45:34,678 [ scc.merge] INFO
2024-03-25 00:45:34,678 [ scc.merge] INFO Repository: ome/omero-mapr
2024-03-25 00:45:34,678 [ scc.merge] INFO Excluded PRs:
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-03-25 00:45:34,678 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,678 [ scc.merge] INFO
2024-03-25 00:45:34,678 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,678 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-03-25 00:45:34,679 [ scc.merge] INFO
2024-03-25 00:45:34,679 [ scc.merge] INFO Repository: ome/omero-metadata
2024-03-25 00:45:34,679 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,679 [ scc.merge] INFO
2024-03-25 00:45:34,679 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-25 00:45:34,679 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-25 00:45:34,679 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-25 00:45:34,679 [ scc.merge] INFO
2024-03-25 00:45:34,679 [ scc.merge] INFO Repository: ome/omero-parade
2024-03-25 00:45:34,679 [ scc.merge] INFO Excluded PRs:
2024-03-25 00:45:34,679 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-03-25 00:45:34,679 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-03-25 00:45:34,679 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-03-25 00:45:34,679 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,679 [ scc.merge] INFO
2024-03-25 00:45:34,679 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,679 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-25 00:45:34,679 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-25 00:45:34,679 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-25 00:45:34,679 [ scc.merge] INFO
2024-03-25 00:45:34,679 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-03-25 00:45:34,679 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,679 [ scc.merge] INFO
2024-03-25 00:45:34,679 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,679 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-03-25 00:45:34,679 [ scc.merge] INFO
2024-03-25 00:45:34,679 [ scc.merge] INFO Repository: ome/omero-rois
2024-03-25 00:45:34,679 [ scc.merge] INFO Excluded PRs:
2024-03-25 00:45:34,679 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-25 00:45:34,679 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,679 [ scc.merge] INFO
2024-03-25 00:45:34,679 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,679 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-25 00:45:34,679 [ scc.merge] INFO
2024-03-25 00:45:34,679 [ scc.merge] INFO Repository: ome/omero-signup
2024-03-25 00:45:34,679 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-25 00:45:34,680 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-03-25 00:45:34,680 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO Merged PRs:
2024-03-25 00:45:34,680 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO Repository: ome/omero-upload
2024-03-25 00:45:34,680 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-03-25 00:45:34,680 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-03-25 00:45:34,680 [ scc.merge] INFO Excluded PRs:
2024-03-25 00:45:34,680 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-03-25 00:45:34,680 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-25 00:45:34,680 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-03-25 00:45:34,680 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-03-25 00:45:34,680 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO
2024-03-25 00:45:34,680 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-03-25 00:45:34,681 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,681 [ scc.merge] INFO
2024-03-25 00:45:34,681 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-25 00:45:34,681 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-03-25 00:45:34,681 [ scc.merge] INFO
2024-03-25 00:45:34,681 [ scc.merge] INFO Repository: ome/scripts
2024-03-25 00:45:34,681 [ scc.merge] INFO Excluded PRs:
2024-03-25 00:45:34,681 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-03-25 00:45:34,681 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-03-25 00:45:34,681 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-03-25 00:45:34,681 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-03-25 00:45:34,681 [ scc.merge] INFO Already up to date.
2024-03-25 00:45:34,681 [ scc.merge] INFO
2024-03-25 00:45:34,681 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-25 00:45:34,681 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-25 00:45:34,681 [ scc.merge] INFO
2024-03-25 00:45:34,681 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-25 00:45:34,681 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-03-25 00:45:34,687 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-03-25 00:45:34,693 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-03-25 00:45:34,699 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-03-25 00:45:34,705 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-03-25 00:45:34,712 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-25 00:45:34,719 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-25 00:45:34,725 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-25 00:45:34,733 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-25 00:45:34,739 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-25 00:45:34,746 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-25 00:45:34,754 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-25 00:45:34,760 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-25 00:45:34,767 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-25 00:45:34,773 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-25 00:45:34,780 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-25 00:45:34,786 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-25 00:45:34,793 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-25 00:45:34,799 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-25 00:45:34,805 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-25 00:45:34,811 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-25 00:45:34,818 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-25 00:45:34,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-25 00:45:34,824 [ scc.git] DEBUG Calling 'git remote'
2024-03-25 00:45:34,830 [ 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 bb4d8bd] 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 3b7ccfa8
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 a232ed0
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 4440fc4] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-03-25 00:46:20,789 [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-03-25 00:46:29,665 [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-03-25 00:46:32,000 [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-03-25 00:46:36,514 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-03-25 00:47:23,091 [ 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}
