Skipping 126 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-23 05:33:13,648 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-04-23 05:33:13,648 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-04-23 05:33:13,648 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-23 05:33:13,649 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-23 05:33:13,650 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-23 05:33:13,650 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-23 05:33:13,650 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-23 05:33:13,650 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-23 05:33:13,650 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-23 05:33:13,650 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-23 05:33:13,650 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-23 05:33:13,650 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-23 05:33:13,650 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-23 05:33:13,650 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-23 05:33:13,650 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-23 05:33:13,650 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-23 05:33:13,650 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-23 05:33:13,650 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-23 05:33:13,650 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-23 05:33:13,650 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-23 05:33:13,651 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-23 05:33:13,651 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-23 05:33:13,651 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-23 05:33:13,651 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-23 05:33:13,651 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-23 05:33:13,651 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-23 05:33:13,651 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-23 05:33:13,651 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-23 05:33:13,651 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-23 05:33:13,651 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-23 05:33:13,651 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-23 05:33:13,651 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-23 05:33:13,651 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-23 05:33:13,651 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-23 05:33:13,651 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-23 05:33:13,651 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-23 05:33:13,651 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-23 05:33:13,651 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-23 05:33:13,652 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-23 05:33:13,652 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-23 05:33:13,652 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-23 05:33:13,652 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-23 05:33:13,652 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-23 05:33:13,652 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-23 05:33:13,652 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-23 05:33:13,652 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-23 05:33:13,652 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-23 05:33:13,652 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-23 05:33:13,652 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-23 05:33:13,652 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-23 05:33:13,652 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-23 05:33:13,652 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-23 05:33:13,652 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-23 05:33:13,652 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-23 05:33:13,652 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-23 05:33:13,653 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-23 05:33:13,653 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-23 05:33:13,653 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-23 05:33:13,653 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-23 05:33:13,653 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-23 05:33:13,653 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-23 05:33:13,653 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-23 05:33:13,653 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-23 05:33:13,653 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-23 05:33:13,653 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-23 05:33:13,653 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-23 05:33:13,653 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-23 05:33:13,653 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-23 05:33:13,653 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-23 05:33:13,653 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-23 05:33:13,653 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-23 05:33:13,654 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-23 05:33:13,654 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-23 05:33:13,654 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-23 05:33:13,654 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-23 05:33:13,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:13,802 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7d25b9fb49959ba7f143c70927573efb62c9667e'
2024-04-23 05:33:13,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:13,823 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 553 (Figure_To_Pdf: use max plane size to select the appropriate zoom level) 7d25b9fb49959ba7f143c70927573efb62c9667e'
2024-04-23 05:33:13,853 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:33:13,857 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-23 05:33:13,858 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-23 05:33:14,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:14,202 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:33:14,248 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:14,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:14,255 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:33:14,315 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:33:14,328 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916abbebe0> has no local changes
2024-04-23 05:33:14,329 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
Generated by OMERO-plugins-push#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:33:14,342 [ scc.git] DEBUG [detached HEAD f1d4e67c] merge master -Dorg -Ssuccess-only
2024-04-23 05:33:14,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:33:14,343 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:33:14,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-23 05:33:15,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-23 05:33:15,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-23 05:33:16,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-23 05:33:16,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:33:17,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-23 05:33:17,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:33:17,596 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-23 05:33:17,596 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:33:17,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-23 05:33:17,596 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:17,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:17,603 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:33:17,610 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:33:17,610 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:33:17,617 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:33:17,625 [ scc.git] DEBUG Already up to date.
2024-04-23 05:33:17,625 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-23 05:33:18,029 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-23 05:33:18,029 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-23 05:33:18,034 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:33:18,035 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:18,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:18,041 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-23 05:33:18,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:18,058 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-23 05:33:18,094 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-23 05:33:18,095 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:33:18,098 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-23 05:33:18,099 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-23 05:33:18,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:18,266 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:33:18,334 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:18,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:18,347 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:33:18,397 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:33:18,405 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916ab8d550> has no local changes
2024-04-23 05:33:18,406 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:33:18,417 [ scc.git] DEBUG [detached HEAD ff0c359] merge master -Dorg -Ssuccess-only
2024-04-23 05:33:18,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:33:18,418 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:33:18,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-23 05:33:19,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-23 05:33:19,247 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-23 05:33:19,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-23 05:33:20,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:33:20,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-23 05:33:21,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-23 05:33:21,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:33:21,763 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-23 05:33:21,764 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:33:21,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-23 05:33:21,764 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:21,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:21,770 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:33:21,778 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:33:21,779 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:33:21,786 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:33:21,793 [ scc.git] DEBUG Already up to date.
2024-04-23 05:33:21,793 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-23 05:33:22,199 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-23 05:33:22,199 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-23 05:33:22,205 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:33:22,205 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:22,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:22,211 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-23 05:33:22,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:22,224 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-23 05:33:22,236 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:33:22,241 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-23 05:33:22,241 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-23 05:33:22,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:22,405 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:33:22,447 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:22,447 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:22,454 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:33:22,494 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:33:22,502 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916ab7f9d0> has no local changes
2024-04-23 05:33:22,502 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:33:22,512 [ scc.git] DEBUG [detached HEAD 6539f7e] merge master -Dorg -Ssuccess-only
2024-04-23 05:33:22,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:33:22,513 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:33:22,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-23 05:33:23,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-04-23 05:33:23,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-04-23 05:33:24,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-23 05:33:24,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:33:25,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-23 05:33:25,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-23 05:33:26,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:33:26,287 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-23 05:33:26,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-23 05:33:27,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-23 05:33:27,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170 HTTP/1.1" 200 None
2024-04-23 05:33:28,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:33:28,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-23 05:33:29,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170 HTTP/1.1" 200 None
2024-04-23 05:33:29,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/44025ed69514a02ecbc5d4655d3da7519ebf9170?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:33:29,611 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-23 05:33:30,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-23 05:33:30,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-23 05:33:31,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:33:31,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-23 05:33:31,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-23 05:33:32,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:33:32,393 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-23 05:33:32,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-23 05:33:33,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-23 05:33:33,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-23 05:33:34,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:33:34,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-23 05:33:35,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-23 05:33:35,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:33:35,704 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-23 05:33:36,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-23 05:33:36,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-23 05:33:37,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-23 05:33:37,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:33:38,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-23 05:33:38,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:33:38,486 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-23 05:33:38,487 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:33:38,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-23 05:33:38,487 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:38,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:38,496 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:33:38,502 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:33:38,502 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:33:38,507 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:33:38,513 [ scc.git] DEBUG Already up to date.
2024-04-23 05:33:38,513 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-23 05:33:38,940 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-23 05:33:38,940 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-23 05:33:38,945 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-23 05:33:39,886 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-23 05:33:39,886 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-23 05:33:39,892 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-23 05:33:40,306 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-23 05:33:40,306 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-23 05:33:40,311 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-23 05:33:40,975 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-23 05:33:40,975 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-23 05:33:40,981 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-04-23 05:33:41,479 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-23 05:33:41,479 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-04-23 05:33:41,484 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:33:41,484 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:41,484 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:41,491 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-23 05:33:41,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:41,505 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-23 05:33:41,529 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:33:41,533 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-23 05:33:41,533 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-23 05:33:41,533 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-23 05:33:41,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:41,686 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-23 05:33:41,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:41,700 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-23 05:33:41,780 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:33:41,785 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-23 05:33:41,785 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-23 05:33:41,785 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-23 05:33:41,785 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-23 05:33:41,785 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-23 05:33:41,785 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-23 05:33:41,786 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-23 05:33:41,786 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-23 05:33:41,786 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-23 05:33:42,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:42,081 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-23 05:33:42,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:42,096 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-23 05:33:42,123 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:33:42,126 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-23 05:33:42,126 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-23 05:33:42,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:42,483 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...44025ed69514a02ecbc5d4655d3da7519ebf9170'
2024-04-23 05:33:42,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:42,498 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 44025ed69514a02ecbc5d4655d3da7519ebf9170'
2024-04-23 05:33:42,562 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-23 05:33:42,562 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:33:42,568 [ scc.git] DEBUG css/app.css | 22 +++++
2024-04-23 05:33:42,568 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-23 05:33:42,568 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-23 05:33:42,568 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-23 05:33:42,568 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 160 ++++++++++++++++++++++++-------------
2024-04-23 05:33:42,568 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 42 +++++++++-
2024-04-23 05:33:42,568 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-23 05:33:42,568 [ scc.git] DEBUG 7 files changed, 190 insertions(+), 61 deletions(-)
2024-04-23 05:33:42,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:42,898 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-23 05:33:42,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:42,910 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-23 05:33:42,945 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:33:42,948 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-04-23 05:33:42,948 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-04-23 05:33:42,948 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-04-23 05:33:43,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:43,314 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:33:43,356 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:43,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:43,363 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:33:43,409 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:33:43,419 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916ab805b0> has no local changes
2024-04-23 05:33:43,419 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:33:43,431 [ scc.git] DEBUG [detached HEAD 0b68fcf] merge master -Dorg -Ssuccess-only
2024-04-23 05:33:43,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:33:43,432 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:33:43,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-23 05:33:44,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-23 05:33:44,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-23 05:33:45,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-23 05:33:45,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:33:46,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-23 05:33:46,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-23 05:33:47,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:33:47,121 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-23 05:33:47,121 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:33:47,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-23 05:33:47,121 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:47,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:47,130 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:33:47,136 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:33:47,136 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:33:47,143 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:33:47,150 [ scc.git] DEBUG Already up to date.
2024-04-23 05:33:47,150 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-23 05:33:47,515 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-23 05:33:47,515 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-23 05:33:47,519 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:33:47,519 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:47,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:47,526 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-23 05:33:47,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:47,540 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-23 05:33:47,551 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:33:47,554 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-23 05:33:47,554 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-23 05:33:47,554 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-23 05:33:47,554 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-23 05:33:47,554 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-23 05:33:47,554 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-23 05:33:47,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:47,727 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:33:47,774 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:47,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:47,781 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:33:47,826 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:33:47,834 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916ab744f0> has no local changes
2024-04-23 05:33:47,835 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:33:47,846 [ scc.git] DEBUG [detached HEAD 668aa14] merge master -Dorg -Ssuccess-only
2024-04-23 05:33:47,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:33:47,847 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:33:48,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-23 05:33:48,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-23 05:33:49,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-23 05:33:49,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-23 05:33:50,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:33:50,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-23 05:33:51,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:33:51,113 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-23 05:33:51,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-23 05:33:52,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-23 05:33:52,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-23 05:33:52,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:33:53,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-23 05:33:53,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:33:53,972 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-23 05:33:53,973 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:33:53,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-23 05:33:53,973 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:53,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:53,979 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:33:53,984 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:33:53,984 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:33:53,989 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:33:53,995 [ scc.git] DEBUG Already up to date.
2024-04-23 05:33:53,995 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-23 05:33:54,462 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-23 05:33:54,462 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-23 05:33:54,467 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-23 05:33:54,952 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-23 05:33:54,952 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-23 05:33:54,959 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:33:54,959 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:54,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:54,965 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-23 05:33:54,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:54,980 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-23 05:33:55,040 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-23 05:33:55,041 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-23 05:33:55,041 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-23 05:33:55,041 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-23 05:33:55,041 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-23 05:33:55,041 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-23 05:33:55,048 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-23 05:33:55,056 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-23 05:33:55,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:55,213 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-23 05:33:55,220 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-23 05:33:55,226 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#39](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-04-23 05:33:55,231 [ scc.config] DEBUG Found github.token
2024-04-23 05:33:55,231 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-23 05:33:55,231 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-23 05:33:55,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:55,244 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-23 05:33:55,263 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-23 05:33:55,263 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-23 05:33:55,263 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-23 05:33:55,263 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-23 05:33:55,264 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-23 05:33:55,270 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-23 05:33:55,278 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-23 05:33:55,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:33:55,627 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-23 05:33:55,634 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-23 05:33:55,641 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#39](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-04-23 05:33:55,647 [ scc.config] DEBUG Found github.token
2024-04-23 05:33:55,647 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-23 05:33:55,647 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:33:55,689 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:33:55,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:33:55,696 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:33:55,747 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:33:55,755 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916ab80550> has no local changes
2024-04-23 05:33:55,755 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:33:55,765 [ scc.git] DEBUG [detached HEAD 8ebacd6] merge master -Dorg -Ssuccess-only
2024-04-23 05:33:55,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:33:55,766 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:33:56,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-23 05:33:56,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-23 05:33:56,701 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-23 05:33:57,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-23 05:33:57,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:33:58,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-23 05:33:58,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-23 05:33:59,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:33:59,122 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-23 05:33:59,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-23 05:33:59,597 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-23 05:34:00,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-23 05:34:00,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:34:01,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-23 05:34:01,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-23 05:34:02,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:34:02,190 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-23 05:34:02,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-23 05:34:02,664 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-23 05:34:03,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-23 05:34:03,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:34:04,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-23 05:34:04,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-23 05:34:05,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:34:05,163 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-23 05:34:05,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-23 05:34:06,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-23 05:34:06,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-23 05:34:07,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-23 05:34:07,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-23 05:34:08,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-23 05:34:08,038 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:08,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-23 05:34:08,038 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:08,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:08,044 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:34:08,048 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:08,048 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:34:08,054 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:34:08,059 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:08,059 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-23 05:34:08,430 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-23 05:34:08,431 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-23 05:34:08,435 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-23 05:34:08,804 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-23 05:34:08,804 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-23 05:34:08,809 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-23 05:34:09,183 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-23 05:34:09,183 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-23 05:34:09,187 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:09,187 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:09,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:09,194 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-23 05:34:09,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:09,205 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-23 05:34:09,215 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:34:09,218 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-23 05:34:09,218 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-23 05:34:09,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:09,388 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-23 05:34:09,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:09,400 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-23 05:34:09,447 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-23 05:34:09,447 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:34:09,451 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-23 05:34:09,451 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-23 05:34:09,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:09,804 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-23 05:34:09,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:09,817 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-23 05:34:09,843 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-23 05:34:09,844 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:34:09,847 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-23 05:34:09,847 [ scc.git] DEBUG package.json | 2 +-
2024-04-23 05:34:09,847 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-23 05:34:10,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:10,211 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:10,252 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:10,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:10,258 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:10,298 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:10,306 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916ab99fd0> has no local changes
2024-04-23 05:34:10,306 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:10,315 [ scc.git] DEBUG [detached HEAD 18ffdf1] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:10,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:10,315 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:34:10,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-23 05:34:11,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-23 05:34:11,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-23 05:34:12,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:34:12,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-23 05:34:13,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:34:13,163 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-23 05:34:13,164 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:13,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-23 05:34:13,164 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:13,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:13,170 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:34:13,175 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:13,176 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:34:13,181 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:34:13,187 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:13,187 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-23 05:34:13,559 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-23 05:34:13,559 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-23 05:34:13,564 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:13,564 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:13,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:13,570 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-23 05:34:13,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:13,582 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-23 05:34:13,591 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:34:13,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:13,746 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:13,787 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:13,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:13,793 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:13,834 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:13,841 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f91682fc340> has no local changes
2024-04-23 05:34:13,841 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:13,850 [ scc.git] DEBUG [detached HEAD a749457] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:13,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:13,850 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:34:14,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-23 05:34:14,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-23 05:34:15,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-23 05:34:15,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-23 05:34:16,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-23 05:34:16,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:34:17,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-23 05:34:17,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:34:17,469 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-23 05:34:17,469 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:17,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-23 05:34:17,469 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:17,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:17,476 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:34:17,481 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:17,481 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:34:17,487 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:34:17,493 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:17,494 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-23 05:34:17,965 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-23 05:34:17,965 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-23 05:34:17,971 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:17,971 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:17,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:17,977 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-23 05:34:17,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:17,988 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-23 05:34:17,998 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-23 05:34:17,998 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:34:18,001 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-23 05:34:18,001 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-23 05:34:18,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:18,160 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:18,202 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:18,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:18,208 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:18,267 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:18,274 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f91683385b0> has no local changes
2024-04-23 05:34:18,274 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:18,283 [ scc.git] DEBUG [detached HEAD c78ad9e] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:18,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:18,284 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:34:18,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-23 05:34:19,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-23 05:34:19,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-23 05:34:20,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-23 05:34:20,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:34:21,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-23 05:34:21,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:34:21,502 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-23 05:34:21,502 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:21,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-23 05:34:21,503 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:21,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:21,508 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:34:21,513 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:21,513 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:34:21,517 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:34:21,523 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:21,523 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-23 05:34:21,943 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-23 05:34:21,944 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-23 05:34:21,949 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:21,949 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:21,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:21,955 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-23 05:34:21,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:21,967 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-23 05:34:21,994 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-23 05:34:21,994 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-23 05:34:21,995 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-23 05:34:21,995 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-23 05:34:21,995 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-23 05:34:21,995 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-23 05:34:21,995 [ scc.git] DEBUG Auto-merging setup.py
2024-04-23 05:34:21,995 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-23 05:34:21,995 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-23 05:34:21,995 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-23 05:34:22,001 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-23 05:34:22,013 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-23 05:34:22,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:22,161 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-23 05:34:22,168 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-23 05:34:22,174 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#39](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2024-04-23 05:34:22,179 [ scc.config] DEBUG Found github.token
2024-04-23 05:34:22,179 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-23 05:34:22,179 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:22,220 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:22,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:22,225 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:22,266 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:22,273 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916ab7fe80> has no local changes
2024-04-23 05:34:22,273 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:22,282 [ scc.git] DEBUG [detached HEAD 1aaeeb0] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:22,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:22,283 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:34:22,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-23 05:34:23,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-23 05:34:23,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-23 05:34:24,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-23 05:34:24,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:34:25,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-23 05:34:25,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:34:25,450 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-23 05:34:25,450 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:25,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-23 05:34:25,451 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:25,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:25,457 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:34:25,462 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:25,463 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:34:25,469 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:34:25,474 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:25,474 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-23 05:34:25,908 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-23 05:34:25,909 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-23 05:34:25,914 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:25,914 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:25,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:25,921 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-23 05:34:25,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:25,937 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-04-23 05:34:25,954 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-23 05:34:25,958 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-23 05:34:25,958 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-23 05:34:25,958 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-23 05:34:25,958 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-23 05:34:25,958 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-23 05:34:25,958 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-23 05:34:25,958 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-23 05:34:25,958 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-23 05:34:25,960 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-23 05:34:25,960 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-23 05:34:25,960 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-23 05:34:25,960 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-23 05:34:25,960 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-23 05:34:25,960 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-23 05:34:25,960 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-23 05:34:25,960 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-23 05:34:25,961 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-23 05:34:25,961 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-23 05:34:25,961 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-23 05:34:25,961 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-23 05:34:25,961 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-23 05:34:25,961 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-23 05:34:25,961 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-23 05:34:25,961 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-23 05:34:26,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:26,116 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:26,160 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:26,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:26,166 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:26,209 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:26,216 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916ab99df0> has no local changes
2024-04-23 05:34:26,216 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:26,233 [ scc.git] DEBUG [detached HEAD 997a840] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:26,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:26,233 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:34:26,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-23 05:34:26,575 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:26,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-23 05:34:26,575 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:26,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:26,581 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:34:26,586 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:26,587 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:34:26,593 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:34:26,599 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:26,599 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:26,599 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:26,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:26,604 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:26,646 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:26,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:26,652 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:26,692 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:26,699 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9168337fa0> has no local changes
2024-04-23 05:34:26,699 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:26,708 [ scc.git] DEBUG [detached HEAD b983413] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:26,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:26,708 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:34:27,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-23 05:34:27,005 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:27,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-23 05:34:27,005 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:27,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:27,011 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:34:27,016 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:27,016 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:34:27,021 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:34:27,026 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:27,026 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:27,026 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:27,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:27,032 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:27,076 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:27,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:27,082 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:27,125 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:27,132 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f91682e7f70> has no local changes
2024-04-23 05:34:27,132 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:27,141 [ scc.git] DEBUG [detached HEAD 67cb1e4] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:27,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:27,142 [ scc.git] INFO Overriding base-branch from master to main
2024-04-23 05:34:27,142 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:34:27,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-23 05:34:27,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-23 05:34:28,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-23 05:34:28,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-23 05:34:29,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-23 05:34:29,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:34:30,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-23 05:34:30,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-23 05:34:31,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:34:31,297 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-23 05:34:31,297 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:31,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-23 05:34:31,298 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:31,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:31,304 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-23 05:34:31,309 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:31,309 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-23 05:34:31,315 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-23 05:34:31,321 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:31,322 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-23 05:34:31,728 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-23 05:34:31,729 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-23 05:34:31,733 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:31,734 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:31,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:31,740 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-23 05:34:31,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:31,752 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-23 05:34:31,770 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-23 05:34:31,770 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-23 05:34:31,770 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-23 05:34:31,771 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-23 05:34:31,777 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-23 05:34:31,784 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-23 05:34:31,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:31,947 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-23 05:34:31,953 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-23 05:34:31,959 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#39](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-23 05:34:31,964 [ scc.config] DEBUG Found github.token
2024-04-23 05:34:31,964 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-23 05:34:31,965 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:32,008 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:32,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:32,014 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:32,055 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:32,062 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f91682d3430> has no local changes
2024-04-23 05:34:32,063 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:32,071 [ scc.git] DEBUG [detached HEAD 1ebe052] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:32,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:32,072 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:34:32,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-23 05:34:32,368 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:32,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-23 05:34:32,368 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:32,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:32,374 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:34:32,378 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:32,379 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:34:32,384 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:34:32,390 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:32,390 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:32,390 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:32,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:32,394 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:32,433 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:32,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:32,439 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:32,477 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:32,484 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f91682fae50> has no local changes
2024-04-23 05:34:32,484 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:32,493 [ scc.git] DEBUG [detached HEAD e4b164e] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:32,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:32,493 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:34:32,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-23 05:34:32,807 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:32,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-23 05:34:32,807 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:32,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:32,814 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:34:32,820 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:32,820 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:34:32,825 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:34:32,830 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:32,831 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:32,831 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:32,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:32,836 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:32,880 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:32,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:32,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:32,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:32,935 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916821b940> has no local changes
2024-04-23 05:34:32,935 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:32,944 [ scc.git] DEBUG [detached HEAD 3626f58] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:32,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:32,945 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:34:33,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-23 05:34:33,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-23 05:34:34,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-23 05:34:34,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-23 05:34:35,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:34:35,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-23 05:34:36,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:34:36,127 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-23 05:34:36,127 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:36,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-23 05:34:36,127 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:36,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:36,134 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-23 05:34:36,139 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:36,140 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-23 05:34:36,146 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-23 05:34:36,153 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:36,153 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-23 05:34:36,584 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-23 05:34:36,584 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-23 05:34:36,589 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:36,589 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:36,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:36,595 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-23 05:34:36,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:36,607 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-23 05:34:36,642 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-23 05:34:36,642 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-23 05:34:36,642 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-23 05:34:36,643 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-23 05:34:36,649 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-23 05:34:36,657 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-23 05:34:36,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:36,822 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-23 05:34:36,829 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-23 05:34:36,835 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#39](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-23 05:34:36,840 [ scc.config] DEBUG Found github.token
2024-04-23 05:34:36,840 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-23 05:34:36,841 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:36,882 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:36,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:36,888 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:36,929 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:36,936 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916826c9d0> has no local changes
2024-04-23 05:34:36,937 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:36,946 [ scc.git] DEBUG [detached HEAD 34e10c8] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:36,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:36,946 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-23 05:34:36,946 [ scc.repo] DEBUG ## PRs found:
2024-04-23 05:34:37,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-23 05:34:37,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-23 05:34:38,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-23 05:34:38,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-23 05:34:39,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-23 05:34:39,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-23 05:34:40,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-23 05:34:40,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-23 05:34:41,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-23 05:34:41,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-23 05:34:41,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-23 05:34:41,995 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-23 05:34:42,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-23 05:34:43,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-23 05:34:43,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-23 05:34:43,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-23 05:34:43,974 [ scc.repo] DEBUG ## Branches found:
2024-04-23 05:34:43,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-23 05:34:43,974 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:43,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:43,980 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-23 05:34:43,986 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-23 05:34:43,986 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-23 05:34:43,992 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-23 05:34:44,001 [ scc.git] DEBUG Already up to date.
2024-04-23 05:34:44,001 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-23 05:34:44,427 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-23 05:34:44,427 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-23 05:34:44,432 [ scc.git] DEBUG ## Unique users: []
2024-04-23 05:34:44,432 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:44,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:44,439 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-23 05:34:44,447 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:44,453 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-23 05:34:44,514 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-23 05:34:44,514 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-23 05:34:44,514 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-23 05:34:44,515 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-23 05:34:44,522 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-23 05:34:44,529 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-23 05:34:44,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:44,687 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-23 05:34:44,696 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-23 05:34:44,703 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#39](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-23 05:34:44,708 [ scc.config] DEBUG Found github.token
2024-04-23 05:34:44,708 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-23 05:34:44,709 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-23 05:34:44,750 [ scc.git] DEBUG Get sha1 of %s
2024-04-23 05:34:44,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-23 05:34:44,758 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:44,796 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:44,804 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916821bbb0> has no local changes
2024-04-23 05:34:44,804 [ 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#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:44,814 [ scc.git] DEBUG [detached HEAD 07f6020] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:44,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:44,814 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-23 05:34:44,894 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-23 05:34:45,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:45,140 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-23 05:34:45,145 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-23 05:34:45,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:45,547 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-23 05:34:45,552 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-23 05:34:45,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:45,957 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-23 05:34:45,962 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-23 05:34:46,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:46,365 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-23 05:34:46,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:46,787 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-23 05:34:46,793 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-23 05:34:47,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:47,204 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-23 05:34:47,208 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-23 05:34:47,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:47,605 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-23 05:34:47,611 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-23 05:34:48,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:48,020 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-23 05:34:48,025 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-23 05:34:48,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:48,428 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-23 05:34:48,435 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-23 05:34:48,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:48,826 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-23 05:34:48,832 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-23 05:34:49,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:49,228 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-23 05:34:49,233 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-23 05:34:49,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:49,637 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-23 05:34:49,643 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-23 05:34:50,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:50,044 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-23 05:34:50,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:50,453 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-23 05:34:50,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:50,856 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-23 05:34:50,864 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-23 05:34:51,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:51,266 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-23 05:34:51,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:51,680 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-23 05:34:52,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:52,090 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-23 05:34:52,095 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-23 05:34:52,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:52,494 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-23 05:34:52,499 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-23 05:34:52,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:52,941 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-23 05:34:52,946 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-23 05:34:53,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:53,350 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-23 05:34:53,355 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-23 05:34:53,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-23 05:34:53,758 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-23 05:34:53,759 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-23 05:34:53,840 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f916bd1aac0> has local changes
2024-04-23 05:34:53,840 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
- PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#39 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/39/)'
2024-04-23 05:34:53,877 [ scc.git] DEBUG [detached HEAD 0b64f40] merge master -Dorg -Ssuccess-only
2024-04-23 05:34:53,877 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-23 05:34:53,877 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-23 05:34:53,878 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,878 [ scc.merge] INFO
2024-04-23 05:34:53,878 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,878 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-04-23 05:34:53,878 [ scc.merge] INFO - PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
2024-04-23 05:34:53,878 [ scc.merge] INFO
2024-04-23 05:34:53,878 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-23 05:34:53,878 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,878 [ scc.merge] INFO
2024-04-23 05:34:53,878 [ scc.merge] INFO
2024-04-23 05:34:53,878 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-23 05:34:53,878 [ scc.merge] INFO Excluded PRs:
2024-04-23 05:34:53,878 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-23 05:34:53,878 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,878 [ scc.merge] INFO
2024-04-23 05:34:53,878 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,878 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-23 05:34:53,878 [ scc.merge] INFO
2024-04-23 05:34:53,878 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-23 05:34:53,878 [ scc.merge] INFO Excluded PRs:
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-23 05:34:53,879 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,879 [ scc.merge] INFO
2024-04-23 05:34:53,879 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-23 05:34:53,879 [ scc.merge] INFO
2024-04-23 05:34:53,879 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-23 05:34:53,879 [ scc.merge] INFO Excluded PRs:
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-23 05:34:53,879 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,879 [ scc.merge] INFO
2024-04-23 05:34:53,879 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-23 05:34:53,879 [ scc.merge] INFO
2024-04-23 05:34:53,879 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-23 05:34:53,879 [ scc.merge] INFO
2024-04-23 05:34:53,879 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-23 05:34:53,879 [ scc.merge] INFO Excluded PRs:
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-23 05:34:53,879 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-23 05:34:53,879 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,879 [ scc.merge] INFO
2024-04-23 05:34:53,880 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
2024-04-23 05:34:53,880 [ scc.merge] INFO
2024-04-23 05:34:53,880 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-23 05:34:53,880 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,880 [ scc.merge] INFO
2024-04-23 05:34:53,880 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-23 05:34:53,880 [ scc.merge] INFO
2024-04-23 05:34:53,880 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-23 05:34:53,880 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,880 [ scc.merge] INFO
2024-04-23 05:34:53,880 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-23 05:34:53,880 [ scc.merge] INFO
2024-04-23 05:34:53,880 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-23 05:34:53,880 [ scc.merge] INFO Excluded PRs:
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-23 05:34:53,880 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,880 [ scc.merge] INFO
2024-04-23 05:34:53,880 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-23 05:34:53,880 [ scc.merge] INFO
2024-04-23 05:34:53,880 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-23 05:34:53,880 [ scc.merge] INFO Excluded PRs:
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-23 05:34:53,880 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,880 [ scc.merge] INFO
2024-04-23 05:34:53,880 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,880 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-23 05:34:53,880 [ scc.merge] INFO
2024-04-23 05:34:53,880 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-23 05:34:53,880 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,880 [ scc.merge] INFO
2024-04-23 05:34:53,881 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-23 05:34:53,881 [ scc.merge] INFO
2024-04-23 05:34:53,881 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-23 05:34:53,881 [ scc.merge] INFO Excluded PRs:
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-23 05:34:53,881 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,881 [ scc.merge] INFO
2024-04-23 05:34:53,881 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-23 05:34:53,881 [ scc.merge] INFO
2024-04-23 05:34:53,881 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-23 05:34:53,881 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,881 [ scc.merge] INFO
2024-04-23 05:34:53,881 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-23 05:34:53,881 [ scc.merge] INFO
2024-04-23 05:34:53,881 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-23 05:34:53,881 [ scc.merge] INFO Excluded PRs:
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-23 05:34:53,881 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,881 [ scc.merge] INFO
2024-04-23 05:34:53,881 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-23 05:34:53,881 [ scc.merge] INFO
2024-04-23 05:34:53,881 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-23 05:34:53,881 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,881 [ scc.merge] INFO
2024-04-23 05:34:53,881 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-23 05:34:53,881 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-23 05:34:53,881 [ scc.merge] INFO
2024-04-23 05:34:53,881 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-23 05:34:53,881 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,881 [ scc.merge] INFO
2024-04-23 05:34:53,881 [ scc.merge] INFO Merged PRs:
2024-04-23 05:34:53,882 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-23 05:34:53,882 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-23 05:34:53,882 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-23 05:34:53,882 [ scc.merge] INFO Excluded PRs:
2024-04-23 05:34:53,882 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-23 05:34:53,882 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-23 05:34:53,882 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-23 05:34:53,882 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-23 05:34:53,882 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-23 05:34:53,882 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-23 05:34:53,882 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-23 05:34:53,882 [ scc.merge] INFO
2024-04-23 05:34:53,882 [ scc.merge] INFO Repository: ome/scripts
2024-04-23 05:34:53,882 [ scc.merge] INFO Excluded PRs:
2024-04-23 05:34:53,882 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-23 05:34:53,882 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-23 05:34:53,882 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-23 05:34:53,882 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-23 05:34:53,882 [ scc.merge] INFO Already up to date.
2024-04-23 05:34:53,883 [ scc.merge] INFO
2024-04-23 05:34:53,883 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-23 05:34:53,883 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-23 05:34:53,883 [ scc.merge] INFO
2024-04-23 05:34:53,883 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-23 05:34:53,883 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-23 05:34:53,890 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-23 05:34:53,895 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-23 05:34:53,901 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-23 05:34:53,907 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-23 05:34:53,913 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-23 05:34:53,919 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-23 05:34:53,925 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-23 05:34:53,931 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-23 05:34:53,937 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-23 05:34:53,943 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-23 05:34:53,949 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-23 05:34:53,955 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-23 05:34:53,960 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-23 05:34:53,966 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-23 05:34:53,972 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,979 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-23 05:34:53,979 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-23 05:34:53,985 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-23 05:34:53,991 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:53,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:53,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-23 05:34:53,997 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:54,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:54,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-23 05:34:54,003 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:54,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:54,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-23 05:34:54,009 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:54,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-23 05:34:54,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-23 05:34:54,014 [ scc.git] DEBUG Calling 'git remote'
2024-04-23 05:34:54,019 [ 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 8c22d78] 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 87d179a0
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 9d8d147
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD 72e518b] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-04-23 05:35:42,031 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-04-23 05:35:51,448 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-04-23 05:35:53,774 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-23 05:35:58,425 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-23 05:36:45,376 [ 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}
