Skipping 118 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-03-29 00:39:23,203 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-03-29 00:39:23,203 [ scc.git] DEBUG create mode 100644 src/.env
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/index.html
2024-03-29 00:39:23,204 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-29 00:39:23,204 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-03-29 00:39:23,204 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-03-29 00:39:23,204 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-03-29 00:39:23,205 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-03-29 00:39:23,205 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-03-29 00:39:23,205 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-03-29 00:39:23,205 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-03-29 00:39:23,205 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-03-29 00:39:23,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:39:23,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-29 00:39:23,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:23,371 [ 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-29 00:39:23,390 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:39:23,393 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-03-29 00:39:23,393 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-03-29 00:39:23,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:39:23,770 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:39:23,804 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:23,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:23,808 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:39:23,841 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:39:23,851 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facadc36fd0> has no local changes
2024-03-29 00:39:23,851 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:39:23,863 [ scc.git] DEBUG [detached HEAD 26c45613] merge master -Dorg -Ssuccess-only
2024-03-29 00:39:23,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:39:23,863 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:39:24,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-03-29 00:39:24,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-03-29 00:39:25,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-03-29 00:39:25,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-29 00:39:26,122 [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-29 00:39:26,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-29 00:39:26,967 [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-29 00:39:26,967 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-03-29 00:39:26,967 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:39:26,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-29 00:39:26,968 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:26,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:26,972 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:39:26,977 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:39:26,977 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:39:26,981 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:39:26,986 [ scc.git] DEBUG Already up to date.
2024-03-29 00:39:26,986 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-03-29 00:39:27,355 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-03-29 00:39:27,356 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-03-29 00:39:27,359 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:39:27,359 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:27,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:27,363 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-29 00:39:27,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:27,372 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-29 00:39:27,379 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-03-29 00:39:27,380 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:39:27,382 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-03-29 00:39:27,382 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-03-29 00:39:27,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:39:27,548 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:39:27,581 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:27,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:27,585 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:39:27,619 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:39:27,624 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facacb9a4f0> has no local changes
2024-03-29 00:39:27,624 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:39:27,631 [ scc.git] DEBUG [detached HEAD f59560b] merge master -Dorg -Ssuccess-only
2024-03-29 00:39:27,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:39:27,631 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:39:28,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-03-29 00:39:28,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-03-29 00:39:28,480 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-29 00:39:29,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-29 00:39:29,541 [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-29 00:39:30,049 [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-29 00:39:30,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-29 00:39:30,966 [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-29 00:39:30,967 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-29 00:39:30,967 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:39:30,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-29 00:39:30,967 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:30,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:30,972 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:39:30,976 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:39:30,976 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:39:30,980 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:39:30,985 [ scc.git] DEBUG Already up to date.
2024-03-29 00:39:30,985 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-03-29 00:39:31,406 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-03-29 00:39:31,406 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-03-29 00:39:31,411 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:39:31,411 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:31,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:31,416 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-03-29 00:39:31,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:31,425 [ 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-29 00:39:31,433 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:39:31,437 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-03-29 00:39:31,437 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-03-29 00:39:31,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:39:31,589 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:39:31,623 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:31,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:31,627 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:39:31,661 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:39:31,667 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facacb8fa90> has no local changes
2024-03-29 00:39:31,668 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:39:31,675 [ scc.git] DEBUG [detached HEAD 97b1418] merge master -Dorg -Ssuccess-only
2024-03-29 00:39:31,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:39:31,676 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:39:32,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-03-29 00:39:32,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-03-29 00:39:32,584 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-29 00:39:33,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-29 00:39:33,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-29 00:39:34,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-29 00:39:34,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-29 00:39:35,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/78e253cccecbd349db3bcb16514f5c8b2c4185e6?per_page=1 HTTP/1.1" 200 2
2024-03-29 00:39:35,130 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-29 00:39:35,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-03-29 00:39:36,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-03-29 00:39:36,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-29 00:39:36,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-29 00:39:37,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-03-29 00:39:37,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/105a9369cdb853508da5ec4e0839c6f448bf3407?per_page=1 HTTP/1.1" 200 2
2024-03-29 00:39:37,826 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-03-29 00:39:38,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-03-29 00:39:38,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-03-29 00:39:39,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-29 00:39:39,691 [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-29 00:39:40,137 [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-29 00:39:40,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-29 00:39:41,044 [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-29 00:39:41,045 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-03-29 00:39:41,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-03-29 00:39:41,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-03-29 00:39:42,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-29 00:39:42,892 [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-29 00:39:43,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-29 00:39:43,820 [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-29 00:39:43,820 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-03-29 00:39:44,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-03-29 00:39:44,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-03-29 00:39:45,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-29 00:39:45,652 [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-29 00:39:46,115 [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-29 00:39:46,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-29 00:39:47,016 [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-29 00:39:47,017 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-29 00:39:47,017 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:39:47,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-29 00:39:47,017 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:47,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:47,022 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:39:47,026 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:39:47,027 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:39:47,031 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:39:47,036 [ scc.git] DEBUG Already up to date.
2024-03-29 00:39:47,036 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-03-29 00:39:47,698 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-29 00:39:47,698 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-03-29 00:39:47,702 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-03-29 00:39:48,081 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-29 00:39:48,081 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-03-29 00:39:48,085 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-03-29 00:39:48,476 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-29 00:39:48,476 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-03-29 00:39:48,480 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-03-29 00:39:49,237 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-29 00:39:49,237 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-03-29 00:39:49,239 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-03-29 00:39:49,626 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-29 00:39:49,626 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-03-29 00:39:49,630 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:39:49,630 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:49,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:49,635 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-03-29 00:39:49,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:49,644 [ 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-29 00:39:49,653 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:39:49,655 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-03-29 00:39:49,655 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-03-29 00:39:49,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:39:49,814 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-29 00:39:49,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:49,822 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-29 00:39:49,832 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:39:49,835 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-03-29 00:39:49,835 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-03-29 00:39:49,835 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-03-29 00:39:50,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:39:50,222 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-29 00:39:50,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:50,232 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-29 00:39:50,244 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:39:50,248 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-03-29 00:39:50,248 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-03-29 00:39:50,248 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-03-29 00:39:50,248 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-03-29 00:39:50,248 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-03-29 00:39:50,248 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-03-29 00:39:50,248 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-03-29 00:39:50,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:39:50,672 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-03-29 00:39:50,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:50,681 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-03-29 00:39:50,696 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-03-29 00:39:50,697 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:39:50,700 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-03-29 00:39:50,700 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-03-29 00:39:50,700 [ scc.git] DEBUG src/app/header.html | 5 +
2024-03-29 00:39:50,700 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-03-29 00:39:50,700 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-03-29 00:39:50,700 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-03-29 00:39:50,701 [ scc.git] DEBUG 6 files changed, 283 insertions(+), 6 deletions(-)
2024-03-29 00:39:50,701 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-03-29 00:39:51,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:39:51,101 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-29 00:39:51,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:51,111 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 467 (Bump webpack-dev-middleware from 5.3.3 to 5.3.4) 78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-29 00:39:51,125 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:39:51,134 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-03-29 00:39:51,134 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-03-29 00:39:51,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:39:51,519 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:39:51,553 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:51,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:51,557 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:39:51,590 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:39:51,599 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facadbcdd90> has no local changes
2024-03-29 00:39:51,599 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
Generated by OMERO-plugins-push#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:39:51,609 [ scc.git] DEBUG [detached HEAD 90d325c] merge master -Dorg -Ssuccess-only
2024-03-29 00:39:51,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:39:51,609 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:39:52,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-03-29 00:39:52,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-03-29 00:39:53,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-03-29 00:39:53,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-29 00:39:53,975 [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-29 00:39:54,436 [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-29 00:39:54,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-29 00:39:55,341 [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-29 00:39:55,342 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-03-29 00:39:55,342 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:39:55,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-29 00:39:55,342 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:55,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:55,347 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:39:55,351 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:39:55,351 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:39:55,356 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:39:55,360 [ scc.git] DEBUG Already up to date.
2024-03-29 00:39:55,360 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-03-29 00:39:55,773 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-03-29 00:39:55,773 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-03-29 00:39:55,777 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:39:55,777 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:55,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:55,782 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-29 00:39:55,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:55,791 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-29 00:39:55,799 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:39:55,802 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-03-29 00:39:55,802 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-03-29 00:39:55,802 [ scc.git] DEBUG requirements.txt | 2 +-
2024-03-29 00:39:55,802 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-03-29 00:39:55,802 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-03-29 00:39:55,802 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-03-29 00:39:55,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:39:55,962 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:39:55,996 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:39:55,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:39:56,001 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:39:56,035 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:39:56,041 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facadbcb490> has no local changes
2024-03-29 00:39:56,041 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:39:56,048 [ scc.git] DEBUG [detached HEAD 092e932] merge master -Dorg -Ssuccess-only
2024-03-29 00:39:56,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:39:56,049 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:39:56,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-03-29 00:39:56,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-03-29 00:39:57,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-03-29 00:39:57,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-29 00:39:58,459 [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-29 00:39:58,937 [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-29 00:39:59,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-29 00:39:59,788 [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-29 00:39:59,788 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-29 00:40:00,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-03-29 00:40:00,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-03-29 00:40:01,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-29 00:40:01,636 [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-29 00:40:02,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-29 00:40:02,593 [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-29 00:40:02,594 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-29 00:40:02,594 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:02,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-29 00:40:02,594 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:02,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:02,599 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:40:02,603 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:02,603 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:40:02,608 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:40:02,612 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:02,612 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-03-29 00:40:03,062 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-29 00:40:03,062 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-03-29 00:40:03,066 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-03-29 00:40:03,491 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-29 00:40:03,491 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-03-29 00:40:03,494 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:03,495 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:03,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:03,499 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-29 00:40:03,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:03,509 [ 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-29 00:40:03,522 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-03-29 00:40:03,522 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-03-29 00:40:03,522 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-29 00:40:03,522 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-29 00:40:03,522 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-29 00:40:03,522 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-29 00:40:03,527 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-29 00:40:03,532 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-29 00:40:03,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:03,689 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-29 00:40:03,694 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-29 00:40:03,699 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#15](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-03-29 00:40:03,703 [ scc.config] DEBUG Found github.token
2024-03-29 00:40:03,703 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-03-29 00:40:03,703 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-29 00:40:03,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:03,712 [ 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-29 00:40:03,727 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-29 00:40:03,727 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-29 00:40:03,727 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-03-29 00:40:03,727 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-29 00:40:03,727 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-29 00:40:03,732 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-29 00:40:03,738 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-29 00:40:04,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:04,094 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-29 00:40:04,099 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-29 00:40:04,104 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#15](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/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-29 00:40:04,108 [ scc.config] DEBUG Found github.token
2024-03-29 00:40:04,108 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-03-29 00:40:04,108 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:04,142 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:04,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:04,146 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:04,179 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:04,184 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facadbe2e80> has no local changes
2024-03-29 00:40:04,185 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:04,191 [ scc.git] DEBUG [detached HEAD 78f6172] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:04,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:04,192 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:04,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-03-29 00:40:05,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-03-29 00:40:05,112 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-29 00:40:05,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-29 00:40:06,107 [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-29 00:40:06,551 [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-29 00:40:07,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-29 00:40:07,407 [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-29 00:40:07,408 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-29 00:40:07,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-03-29 00:40:07,866 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-29 00:40:08,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-29 00:40:08,884 [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-29 00:40:09,357 [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-29 00:40:09,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-29 00:40:10,275 [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-29 00:40:10,275 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-29 00:40:10,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-03-29 00:40:10,742 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-29 00:40:11,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-29 00:40:11,838 [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-29 00:40:12,328 [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-29 00:40:12,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-29 00:40:13,298 [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-29 00:40:13,299 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-29 00:40:13,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-03-29 00:40:14,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-03-29 00:40:14,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-03-29 00:40:15,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-03-29 00:40:15,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-03-29 00:40:16,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-03-29 00:40:16,176 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:16,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-29 00:40:16,177 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:16,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:16,182 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:40:16,186 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:16,187 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:40:16,191 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:40:16,195 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:16,196 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-03-29 00:40:16,833 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-29 00:40:16,834 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-03-29 00:40:16,837 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-03-29 00:40:17,437 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-29 00:40:17,438 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-03-29 00:40:17,441 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-03-29 00:40:17,839 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-29 00:40:17,839 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-03-29 00:40:17,842 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:17,842 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:17,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:17,847 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-03-29 00:40:17,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:17,855 [ 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-29 00:40:17,863 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:40:17,866 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-03-29 00:40:17,866 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-03-29 00:40:18,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:18,023 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-03-29 00:40:18,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:18,031 [ 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-29 00:40:18,041 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-29 00:40:18,041 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:40:18,043 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-03-29 00:40:18,044 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-03-29 00:40:18,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:18,432 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-03-29 00:40:18,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:18,441 [ 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-29 00:40:18,451 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-29 00:40:18,451 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:40:18,454 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-03-29 00:40:18,454 [ scc.git] DEBUG package.json | 2 +-
2024-03-29 00:40:18,454 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-03-29 00:40:18,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:18,843 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:18,878 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:18,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:18,882 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:18,916 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:18,921 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac2faf10> has no local changes
2024-03-29 00:40:18,922 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:18,929 [ scc.git] DEBUG [detached HEAD 50f8ab9] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:18,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:18,930 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:19,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-03-29 00:40:19,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-03-29 00:40:20,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-29 00:40:20,742 [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-29 00:40:21,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-29 00:40:21,646 [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-29 00:40:21,646 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-03-29 00:40:21,646 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:21,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-29 00:40:21,646 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:21,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:21,651 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:40:21,655 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:21,656 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:40:21,660 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:40:21,664 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:21,665 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-29 00:40:22,062 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-03-29 00:40:22,062 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-29 00:40:22,065 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:22,065 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:22,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:22,070 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-29 00:40:22,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:22,078 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-29 00:40:22,086 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:40:22,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:22,237 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:22,271 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:22,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:22,276 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:22,309 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:22,314 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac343c10> has no local changes
2024-03-29 00:40:22,314 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:22,320 [ scc.git] DEBUG [detached HEAD 40585e7] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:22,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:22,321 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:22,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-03-29 00:40:23,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-03-29 00:40:23,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-03-29 00:40:24,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-03-29 00:40:24,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-29 00:40:25,095 [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-29 00:40:25,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-29 00:40:25,993 [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-29 00:40:25,994 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-29 00:40:25,994 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:25,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-29 00:40:25,994 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:25,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:25,999 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:40:26,003 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:26,003 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:40:26,008 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:40:26,013 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:26,013 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-03-29 00:40:26,406 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-03-29 00:40:26,406 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-03-29 00:40:26,410 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:26,410 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:26,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:26,414 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-03-29 00:40:26,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:26,423 [ 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-29 00:40:26,431 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-03-29 00:40:26,432 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:40:26,434 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-03-29 00:40:26,434 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-03-29 00:40:26,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:26,589 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:26,622 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:26,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:26,626 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:26,660 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:26,665 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac33b550> has no local changes
2024-03-29 00:40:26,665 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:26,672 [ scc.git] DEBUG [detached HEAD a1d87fb] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:26,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:26,672 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:27,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-03-29 00:40:27,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-03-29 00:40:28,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-03-29 00:40:28,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-29 00:40:28,991 [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-29 00:40:29,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-29 00:40:29,917 [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-29 00:40:29,918 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-29 00:40:29,918 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:29,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-29 00:40:29,918 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:29,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:29,923 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:40:29,927 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:29,927 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:40:29,932 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:40:29,936 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:29,936 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-29 00:40:30,559 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-03-29 00:40:30,559 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-29 00:40:30,563 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:30,563 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:30,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:30,568 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-29 00:40:30,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:30,577 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-29 00:40:30,586 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-03-29 00:40:30,586 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-03-29 00:40:30,586 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-03-29 00:40:30,586 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-03-29 00:40:30,586 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-03-29 00:40:30,586 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-03-29 00:40:30,586 [ scc.git] DEBUG Auto-merging setup.py
2024-03-29 00:40:30,586 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-03-29 00:40:30,586 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-29 00:40:30,586 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-29 00:40:30,591 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-29 00:40:30,596 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-03-29 00:40:30,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:30,748 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-29 00:40:30,753 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-29 00:40:30,757 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#15](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2024-03-29 00:40:30,761 [ scc.config] DEBUG Found github.token
2024-03-29 00:40:30,761 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-03-29 00:40:30,761 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:30,795 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:30,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:30,799 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:30,832 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:30,837 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac343a60> has no local changes
2024-03-29 00:40:30,838 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:30,846 [ scc.git] DEBUG [detached HEAD 122c218] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:30,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:30,846 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:31,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-03-29 00:40:31,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-03-29 00:40:32,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-03-29 00:40:32,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-29 00:40:33,102 [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-29 00:40:33,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-29 00:40:33,934 [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-29 00:40:33,935 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-29 00:40:33,935 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:33,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-29 00:40:33,935 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:33,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:33,940 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:40:33,944 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:33,944 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:40:33,949 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:40:33,953 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:33,954 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-03-29 00:40:34,355 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-03-29 00:40:34,355 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-03-29 00:40:34,359 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:34,359 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:34,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:34,363 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-03-29 00:40:34,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:34,373 [ 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-29 00:40:34,384 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-29 00:40:34,387 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-03-29 00:40:34,387 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-03-29 00:40:34,387 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-03-29 00:40:34,387 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-03-29 00:40:34,387 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-03-29 00:40:34,387 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-03-29 00:40:34,388 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-03-29 00:40:34,388 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-03-29 00:40:34,388 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-03-29 00:40:34,389 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-03-29 00:40:34,389 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-03-29 00:40:34,389 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-03-29 00:40:34,389 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-03-29 00:40:34,389 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-03-29 00:40:34,389 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-03-29 00:40:34,390 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-03-29 00:40:34,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:34,538 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:34,573 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:34,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:34,577 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:34,611 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:34,616 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac2fa370> has no local changes
2024-03-29 00:40:34,616 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:34,624 [ scc.git] DEBUG [detached HEAD fe16446] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:34,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:34,624 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:34,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-03-29 00:40:34,959 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:34,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-29 00:40:34,959 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:34,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:34,963 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:40:34,967 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:34,967 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:40:34,972 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:40:34,976 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:34,976 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:34,976 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:34,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:34,980 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:35,014 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:35,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:35,019 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:35,052 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:35,056 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac35cfa0> has no local changes
2024-03-29 00:40:35,057 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:35,063 [ scc.git] DEBUG [detached HEAD 575a236] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:35,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:35,064 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:35,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-03-29 00:40:35,371 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:35,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-29 00:40:35,371 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:35,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:35,375 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:40:35,379 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:35,379 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:40:35,383 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:40:35,388 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:35,388 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:35,388 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:35,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:35,392 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:35,426 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:35,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:35,431 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:35,464 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:35,469 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac315a60> has no local changes
2024-03-29 00:40:35,469 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:35,476 [ scc.git] DEBUG [detached HEAD 87c6c2b] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:35,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:35,477 [ scc.git] INFO Overriding base-branch from master to main
2024-03-29 00:40:35,477 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:35,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-03-29 00:40:36,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-03-29 00:40:36,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-03-29 00:40:37,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-03-29 00:40:37,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-29 00:40:38,210 [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-29 00:40:38,688 [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-29 00:40:39,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-29 00:40:39,635 [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-29 00:40:39,635 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-29 00:40:39,635 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:39,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-29 00:40:39,635 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:39,635 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:39,641 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-03-29 00:40:39,645 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:39,645 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-03-29 00:40:39,650 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-03-29 00:40:39,654 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:39,654 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-03-29 00:40:40,088 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-03-29 00:40:40,088 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-03-29 00:40:40,091 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:40,091 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:40,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:40,096 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-29 00:40:40,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:40,105 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-29 00:40:40,113 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-03-29 00:40:40,113 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-03-29 00:40:40,113 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-29 00:40:40,113 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-29 00:40:40,118 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-29 00:40:40,123 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-03-29 00:40:40,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:40,284 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-29 00:40:40,288 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-29 00:40:40,292 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#15](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-03-29 00:40:40,296 [ scc.config] DEBUG Found github.token
2024-03-29 00:40:40,296 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-03-29 00:40:40,296 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:40,330 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:40,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:40,334 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:40,368 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:40,373 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac284fd0> has no local changes
2024-03-29 00:40:40,373 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:40,380 [ scc.git] DEBUG [detached HEAD a6cc9f3] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:40,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:40,381 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:40,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-03-29 00:40:40,705 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:40,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-29 00:40:40,705 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:40,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:40,709 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:40:40,714 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:40,714 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:40:40,718 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:40:40,722 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:40,723 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:40,723 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:40,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:40,727 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:40,761 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:40,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:40,765 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:40,798 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:40,803 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac315af0> has no local changes
2024-03-29 00:40:40,803 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:40,810 [ scc.git] DEBUG [detached HEAD a8b4874] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:40,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:40,810 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:41,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-03-29 00:40:41,126 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:41,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-29 00:40:41,126 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:41,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:41,130 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:40:41,134 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:41,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:40:41,139 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:40:41,143 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:41,144 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:41,144 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:41,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:41,148 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:41,181 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:41,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:41,185 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:41,218 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:41,223 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac299520> has no local changes
2024-03-29 00:40:41,223 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:41,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:41,231 [ scc.git] DEBUG [detached HEAD 938ecb2] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:41,231 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:41,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-03-29 00:40:42,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-03-29 00:40:42,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-03-29 00:40:43,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-29 00:40:43,472 [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-29 00:40:43,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-29 00:40:44,377 [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-29 00:40:44,378 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-03-29 00:40:44,378 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:44,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-29 00:40:44,378 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:44,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:44,383 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-29 00:40:44,387 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:44,388 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-29 00:40:44,392 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-29 00:40:44,396 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:44,397 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-03-29 00:40:44,770 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-03-29 00:40:44,770 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-03-29 00:40:44,773 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:44,773 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:44,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:44,778 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-29 00:40:44,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:44,787 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-29 00:40:44,795 [ scc.git] DEBUG Auto-merging Dockerfile
2024-03-29 00:40:44,796 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-03-29 00:40:44,796 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-29 00:40:44,796 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-29 00:40:44,800 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-29 00:40:44,807 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-03-29 00:40:44,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:44,967 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-29 00:40:44,972 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-29 00:40:44,976 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#15](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-03-29 00:40:44,980 [ scc.config] DEBUG Found github.token
2024-03-29 00:40:44,980 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-03-29 00:40:44,980 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:45,015 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:45,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:45,019 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:45,054 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:45,059 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac2b38e0> has no local changes
2024-03-29 00:40:45,060 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:45,066 [ scc.git] DEBUG [detached HEAD 3a8bc45] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:45,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:45,067 [ scc.git] INFO Overriding base-branch from master to develop
2024-03-29 00:40:45,067 [ scc.repo] DEBUG ## PRs found:
2024-03-29 00:40:45,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-03-29 00:40:46,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-03-29 00:40:46,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-03-29 00:40:46,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-03-29 00:40:47,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-03-29 00:40:47,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-03-29 00:40:48,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-03-29 00:40:48,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-29 00:40:49,245 [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-29 00:40:49,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-29 00:40:50,083 [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-29 00:40:50,084 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-29 00:40:50,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-03-29 00:40:51,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-03-29 00:40:51,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-03-29 00:40:51,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-03-29 00:40:51,980 [ scc.repo] DEBUG ## Branches found:
2024-03-29 00:40:51,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-29 00:40:51,980 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:51,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:51,985 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-03-29 00:40:51,990 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-29 00:40:51,990 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-03-29 00:40:51,994 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-03-29 00:40:51,999 [ scc.git] DEBUG Already up to date.
2024-03-29 00:40:51,999 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-03-29 00:40:52,598 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-03-29 00:40:52,598 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-03-29 00:40:52,601 [ scc.git] DEBUG ## Unique users: []
2024-03-29 00:40:52,601 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:52,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:52,606 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-29 00:40:52,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:52,615 [ 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-29 00:40:52,624 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-03-29 00:40:52,625 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-03-29 00:40:52,625 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-29 00:40:52,625 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-29 00:40:52,629 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-29 00:40:52,634 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-03-29 00:40:52,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:52,792 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-29 00:40:52,797 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-29 00:40:52,801 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#15](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-03-29 00:40:52,805 [ scc.config] DEBUG Found github.token
2024-03-29 00:40:52,806 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-03-29 00:40:52,806 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-29 00:40:52,840 [ scc.git] DEBUG Get sha1 of %s
2024-03-29 00:40:52,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-29 00:40:52,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:52,878 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:40:52,883 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facac2aab50> has no local changes
2024-03-29 00:40:52,883 [ 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#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:40:52,890 [ scc.git] DEBUG [detached HEAD 4896e1c] merge master -Dorg -Ssuccess-only
2024-03-29 00:40:52,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:40:52,890 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-29 00:40:52,956 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-03-29 00:40:53,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:53,210 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-03-29 00:40:53,214 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-03-29 00:40:53,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:53,618 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-03-29 00:40:53,622 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-03-29 00:40:54,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:54,022 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-03-29 00:40:54,026 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-03-29 00:40:54,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:54,434 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-03-29 00:40:54,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:54,839 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-03-29 00:40:54,843 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-03-29 00:40:55,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:55,242 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-03-29 00:40:55,246 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-03-29 00:40:55,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:55,683 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-03-29 00:40:55,687 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-03-29 00:40:56,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:56,090 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-03-29 00:40:56,094 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-03-29 00:40:56,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:56,486 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-03-29 00:40:56,489 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-03-29 00:40:56,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:56,894 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-03-29 00:40:56,898 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-03-29 00:40:57,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:57,304 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-03-29 00:40:57,308 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-03-29 00:40:57,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:57,704 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-03-29 00:40:57,708 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-03-29 00:40:58,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:58,122 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-03-29 00:40:58,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:58,534 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-03-29 00:40:58,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:58,938 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-03-29 00:40:58,942 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-03-29 00:40:59,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:59,338 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-03-29 00:40:59,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:40:59,746 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-03-29 00:41:00,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:41:00,197 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-03-29 00:41:00,201 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-03-29 00:41:00,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:41:00,603 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-03-29 00:41:00,606 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-03-29 00:41:00,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:41:01,007 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-03-29 00:41:01,011 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-03-29 00:41:01,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:41:01,414 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-03-29 00:41:01,417 [ scc.config] DEBUG Found submodule.scripts.url
2024-03-29 00:41:01,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-29 00:41:01,817 [ scc.config] DEBUG Found submodule.scripts.branch
2024-03-29 00:41:01,818 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-29 00:41:01,896 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7facaecefb20> has local changes
2024-03-29 00:41:01,896 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#15 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/15/)'
2024-03-29 00:41:01,908 [ scc.git] DEBUG [detached HEAD 19a6ab7] merge master -Dorg -Ssuccess-only
2024-03-29 00:41:01,908 [ scc.merge] INFO Repository: ome/omero-plugins
2024-03-29 00:41:01,908 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-03-29 00:41:01,908 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,908 [ scc.merge] INFO
2024-03-29 00:41:01,908 [ scc.merge] INFO
2024-03-29 00:41:01,908 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-03-29 00:41:01,908 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,908 [ scc.merge] INFO
2024-03-29 00:41:01,908 [ scc.merge] INFO
2024-03-29 00:41:01,908 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-03-29 00:41:01,908 [ scc.merge] INFO Excluded PRs:
2024-03-29 00:41:01,908 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-03-29 00:41:01,908 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,909 [ scc.merge] INFO
2024-03-29 00:41:01,909 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-03-29 00:41:01,909 [ scc.merge] INFO
2024-03-29 00:41:01,909 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-03-29 00:41:01,909 [ scc.merge] INFO Excluded PRs:
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-03-29 00:41:01,909 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,909 [ scc.merge] INFO
2024-03-29 00:41:01,909 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-03-29 00:41:01,909 [ scc.merge] INFO
2024-03-29 00:41:01,909 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-03-29 00:41:01,909 [ scc.merge] INFO Excluded PRs:
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-03-29 00:41:01,909 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,909 [ scc.merge] INFO
2024-03-29 00:41:01,909 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-03-29 00:41:01,909 [ scc.merge] INFO
2024-03-29 00:41:01,909 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-03-29 00:41:01,909 [ scc.merge] INFO
2024-03-29 00:41:01,909 [ scc.merge] INFO Repository: ome/omero-figure
2024-03-29 00:41:01,909 [ scc.merge] INFO Excluded PRs:
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-03-29 00:41:01,909 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,909 [ scc.merge] INFO
2024-03-29 00:41:01,909 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-03-29 00:41:01,909 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-03-29 00:41:01,909 [ scc.merge] INFO
2024-03-29 00:41:01,909 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-03-29 00:41:01,909 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,909 [ scc.merge] INFO
2024-03-29 00:41:01,910 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-03-29 00:41:01,910 [ scc.merge] INFO
2024-03-29 00:41:01,910 [ scc.merge] INFO Repository: ome/omero-gallery
2024-03-29 00:41:01,910 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,910 [ scc.merge] INFO
2024-03-29 00:41:01,910 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-29 00:41:01,910 [ scc.merge] INFO
2024-03-29 00:41:01,910 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-03-29 00:41:01,910 [ scc.merge] INFO Excluded PRs:
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-03-29 00:41:01,910 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,910 [ scc.merge] INFO
2024-03-29 00:41:01,910 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-29 00:41:01,910 [ scc.merge] INFO
2024-03-29 00:41:01,910 [ scc.merge] INFO Repository: ome/omero-mapr
2024-03-29 00:41:01,910 [ scc.merge] INFO Excluded PRs:
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-03-29 00:41:01,910 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,910 [ scc.merge] INFO
2024-03-29 00:41:01,910 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-03-29 00:41:01,910 [ scc.merge] INFO
2024-03-29 00:41:01,910 [ scc.merge] INFO Repository: ome/omero-metadata
2024-03-29 00:41:01,910 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,910 [ scc.merge] INFO
2024-03-29 00:41:01,910 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-29 00:41:01,910 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-29 00:41:01,910 [ scc.merge] INFO
2024-03-29 00:41:01,910 [ scc.merge] INFO Repository: ome/omero-parade
2024-03-29 00:41:01,910 [ scc.merge] INFO Excluded PRs:
2024-03-29 00:41:01,911 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-03-29 00:41:01,911 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-03-29 00:41:01,911 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-03-29 00:41:01,911 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,911 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,911 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-29 00:41:01,911 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-29 00:41:01,911 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,911 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-03-29 00:41:01,911 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,911 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,911 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,911 [ scc.merge] INFO Repository: ome/omero-rois
2024-03-29 00:41:01,911 [ scc.merge] INFO Excluded PRs:
2024-03-29 00:41:01,911 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-29 00:41:01,911 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,911 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,911 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,911 [ scc.merge] INFO Repository: ome/omero-signup
2024-03-29 00:41:01,911 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,911 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-29 00:41:01,911 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,911 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-03-29 00:41:01,911 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,911 [ scc.merge] INFO Merged PRs:
2024-03-29 00:41:01,911 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,911 [ scc.merge] INFO Repository: ome/omero-upload
2024-03-29 00:41:01,911 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,911 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-03-29 00:41:01,912 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-03-29 00:41:01,912 [ scc.merge] INFO Excluded PRs:
2024-03-29 00:41:01,912 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-03-29 00:41:01,912 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-29 00:41:01,912 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-03-29 00:41:01,912 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-03-29 00:41:01,912 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-03-29 00:41:01,912 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-29 00:41:01,912 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO Repository: ome/scripts
2024-03-29 00:41:01,912 [ scc.merge] INFO Excluded PRs:
2024-03-29 00:41:01,912 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-03-29 00:41:01,912 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-03-29 00:41:01,912 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-03-29 00:41:01,912 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-03-29 00:41:01,912 [ scc.merge] INFO Already up to date.
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-29 00:41:01,912 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-29 00:41:01,912 [ scc.merge] INFO
2024-03-29 00:41:01,912 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-29 00:41:01,913 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-03-29 00:41:01,917 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-03-29 00:41:01,921 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-03-29 00:41:01,926 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-03-29 00:41:01,930 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-03-29 00:41:01,934 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-29 00:41:01,938 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-29 00:41:01,942 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-29 00:41:01,947 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-29 00:41:01,951 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-29 00:41:01,955 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-29 00:41:01,960 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-29 00:41:01,964 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-29 00:41:01,968 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-29 00:41:01,972 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-29 00:41:01,976 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-29 00:41:01,980 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-29 00:41:01,985 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-29 00:41:01,989 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-29 00:41:01,993 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:01,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:01,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-29 00:41:01,997 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:02,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:02,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-29 00:41:02,002 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:02,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-29 00:41:02,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-29 00:41:02,006 [ scc.git] DEBUG Calling 'git remote'
2024-03-29 00:41:02,010 [ 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 cfe3796] 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 73f82ca] 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-29 00:41:45,718 [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-29 00:41:54,560 [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-29 00:41:56,916 [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-29 00:42:01,385 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-03-29 00:42:51,367 [ 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/4be69ed6/images/svgs/logo.svg){kind=logo}
