Skipping 115 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-03-22 00:41:44,129 [ scc.git] DEBUG src/templates/rois_form_template.html | 93 -
2024-03-22 00:41:44,129 [ scc.git] DEBUG src/templates/scalebar_form.template.html | 143 +
2024-03-22 00:41:44,129 [ scc.git] DEBUG src/templates/scalebar_form_template.html | 143 -
2024-03-22 00:41:44,129 [ scc.git] DEBUG ..._template.html => scalebar_panel.template.html} | 0
2024-03-22 00:41:44,129 [ scc.git] DEBUG ...r_template.html => shape_toolbar.template.html} | 62 +-
2024-03-22 00:41:44,129 [ scc.git] DEBUG src/templates/viewport.template.html | 5 +
2024-03-22 00:41:44,129 [ scc.git] DEBUG ..._template.html => viewport_inner.template.html} | 0
2024-03-22 00:41:44,129 [ scc.git] DEBUG src/templates/viewport_template.html | 9 -
2024-03-22 00:41:44,129 [ scc.git] DEBUG ...anel_template.html => xywh_panel.template.html} | 30 +-
2024-03-22 00:41:44,129 [ scc.git] DEBUG ..._crop_template.html => zoom_crop.template.html} | 10 +-
2024-03-22 00:41:44,129 [ scc.git] DEBUG vite.config.js | 21 +
2024-03-22 00:41:44,129 [ scc.git] DEBUG 136 files changed, 7922 insertions(+), 32991 deletions(-)
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100644 Gruntfile.js
2024-03-22 00:41:44,129 [ scc.git] DEBUG create mode 100755 deploy_build.sh
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100644 docs/demo/index.html
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/backbone-1.0.0.js
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/backbone.mousetrap/README.md
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.css
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.min.css
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.js
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-03-22 00:41:44,129 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-03-22 00:41:44,130 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-03-22 00:41:44,130 [ scc.git] DEBUG create mode 100644 src/.env
2024-03-22 00:41:44,130 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-03-22 00:41:44,130 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-03-22 00:41:44,130 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-03-22 00:41:44,130 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-03-22 00:41:44,130 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/index.html
2024-03-22 00:41:44,131 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-03-22 00:41:44,131 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-03-22 00:41:44,131 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-03-22 00:41:44,131 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-03-22 00:41:44,132 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-03-22 00:41:44,132 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-03-22 00:41:44,132 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-03-22 00:41:44,132 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-03-22 00:41:44,132 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-03-22 00:41:44,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:41:44,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-22 00:41:44,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:41:44,294 [ 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-22 00:41:44,317 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:41:44,321 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-03-22 00:41:44,321 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-03-22 00:41:44,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:41:44,696 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:41:44,738 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:41:44,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:41:44,744 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:41:44,783 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:41:44,794 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc2e9bb0> has no local changes
2024-03-22 00:41:44,794 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:41:44,808 [ scc.git] DEBUG [detached HEAD 8d0003cc] merge master -Dorg -Ssuccess-only
2024-03-22 00:41:44,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:41:44,808 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:41:45,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-03-22 00:41:45,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-03-22 00:41:46,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-03-22 00:41:46,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-22 00:41:47,071 [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-22 00:41:47,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-22 00:41:47,933 [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-22 00:41:47,934 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-03-22 00:41:47,934 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:41:47,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-22 00:41:47,934 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:41:47,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:41:47,940 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:41:47,944 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:41:47,945 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:41:47,949 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:41:47,955 [ scc.git] DEBUG Already up to date.
2024-03-22 00:41:47,955 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-03-22 00:41:48,373 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-03-22 00:41:48,373 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-03-22 00:41:48,378 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:41:48,378 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:41:48,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:41:48,383 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-22 00:41:48,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:41:48,393 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-22 00:41:48,410 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-03-22 00:41:48,410 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:41:48,413 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-03-22 00:41:48,413 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-03-22 00:41:48,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:41:48,586 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:41:48,631 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:41:48,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:41:48,638 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:41:48,681 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:41:48,689 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bcb1da60> has no local changes
2024-03-22 00:41:48,689 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:41:48,699 [ scc.git] DEBUG [detached HEAD 9fb0fc8] merge master -Dorg -Ssuccess-only
2024-03-22 00:41:48,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:41:48,700 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:41:49,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-03-22 00:41:49,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-03-22 00:41:49,575 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-22 00:41:50,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-22 00:41:50,612 [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-22 00:41:51,113 [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-22 00:41:51,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-22 00:41:51,962 [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-22 00:41:51,963 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-22 00:41:51,963 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:41:51,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-22 00:41:51,963 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:41:51,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:41:51,969 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:41:51,973 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:41:51,974 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:41:51,979 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:41:51,985 [ scc.git] DEBUG Already up to date.
2024-03-22 00:41:51,986 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-03-22 00:41:52,362 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-03-22 00:41:52,362 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-03-22 00:41:52,367 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:41:52,367 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:41:52,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:41:52,373 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-03-22 00:41:52,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:41:52,383 [ 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-22 00:41:52,395 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:41:52,399 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-03-22 00:41:52,399 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-03-22 00:41:52,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:41:52,554 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:41:52,593 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:41:52,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:41:52,599 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:41:52,635 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:41:52,642 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bcb4b700> has no local changes
2024-03-22 00:41:52,643 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:41:52,651 [ scc.git] DEBUG [detached HEAD 1da68a7] merge master -Dorg -Ssuccess-only
2024-03-22 00:41:52,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:41:52,652 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:41:53,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-03-22 00:41:53,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-03-22 00:41:54,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/f5a45e055da264fa0a385a5c0d51a6374708e5d2 HTTP/1.1" 200 None
2024-03-22 00:41:54,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/f5a45e055da264fa0a385a5c0d51a6374708e5d2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-22 00:41:55,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/f5a45e055da264fa0a385a5c0d51a6374708e5d2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-22 00:41:55,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/f5a45e055da264fa0a385a5c0d51a6374708e5d2 HTTP/1.1" 200 None
2024-03-22 00:41:55,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/f5a45e055da264fa0a385a5c0d51a6374708e5d2?per_page=1 HTTP/1.1" 200 2
2024-03-22 00:41:55,974 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-03-22 00:41:56,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-03-22 00:41:56,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-03-22 00:41:57,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-22 00:41:57,902 [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-22 00:41:58,374 [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-22 00:41:58,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-22 00:41:59,225 [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-22 00:41:59,226 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-03-22 00:41:59,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-03-22 00:42:00,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-03-22 00:42:00,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-22 00:42:01,100 [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-22 00:42:01,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-22 00:42:01,952 [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-22 00:42:01,952 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-03-22 00:42:02,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-03-22 00:42:02,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-03-22 00:42:03,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-22 00:42:03,919 [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-22 00:42:04,401 [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-22 00:42:04,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-22 00:42:05,306 [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-22 00:42:05,307 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-22 00:42:05,307 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:05,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-22 00:42:05,308 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:05,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:05,314 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:42:05,320 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:05,320 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:42:05,331 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:42:05,338 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:05,338 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-03-22 00:42:05,832 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-22 00:42:05,832 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-03-22 00:42:05,837 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-03-22 00:42:06,250 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-22 00:42:06,251 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-03-22 00:42:06,255 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-03-22 00:42:06,793 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-22 00:42:06,793 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-03-22 00:42:06,798 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-03-22 00:42:07,765 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-22 00:42:07,765 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-03-22 00:42:07,770 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:07,770 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:07,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:07,775 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-03-22 00:42:07,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:07,787 [ 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-22 00:42:07,811 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:42:07,814 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-03-22 00:42:07,814 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-03-22 00:42:07,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:07,978 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-22 00:42:07,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:07,989 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-22 00:42:08,052 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:42:08,055 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-03-22 00:42:08,055 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-03-22 00:42:08,055 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-03-22 00:42:08,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:08,391 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-22 00:42:08,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:08,403 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-22 00:42:08,459 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:42:08,471 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-03-22 00:42:08,471 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-03-22 00:42:08,471 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-03-22 00:42:08,471 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-03-22 00:42:08,471 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-03-22 00:42:08,471 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-03-22 00:42:08,471 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-03-22 00:42:08,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:08,803 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f5a45e055da264fa0a385a5c0d51a6374708e5d2'
2024-03-22 00:42:08,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:08,816 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) f5a45e055da264fa0a385a5c0d51a6374708e5d2'
2024-03-22 00:42:08,833 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-03-22 00:42:08,833 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:42:08,837 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 7 +-
2024-03-22 00:42:08,837 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-03-22 00:42:08,837 [ scc.git] DEBUG src/app/header.html | 5 ++
2024-03-22 00:42:08,838 [ scc.git] DEBUG src/app/header.js | 50 +++++++++++-
2024-03-22 00:42:08,838 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-03-22 00:42:08,838 [ scc.git] DEBUG src/utils/figure.js | 186 ++++++++++++++++++++++++++++++++++++++++++
2024-03-22 00:42:08,838 [ scc.git] DEBUG 6 files changed, 257 insertions(+), 3 deletions(-)
2024-03-22 00:42:08,838 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-03-22 00:42:09,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:09,207 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:09,252 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:09,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:09,258 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:09,303 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:09,313 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc2d85b0> has no local changes
2024-03-22 00:42:09,314 [ 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'
Generated by OMERO-plugins-push#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:09,325 [ scc.git] DEBUG [detached HEAD 5e55cd1] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:09,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:09,325 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:09,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-03-22 00:42:10,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-03-22 00:42:10,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-03-22 00:42:11,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-22 00:42:11,701 [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-22 00:42:12,157 [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-22 00:42:12,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-22 00:42:13,040 [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-22 00:42:13,041 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-03-22 00:42:13,041 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:13,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-22 00:42:13,041 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:13,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:13,048 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:42:13,054 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:13,054 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:42:13,059 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:42:13,065 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:13,065 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-03-22 00:42:13,482 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-03-22 00:42:13,482 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-03-22 00:42:13,486 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:13,486 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:13,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:13,492 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-22 00:42:13,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:13,504 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-22 00:42:13,513 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:42:13,515 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-03-22 00:42:13,515 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-03-22 00:42:13,515 [ scc.git] DEBUG requirements.txt | 2 +-
2024-03-22 00:42:13,515 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-03-22 00:42:13,515 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-03-22 00:42:13,515 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-03-22 00:42:13,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:13,680 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:13,721 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:13,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:13,726 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:13,764 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:13,771 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc2b4a90> has no local changes
2024-03-22 00:42:13,771 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:13,779 [ scc.git] DEBUG [detached HEAD c4cbc25] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:13,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:13,780 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:14,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-03-22 00:42:14,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-03-22 00:42:15,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-03-22 00:42:15,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-22 00:42:16,174 [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-22 00:42:16,641 [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-22 00:42:17,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-22 00:42:17,486 [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-22 00:42:17,487 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-22 00:42:17,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-03-22 00:42:18,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-03-22 00:42:18,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-22 00:42:19,389 [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-22 00:42:19,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-22 00:42:20,336 [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-22 00:42:20,336 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-22 00:42:20,337 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:20,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-22 00:42:20,337 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:20,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:20,343 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:42:20,350 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:20,350 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:42:20,356 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:42:20,361 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:20,361 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-03-22 00:42:20,966 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-22 00:42:20,967 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-03-22 00:42:20,972 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-03-22 00:42:21,489 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-22 00:42:21,489 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-03-22 00:42:21,494 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:21,495 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:21,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:21,500 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-22 00:42:21,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:21,513 [ 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-22 00:42:21,588 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-03-22 00:42:21,588 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-03-22 00:42:21,588 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-22 00:42:21,588 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-22 00:42:21,589 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-22 00:42:21,590 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-22 00:42:21,595 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-22 00:42:21,604 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-22 00:42:21,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:21,772 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-22 00:42:21,779 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-22 00:42:21,785 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#7](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-03-22 00:42:21,790 [ scc.config] DEBUG Found github.token
2024-03-22 00:42:21,790 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-03-22 00:42:21,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-22 00:42:21,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:21,803 [ 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-22 00:42:21,824 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-22 00:42:21,824 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-22 00:42:21,824 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-03-22 00:42:21,824 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-22 00:42:21,824 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-22 00:42:21,831 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-22 00:42:21,838 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-22 00:42:22,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:22,174 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-22 00:42:22,181 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-22 00:42:22,187 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#7](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/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-22 00:42:22,193 [ scc.config] DEBUG Found github.token
2024-03-22 00:42:22,193 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-03-22 00:42:22,193 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:22,233 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:22,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:22,241 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:22,280 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:22,288 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc30a580> has no local changes
2024-03-22 00:42:22,288 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:22,296 [ scc.git] DEBUG [detached HEAD 26b852b] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:22,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:22,297 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:22,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-03-22 00:42:23,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-03-22 00:42:23,185 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-22 00:42:23,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-22 00:42:24,181 [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-22 00:42:24,624 [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-22 00:42:25,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-22 00:42:25,660 [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-22 00:42:25,660 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-22 00:42:26,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-03-22 00:42:26,121 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-22 00:42:26,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-22 00:42:27,134 [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-22 00:42:27,692 [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-22 00:42:28,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-22 00:42:28,622 [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-22 00:42:28,623 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-22 00:42:29,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-03-22 00:42:29,088 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-22 00:42:29,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-22 00:42:30,175 [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-22 00:42:30,683 [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-22 00:42:31,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-22 00:42:31,544 [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-22 00:42:31,544 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-22 00:42:31,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-03-22 00:42:32,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-03-22 00:42:32,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-03-22 00:42:33,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-03-22 00:42:33,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-03-22 00:42:34,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-03-22 00:42:34,426 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:34,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-22 00:42:34,426 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:34,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:34,433 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:42:34,439 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:34,439 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:42:34,444 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:42:34,451 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:34,451 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-03-22 00:42:34,899 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-22 00:42:34,899 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-03-22 00:42:34,904 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-03-22 00:42:35,312 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-22 00:42:35,312 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-03-22 00:42:35,317 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-03-22 00:42:35,698 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-22 00:42:35,698 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-03-22 00:42:35,705 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:35,705 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:35,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:35,711 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-03-22 00:42:35,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:35,723 [ 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-22 00:42:35,733 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:42:35,736 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-03-22 00:42:35,736 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-03-22 00:42:35,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:35,895 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-03-22 00:42:35,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:35,907 [ 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-22 00:42:35,960 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-22 00:42:35,960 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:42:35,964 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-03-22 00:42:35,964 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-03-22 00:42:36,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:36,314 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-03-22 00:42:36,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:36,326 [ 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-22 00:42:36,337 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-22 00:42:36,338 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:42:36,340 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-03-22 00:42:36,341 [ scc.git] DEBUG package.json | 2 +-
2024-03-22 00:42:36,341 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-03-22 00:42:36,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:36,720 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:36,765 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:36,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:36,772 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:36,813 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:36,821 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bcb1fee0> has no local changes
2024-03-22 00:42:36,821 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:36,831 [ scc.git] DEBUG [detached HEAD c816dd6] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:36,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:36,832 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:37,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-03-22 00:42:37,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-03-22 00:42:38,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-22 00:42:38,820 [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-22 00:42:39,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-22 00:42:39,760 [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-22 00:42:39,761 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-03-22 00:42:39,762 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:39,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-22 00:42:39,762 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:39,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:39,768 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:42:39,774 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:39,774 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:42:39,780 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:42:39,787 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:39,787 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-22 00:42:40,171 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-03-22 00:42:40,172 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-22 00:42:40,177 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:40,177 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:40,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:40,183 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-22 00:42:40,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:40,194 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-22 00:42:40,202 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:42:40,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:40,365 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:40,410 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:40,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:40,417 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:40,460 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:40,467 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc2e3f70> has no local changes
2024-03-22 00:42:40,467 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:40,475 [ scc.git] DEBUG [detached HEAD 3a3baa2] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:40,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:40,476 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:40,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-03-22 00:42:41,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-03-22 00:42:41,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-03-22 00:42:42,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-03-22 00:42:42,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-22 00:42:43,288 [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-22 00:42:43,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-22 00:42:44,252 [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-22 00:42:44,253 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-22 00:42:44,253 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:44,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-22 00:42:44,253 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:44,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:44,259 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:42:44,264 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:44,264 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:42:44,270 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:42:44,274 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:44,275 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-03-22 00:42:44,743 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-03-22 00:42:44,743 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-03-22 00:42:44,748 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:44,748 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:44,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:44,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-03-22 00:42:44,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:44,768 [ 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-22 00:42:44,780 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-03-22 00:42:44,781 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:42:44,784 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-03-22 00:42:44,784 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-03-22 00:42:44,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:44,947 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:44,990 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:44,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:44,996 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:45,038 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:45,044 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc26e5b0> has no local changes
2024-03-22 00:42:45,044 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:45,055 [ scc.git] DEBUG [detached HEAD d6117be] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:45,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:45,056 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:45,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-03-22 00:42:45,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-03-22 00:42:46,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-03-22 00:42:46,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-22 00:42:47,449 [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-22 00:42:48,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-22 00:42:48,542 [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-22 00:42:48,543 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-22 00:42:48,543 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:48,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-22 00:42:48,543 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:48,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:48,552 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:42:48,558 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:48,558 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:42:48,565 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:42:48,571 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:48,572 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-22 00:42:49,017 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-03-22 00:42:49,017 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-22 00:42:49,022 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:49,022 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:49,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:49,028 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-22 00:42:49,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:49,040 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-22 00:42:49,126 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-03-22 00:42:49,126 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-03-22 00:42:49,126 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-03-22 00:42:49,126 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-03-22 00:42:49,127 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-03-22 00:42:49,127 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-03-22 00:42:49,127 [ scc.git] DEBUG Auto-merging setup.py
2024-03-22 00:42:49,127 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-03-22 00:42:49,127 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-22 00:42:49,127 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-22 00:42:49,133 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-22 00:42:49,140 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-03-22 00:42:49,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:49,287 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-22 00:42:49,293 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-22 00:42:49,298 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#7](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/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-22 00:42:49,303 [ scc.config] DEBUG Found github.token
2024-03-22 00:42:49,303 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-03-22 00:42:49,304 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:49,348 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:49,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:49,353 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:49,392 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:49,399 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc2c9130> has no local changes
2024-03-22 00:42:49,400 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:49,410 [ scc.git] DEBUG [detached HEAD ceca81d] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:49,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:49,410 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:49,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-03-22 00:42:50,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-03-22 00:42:50,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-03-22 00:42:51,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-22 00:42:51,649 [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-22 00:42:52,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-22 00:42:52,496 [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-22 00:42:52,496 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-22 00:42:52,497 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:52,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-22 00:42:52,497 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:52,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:52,502 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:42:52,507 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:52,507 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:42:52,512 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:42:52,518 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:52,519 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-03-22 00:42:53,029 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-03-22 00:42:53,029 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-03-22 00:42:53,035 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:53,035 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:53,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:53,040 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-03-22 00:42:53,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:53,051 [ 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-22 00:42:53,063 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-03-22 00:42:53,066 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-03-22 00:42:53,069 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-03-22 00:42:53,069 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-03-22 00:42:53,070 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-03-22 00:42:53,070 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-03-22 00:42:53,070 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-03-22 00:42:53,070 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-03-22 00:42:53,070 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-03-22 00:42:53,070 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-03-22 00:42:53,070 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-03-22 00:42:53,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-03-22 00:42:53,071 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-03-22 00:42:53,071 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-03-22 00:42:53,071 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-03-22 00:42:53,071 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-03-22 00:42:53,071 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-03-22 00:42:53,071 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-03-22 00:42:53,071 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-03-22 00:42:53,071 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-03-22 00:42:53,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:53,224 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:53,268 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:53,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:53,274 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:53,310 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:53,316 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc2e3e80> has no local changes
2024-03-22 00:42:53,316 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:53,326 [ scc.git] DEBUG [detached HEAD 697e66a] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:53,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:53,326 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:53,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-03-22 00:42:53,639 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:53,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-22 00:42:53,639 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:53,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:53,644 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:42:53,650 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:53,650 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:42:53,655 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:42:53,660 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:53,660 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:53,660 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:53,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:53,664 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:53,704 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:53,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:53,709 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:53,747 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:53,753 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc24e700> has no local changes
2024-03-22 00:42:53,753 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:53,761 [ scc.git] DEBUG [detached HEAD 7d3056b] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:53,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:53,761 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:54,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-03-22 00:42:54,072 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:54,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-22 00:42:54,072 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:54,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:54,077 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:42:54,082 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:54,082 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:42:54,088 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:42:54,093 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:54,093 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:54,093 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:54,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:54,099 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:54,137 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:54,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:54,142 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:54,180 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:54,186 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc1d6550> has no local changes
2024-03-22 00:42:54,186 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:54,194 [ scc.git] DEBUG [detached HEAD a025331] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:54,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:54,194 [ scc.git] INFO Overriding base-branch from master to main
2024-03-22 00:42:54,194 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:54,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-03-22 00:42:55,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-03-22 00:42:55,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-03-22 00:42:55,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-03-22 00:42:56,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-22 00:42:56,990 [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-22 00:42:57,423 [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-22 00:42:57,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-22 00:42:58,347 [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-22 00:42:58,348 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-22 00:42:58,349 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:58,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-22 00:42:58,349 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:58,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:58,355 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-03-22 00:42:58,360 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:58,360 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-03-22 00:42:58,366 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-03-22 00:42:58,372 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:58,372 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-03-22 00:42:58,815 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-03-22 00:42:58,815 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-03-22 00:42:58,820 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:58,820 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:58,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:58,826 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-22 00:42:58,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:58,838 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-22 00:42:58,860 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-03-22 00:42:58,861 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-03-22 00:42:58,861 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-22 00:42:58,861 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-22 00:42:58,869 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-22 00:42:58,876 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-03-22 00:42:59,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:42:59,147 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-22 00:42:59,154 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-22 00:42:59,160 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#7](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-03-22 00:42:59,167 [ scc.config] DEBUG Found github.token
2024-03-22 00:42:59,167 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-03-22 00:42:59,168 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:59,211 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:59,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:59,217 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:59,264 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:59,270 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc1d66a0> has no local changes
2024-03-22 00:42:59,270 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:59,278 [ scc.git] DEBUG [detached HEAD e204678] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:59,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:59,278 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:59,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-03-22 00:42:59,569 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:59,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-22 00:42:59,569 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:59,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:59,577 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:42:59,582 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:42:59,582 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:42:59,588 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:42:59,594 [ scc.git] DEBUG Already up to date.
2024-03-22 00:42:59,594 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:42:59,594 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:59,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:59,600 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:42:59,643 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:59,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:59,648 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:42:59,688 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:42:59,696 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc21c4c0> has no local changes
2024-03-22 00:42:59,696 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:42:59,705 [ scc.git] DEBUG [detached HEAD 7301cfd] merge master -Dorg -Ssuccess-only
2024-03-22 00:42:59,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:42:59,705 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:42:59,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-03-22 00:42:59,990 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:42:59,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-22 00:42:59,990 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:42:59,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:42:59,996 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:43:00,002 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:43:00,003 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:43:00,008 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:43:00,015 [ scc.git] DEBUG Already up to date.
2024-03-22 00:43:00,015 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:43:00,016 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:43:00,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:43:00,021 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:43:00,065 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:43:00,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:43:00,072 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:43:00,120 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:43:00,129 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc1d65b0> has no local changes
2024-03-22 00:43:00,129 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:43:00,138 [ scc.git] DEBUG [detached HEAD 68edb6d] merge master -Dorg -Ssuccess-only
2024-03-22 00:43:00,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:00,139 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:43:00,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-03-22 00:43:00,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-03-22 00:43:01,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-03-22 00:43:01,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-22 00:43:02,433 [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-22 00:43:02,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-22 00:43:03,330 [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-22 00:43:03,330 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-03-22 00:43:03,331 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:43:03,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-22 00:43:03,331 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:43:03,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:43:03,336 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-22 00:43:03,341 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:43:03,341 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-22 00:43:03,346 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-22 00:43:03,351 [ scc.git] DEBUG Already up to date.
2024-03-22 00:43:03,351 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-03-22 00:43:03,809 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-03-22 00:43:03,809 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-03-22 00:43:03,815 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:43:03,815 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:43:03,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:43:03,820 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-22 00:43:03,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:43:03,832 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-22 00:43:03,892 [ scc.git] DEBUG Auto-merging Dockerfile
2024-03-22 00:43:03,893 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-03-22 00:43:03,893 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-22 00:43:03,893 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-22 00:43:03,900 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-22 00:43:03,908 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-03-22 00:43:04,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:04,073 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-22 00:43:04,078 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-22 00:43:04,083 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#7](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-03-22 00:43:04,087 [ scc.config] DEBUG Found github.token
2024-03-22 00:43:04,087 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-03-22 00:43:04,087 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:43:04,128 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:43:04,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:43:04,134 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:43:04,179 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:43:04,186 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc1904f0> has no local changes
2024-03-22 00:43:04,186 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:43:04,195 [ scc.git] DEBUG [detached HEAD f582b6d] merge master -Dorg -Ssuccess-only
2024-03-22 00:43:04,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:04,196 [ scc.git] INFO Overriding base-branch from master to develop
2024-03-22 00:43:04,196 [ scc.repo] DEBUG ## PRs found:
2024-03-22 00:43:04,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-03-22 00:43:05,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-03-22 00:43:05,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-03-22 00:43:06,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-03-22 00:43:06,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-03-22 00:43:07,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-03-22 00:43:07,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-03-22 00:43:07,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-22 00:43:08,397 [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-22 00:43:08,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-22 00:43:09,268 [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-22 00:43:09,268 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-22 00:43:09,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-03-22 00:43:10,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-03-22 00:43:10,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-03-22 00:43:11,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-03-22 00:43:11,172 [ scc.repo] DEBUG ## Branches found:
2024-03-22 00:43:11,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-22 00:43:11,172 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:43:11,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:43:11,178 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-03-22 00:43:11,183 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-22 00:43:11,183 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-03-22 00:43:11,188 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-03-22 00:43:11,193 [ scc.git] DEBUG Already up to date.
2024-03-22 00:43:11,194 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-03-22 00:43:11,632 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-03-22 00:43:11,633 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-03-22 00:43:11,638 [ scc.git] DEBUG ## Unique users: []
2024-03-22 00:43:11,638 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:43:11,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:43:11,644 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-22 00:43:11,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:43:11,658 [ 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-22 00:43:11,694 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-03-22 00:43:11,694 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-03-22 00:43:11,694 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-22 00:43:11,695 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-22 00:43:11,702 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-22 00:43:11,708 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-03-22 00:43:11,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:11,867 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-22 00:43:11,875 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-22 00:43:11,882 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#7](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-03-22 00:43:11,887 [ scc.config] DEBUG Found github.token
2024-03-22 00:43:11,888 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-03-22 00:43:11,888 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-22 00:43:11,929 [ scc.git] DEBUG Get sha1 of %s
2024-03-22 00:43:11,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-22 00:43:11,934 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:43:11,978 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:43:11,985 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bc1a2280> has no local changes
2024-03-22 00:43:11,985 [ 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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:43:11,995 [ scc.git] DEBUG [detached HEAD a25ab1e] merge master -Dorg -Ssuccess-only
2024-03-22 00:43:11,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:11,995 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-22 00:43:12,079 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-03-22 00:43:12,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:12,287 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-03-22 00:43:12,292 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-03-22 00:43:12,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:12,694 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-03-22 00:43:12,700 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-03-22 00:43:13,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:13,103 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-03-22 00:43:13,107 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-03-22 00:43:13,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:13,505 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-03-22 00:43:13,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:13,910 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-03-22 00:43:13,916 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-03-22 00:43:14,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:14,313 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-03-22 00:43:14,318 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-03-22 00:43:14,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:14,801 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-03-22 00:43:14,806 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-03-22 00:43:15,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:15,213 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-03-22 00:43:15,219 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-03-22 00:43:15,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:15,614 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-03-22 00:43:15,620 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-03-22 00:43:16,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:16,037 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-03-22 00:43:16,043 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-03-22 00:43:16,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:16,451 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-03-22 00:43:16,456 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-03-22 00:43:16,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:16,879 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-03-22 00:43:16,885 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-03-22 00:43:17,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:17,295 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-03-22 00:43:17,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:17,689 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-03-22 00:43:18,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:18,085 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-03-22 00:43:18,089 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-03-22 00:43:18,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:18,490 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-03-22 00:43:18,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:18,902 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-03-22 00:43:19,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:19,299 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-03-22 00:43:19,304 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-03-22 00:43:19,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:19,693 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-03-22 00:43:19,697 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-03-22 00:43:20,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:20,097 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-03-22 00:43:20,103 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-03-22 00:43:20,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:20,502 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-03-22 00:43:20,507 [ scc.config] DEBUG Found submodule.scripts.url
2024-03-22 00:43:20,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-22 00:43:20,907 [ scc.config] DEBUG Found submodule.scripts.branch
2024-03-22 00:43:20,908 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-22 00:43:21,000 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f14bdbe2430> has local changes
2024-03-22 00:43:21,000 [ 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'
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#7 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/7/)'
2024-03-22 00:43:21,016 [ scc.git] DEBUG [detached HEAD ab65fe7] merge master -Dorg -Ssuccess-only
2024-03-22 00:43:21,016 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-03-22 00:43:21,016 [ scc.merge] INFO Repository: ome/omero-plugins
2024-03-22 00:43:21,016 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,016 [ scc.merge] INFO
2024-03-22 00:43:21,017 [ scc.merge] INFO
2024-03-22 00:43:21,017 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-03-22 00:43:21,017 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,017 [ scc.merge] INFO
2024-03-22 00:43:21,017 [ scc.merge] INFO
2024-03-22 00:43:21,017 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-03-22 00:43:21,017 [ scc.merge] INFO Excluded PRs:
2024-03-22 00:43:21,017 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-03-22 00:43:21,017 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,017 [ scc.merge] INFO
2024-03-22 00:43:21,017 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,017 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-03-22 00:43:21,017 [ scc.merge] INFO
2024-03-22 00:43:21,017 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-03-22 00:43:21,017 [ scc.merge] INFO Excluded PRs:
2024-03-22 00:43:21,017 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-03-22 00:43:21,017 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-03-22 00:43:21,017 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-03-22 00:43:21,017 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-03-22 00:43:21,017 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,017 [ scc.merge] INFO
2024-03-22 00:43:21,017 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,017 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-03-22 00:43:21,017 [ scc.merge] INFO
2024-03-22 00:43:21,017 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-03-22 00:43:21,017 [ scc.merge] INFO Excluded PRs:
2024-03-22 00:43:21,017 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-03-22 00:43:21,017 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,017 [ scc.merge] INFO
2024-03-22 00:43:21,017 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,017 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-03-22 00:43:21,017 [ scc.merge] INFO
2024-03-22 00:43:21,017 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-22 00:43:21,017 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-03-22 00:43:21,017 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-03-22 00:43:21,017 [ scc.merge] INFO
2024-03-22 00:43:21,017 [ scc.merge] INFO Repository: ome/omero-figure
2024-03-22 00:43:21,017 [ scc.merge] INFO Excluded PRs:
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-03-22 00:43:21,018 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,018 [ scc.merge] INFO
2024-03-22 00:43:21,018 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-03-22 00:43:21,018 [ scc.merge] INFO
2024-03-22 00:43:21,018 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-03-22 00:43:21,018 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,018 [ scc.merge] INFO
2024-03-22 00:43:21,018 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-03-22 00:43:21,018 [ scc.merge] INFO
2024-03-22 00:43:21,018 [ scc.merge] INFO Repository: ome/omero-gallery
2024-03-22 00:43:21,018 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,018 [ scc.merge] INFO
2024-03-22 00:43:21,018 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-22 00:43:21,018 [ scc.merge] INFO
2024-03-22 00:43:21,018 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-03-22 00:43:21,018 [ scc.merge] INFO Excluded PRs:
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-03-22 00:43:21,018 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,018 [ scc.merge] INFO
2024-03-22 00:43:21,018 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-03-22 00:43:21,018 [ scc.merge] INFO
2024-03-22 00:43:21,018 [ scc.merge] INFO Repository: ome/omero-mapr
2024-03-22 00:43:21,018 [ scc.merge] INFO Excluded PRs:
2024-03-22 00:43:21,018 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-03-22 00:43:21,018 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,018 [ scc.merge] INFO
2024-03-22 00:43:21,018 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-03-22 00:43:21,019 [ scc.merge] INFO
2024-03-22 00:43:21,019 [ scc.merge] INFO Repository: ome/omero-metadata
2024-03-22 00:43:21,019 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,019 [ scc.merge] INFO
2024-03-22 00:43:21,019 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-22 00:43:21,019 [ scc.merge] INFO
2024-03-22 00:43:21,019 [ scc.merge] INFO Repository: ome/omero-parade
2024-03-22 00:43:21,019 [ scc.merge] INFO Excluded PRs:
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-03-22 00:43:21,019 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,019 [ scc.merge] INFO
2024-03-22 00:43:21,019 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-22 00:43:21,019 [ scc.merge] INFO
2024-03-22 00:43:21,019 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-03-22 00:43:21,019 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,019 [ scc.merge] INFO
2024-03-22 00:43:21,019 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-03-22 00:43:21,019 [ scc.merge] INFO
2024-03-22 00:43:21,019 [ scc.merge] INFO Repository: ome/omero-rois
2024-03-22 00:43:21,019 [ scc.merge] INFO Excluded PRs:
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-22 00:43:21,019 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,019 [ scc.merge] INFO
2024-03-22 00:43:21,019 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,019 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-22 00:43:21,019 [ scc.merge] INFO
2024-03-22 00:43:21,019 [ scc.merge] INFO Repository: ome/omero-signup
2024-03-22 00:43:21,020 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-22 00:43:21,020 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-03-22 00:43:21,020 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO Merged PRs:
2024-03-22 00:43:21,020 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO Repository: ome/omero-upload
2024-03-22 00:43:21,020 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-03-22 00:43:21,020 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-03-22 00:43:21,020 [ scc.merge] INFO Excluded PRs:
2024-03-22 00:43:21,020 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-03-22 00:43:21,020 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-22 00:43:21,020 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-03-22 00:43:21,020 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-03-22 00:43:21,020 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,020 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-03-22 00:43:21,020 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,020 [ scc.merge] INFO
2024-03-22 00:43:21,021 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-22 00:43:21,021 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-03-22 00:43:21,021 [ scc.merge] INFO
2024-03-22 00:43:21,021 [ scc.merge] INFO Repository: ome/scripts
2024-03-22 00:43:21,021 [ scc.merge] INFO Excluded PRs:
2024-03-22 00:43:21,021 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-03-22 00:43:21,021 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-03-22 00:43:21,021 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-03-22 00:43:21,021 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-03-22 00:43:21,021 [ scc.merge] INFO Already up to date.
2024-03-22 00:43:21,021 [ scc.merge] INFO
2024-03-22 00:43:21,021 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-22 00:43:21,021 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-22 00:43:21,021 [ scc.merge] INFO
2024-03-22 00:43:21,021 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-22 00:43:21,021 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-03-22 00:43:21,027 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-03-22 00:43:21,032 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-03-22 00:43:21,037 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-03-22 00:43:21,043 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-03-22 00:43:21,049 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-22 00:43:21,054 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-22 00:43:21,060 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-22 00:43:21,066 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-22 00:43:21,072 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-22 00:43:21,079 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-22 00:43:21,085 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-22 00:43:21,090 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-22 00:43:21,096 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-22 00:43:21,103 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-22 00:43:21,109 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-22 00:43:21,115 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-22 00:43:21,120 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-22 00:43:21,126 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-22 00:43:21,134 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-22 00:43:21,140 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-22 00:43:21,145 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-22 00:43:21,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-22 00:43:21,153 [ scc.git] DEBUG Calling 'git remote'
2024-03-22 00:43:21,159 [ 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 1606fdb] 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 5b0e362] 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-22 00:44:06,768 [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-22 00:44:15,680 [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-22 00:44:17,978 [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-22 00:44:22,485 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-03-22 00:45:11,654 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
