Skipping 120 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-03-31 00:44:23,821 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-03-31 00:44:23,821 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-03-31 00:44:23,821 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-03-31 00:44:23,821 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-03-31 00:44:23,821 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-03-31 00:44:23,821 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-03-31 00:44:23,821 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-03-31 00:44:23,821 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-03-31 00:44:23,821 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-03-31 00:44:23,821 [ scc.git] DEBUG create mode 100644 src/.env
2024-03-31 00:44:23,821 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-03-31 00:44:23,821 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-03-31 00:44:23,821 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-03-31 00:44:23,821 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-03-31 00:44:23,821 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-03-31 00:44:23,821 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-03-31 00:44:23,821 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-03-31 00:44:23,821 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-03-31 00:44:23,821 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/index.html
2024-03-31 00:44:23,822 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-03-31 00:44:23,822 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-03-31 00:44:23,822 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-03-31 00:44:23,822 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-03-31 00:44:23,823 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-03-31 00:44:23,823 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-03-31 00:44:23,823 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-03-31 00:44:23,823 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-03-31 00:44:23,823 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-03-31 00:44:23,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:44:23,978 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-31 00:44:23,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:23,992 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 548 (Fix cropping of panel labels and float usage for shape labels) 32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-31 00:44:24,010 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:44:24,013 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-03-31 00:44:24,013 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-03-31 00:44:24,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:44:24,382 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:44:24,421 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:44:24,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:24,427 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:44:24,465 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:44:24,472 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a74e10fd0> has no local changes
2024-03-31 00:44:24,472 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
Generated by OMERO-plugins-push#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:44:24,481 [ scc.git] DEBUG [detached HEAD e52a8f02] merge master -Dorg -Ssuccess-only
2024-03-31 00:44:24,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:44:24,482 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:44:24,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-03-31 00:44:25,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-03-31 00:44:25,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-03-31 00:44:26,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-31 00:44:26,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:44:27,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-31 00:44:27,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:44:27,609 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-03-31 00:44:27,609 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:44:27,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-31 00:44:27,609 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:44:27,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:27,616 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:44:27,621 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:44:27,622 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:44:27,629 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:44:27,640 [ scc.git] DEBUG Already up to date.
2024-03-31 00:44:27,641 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-03-31 00:44:28,069 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-03-31 00:44:28,070 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-03-31 00:44:28,076 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:44:28,076 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:44:28,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:28,082 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-31 00:44:28,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:28,092 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-31 00:44:28,168 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-03-31 00:44:28,168 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:44:28,171 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-03-31 00:44:28,171 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-03-31 00:44:28,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:44:28,327 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:44:28,369 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:44:28,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:28,374 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:44:28,417 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:44:28,423 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a745874f0> has no local changes
2024-03-31 00:44:28,424 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:44:28,432 [ scc.git] DEBUG [detached HEAD c61fa69] merge master -Dorg -Ssuccess-only
2024-03-31 00:44:28,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:44:28,433 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:44:28,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-03-31 00:44:29,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-03-31 00:44:29,289 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-31 00:44:29,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-31 00:44:30,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:44:30,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:44:31,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-31 00:44:31,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:44:31,730 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-31 00:44:31,731 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:44:31,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-31 00:44:31,731 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:44:31,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:31,736 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:44:31,741 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:44:31,741 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:44:31,746 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:44:31,751 [ scc.git] DEBUG Already up to date.
2024-03-31 00:44:31,751 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-03-31 00:44:32,166 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-03-31 00:44:32,167 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-03-31 00:44:32,171 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:44:32,171 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:44:32,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:32,177 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-03-31 00:44:32,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:32,190 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-03-31 00:44:32,202 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:44:32,206 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-03-31 00:44:32,206 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-03-31 00:44:32,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:44:32,359 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:44:32,400 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:44:32,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:32,406 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:44:32,449 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:44:32,457 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a74583a90> has no local changes
2024-03-31 00:44:32,457 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:44:32,466 [ scc.git] DEBUG [detached HEAD 5b0605d] merge master -Dorg -Ssuccess-only
2024-03-31 00:44:32,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:44:32,467 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:44:32,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-03-31 00:44:33,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/468 HTTP/1.1" 200 None
2024-03-31 00:44:33,415 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-31 00:44:34,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-03-31 00:44:34,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:44:35,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:44:35,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-03-31 00:44:35,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/9f06f398570cddff1332355e1eda0fe54d88881d?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:44:35,914 [ scc.repo] DEBUG - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-03-31 00:44:36,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-03-31 00:44:36,371 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-31 00:44:36,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-31 00:44:37,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:44:37,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:44:38,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-31 00:44:38,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/78e253cccecbd349db3bcb16514f5c8b2c4185e6?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:44:38,851 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-31 00:44:39,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-03-31 00:44:39,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-03-31 00:44:40,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:44:40,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:44:41,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-03-31 00:44:41,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/105a9369cdb853508da5ec4e0839c6f448bf3407?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:44:41,633 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-03-31 00:44:42,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-03-31 00:44:42,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-03-31 00:44:43,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-31 00:44:43,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:44:43,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:44:44,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-31 00:44:44,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/97542d9b749f93d4902f7dce703bbf2a04316a98?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:44:44,882 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-03-31 00:44:45,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-03-31 00:44:45,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-03-31 00:44:46,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-31 00:44:46,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:44:47,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-31 00:44:47,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:44:47,576 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-03-31 00:44:48,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-03-31 00:44:48,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-03-31 00:44:48,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-31 00:44:49,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:44:49,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:44:50,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-31 00:44:50,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:44:50,756 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-31 00:44:50,756 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:44:50,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-31 00:44:50,756 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:44:50,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:50,766 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:44:50,778 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:44:50,779 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:44:50,788 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:44:50,797 [ scc.git] DEBUG Already up to date.
2024-03-31 00:44:50,798 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-03-31 00:44:51,246 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-31 00:44:51,247 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-03-31 00:44:51,259 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-03-31 00:44:51,725 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-31 00:44:51,725 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-03-31 00:44:51,732 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-03-31 00:44:52,206 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-31 00:44:52,206 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-03-31 00:44:52,213 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-03-31 00:44:53,026 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-31 00:44:53,026 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-03-31 00:44:53,033 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-03-31 00:44:53,428 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-31 00:44:53,429 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-03-31 00:44:53,434 [ scc.git] DEBUG Calling 'git fetch origin pull/468/head'
2024-03-31 00:44:53,835 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-31 00:44:53,835 [ scc.git] DEBUG * branch refs/pull/468/head -> FETCH_HEAD
2024-03-31 00:44:53,840 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:44:53,840 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:44:53,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:53,847 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-03-31 00:44:53,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:53,859 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 456 (Don't use tiles for non-big movies) 2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-03-31 00:44:53,904 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:44:53,907 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-03-31 00:44:53,907 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-03-31 00:44:54,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:44:54,069 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-31 00:44:54,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:54,083 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-31 00:44:54,130 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:44:54,133 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-03-31 00:44:54,133 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-03-31 00:44:54,133 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-03-31 00:44:54,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:44:54,461 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-31 00:44:54,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:54,475 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-31 00:44:54,535 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:44:54,540 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-03-31 00:44:54,540 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-03-31 00:44:54,540 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-03-31 00:44:54,540 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-03-31 00:44:54,540 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-03-31 00:44:54,540 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-03-31 00:44:54,540 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-03-31 00:44:54,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:44:54,856 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-03-31 00:44:54,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:54,870 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-03-31 00:44:54,954 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-03-31 00:44:54,955 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:44:54,959 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-03-31 00:44:54,959 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-03-31 00:44:54,959 [ scc.git] DEBUG src/app/header.html | 5 +
2024-03-31 00:44:54,959 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-03-31 00:44:54,959 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-03-31 00:44:54,959 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-03-31 00:44:54,959 [ scc.git] DEBUG 6 files changed, 283 insertions(+), 6 deletions(-)
2024-03-31 00:44:54,959 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-03-31 00:44:55,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:44:55,260 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-31 00:44:55,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:55,282 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 467 (Bump webpack-dev-middleware from 5.3.3 to 5.3.4) 78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-31 00:44:55,344 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:44:55,356 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-03-31 00:44:55,356 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-03-31 00:44:55,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:44:55,658 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f06f398570cddff1332355e1eda0fe54d88881d'
2024-03-31 00:44:55,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:55,683 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 468 (Bump express from 4.18.2 to 4.19.2) 9f06f398570cddff1332355e1eda0fe54d88881d'
2024-03-31 00:44:55,776 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-31 00:44:55,776 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:44:55,786 [ scc.git] DEBUG package-lock.json | 76 +++++++++++++++++++++++++++----------------------------
2024-03-31 00:44:55,786 [ scc.git] DEBUG 1 file changed, 38 insertions(+), 38 deletions(-)
2024-03-31 00:44:56,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:44:56,071 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:44:56,114 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:44:56,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:56,130 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:44:56,175 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:44:56,185 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a74dbebe0> has no local changes
2024-03-31 00:44:56,185 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
- PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
Generated by OMERO-plugins-push#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:44:56,195 [ scc.git] DEBUG [detached HEAD 81d07fa] merge master -Dorg -Ssuccess-only
2024-03-31 00:44:56,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:44:56,195 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:44:56,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-03-31 00:44:57,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-03-31 00:44:57,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-03-31 00:44:58,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-31 00:44:58,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:44:58,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:44:59,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-31 00:44:59,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:44:59,786 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-03-31 00:44:59,787 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:44:59,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-31 00:44:59,787 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:44:59,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:44:59,794 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:44:59,799 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:44:59,799 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:44:59,805 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:44:59,810 [ scc.git] DEBUG Already up to date.
2024-03-31 00:44:59,810 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-03-31 00:45:00,196 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-03-31 00:45:00,196 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-03-31 00:45:00,201 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:00,201 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:00,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:00,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-31 00:45:00,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:00,217 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-31 00:45:00,227 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:45:00,230 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-03-31 00:45:00,230 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-03-31 00:45:00,230 [ scc.git] DEBUG requirements.txt | 2 +-
2024-03-31 00:45:00,230 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-03-31 00:45:00,230 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-03-31 00:45:00,230 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-03-31 00:45:00,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:00,382 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:00,424 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:00,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:00,430 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:00,472 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:00,478 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a74de4490> has no local changes
2024-03-31 00:45:00,479 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:00,488 [ scc.git] DEBUG [detached HEAD 2f08426] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:00,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:00,488 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:00,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-03-31 00:45:01,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-03-31 00:45:01,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-03-31 00:45:02,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-31 00:45:02,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:03,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:45:03,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-31 00:45:04,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:04,163 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-31 00:45:04,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-03-31 00:45:05,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-03-31 00:45:05,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-31 00:45:06,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:06,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-31 00:45:06,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:06,880 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-31 00:45:06,881 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:06,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-31 00:45:06,881 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:06,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:06,887 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:45:06,893 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:06,893 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:45:06,900 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:45:06,906 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:06,907 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-03-31 00:45:07,456 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-31 00:45:07,457 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-03-31 00:45:07,465 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-03-31 00:45:08,083 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-31 00:45:08,083 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-03-31 00:45:08,091 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:08,091 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:08,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:08,102 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-31 00:45:08,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:08,123 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-31 00:45:08,204 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-03-31 00:45:08,204 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-03-31 00:45:08,204 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-31 00:45:08,204 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-31 00:45:08,204 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-31 00:45:08,205 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-31 00:45:08,216 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-31 00:45:08,228 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-31 00:45:08,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:08,396 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-31 00:45:08,411 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-31 00:45:08,422 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#17](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-03-31 00:45:08,432 [ scc.config] DEBUG Found github.token
2024-03-31 00:45:08,433 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-03-31 00:45:08,433 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-31 00:45:08,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:08,461 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-31 00:45:08,492 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-31 00:45:08,492 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-31 00:45:08,492 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-03-31 00:45:08,492 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-31 00:45:08,493 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-31 00:45:08,503 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-31 00:45:08,512 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-31 00:45:08,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:08,801 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-31 00:45:08,810 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-31 00:45:08,819 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#17](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-03-31 00:45:08,826 [ scc.config] DEBUG Found github.token
2024-03-31 00:45:08,826 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-03-31 00:45:08,826 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:08,868 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:08,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:08,875 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:08,922 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:08,930 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a74db4e80> has no local changes
2024-03-31 00:45:08,931 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:08,942 [ scc.git] DEBUG [detached HEAD 6ff856e] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:08,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:08,943 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:09,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-03-31 00:45:09,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-03-31 00:45:09,830 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-31 00:45:10,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-31 00:45:10,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:11,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:45:11,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-31 00:45:12,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:12,318 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-31 00:45:12,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-03-31 00:45:12,776 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-31 00:45:13,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-31 00:45:13,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:14,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:45:14,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-31 00:45:15,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:15,243 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-31 00:45:15,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-03-31 00:45:15,698 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-31 00:45:16,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-31 00:45:16,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:17,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:45:17,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-31 00:45:18,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:18,171 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-31 00:45:18,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-03-31 00:45:19,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-03-31 00:45:19,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-03-31 00:45:19,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-03-31 00:45:20,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-03-31 00:45:20,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-03-31 00:45:20,978 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:20,979 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-31 00:45:20,979 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:20,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:20,999 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:45:21,004 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:21,005 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:45:21,010 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:45:21,015 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:21,015 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-03-31 00:45:21,396 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-31 00:45:21,396 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-03-31 00:45:21,401 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-03-31 00:45:21,786 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-31 00:45:21,786 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-03-31 00:45:21,791 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-03-31 00:45:22,167 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-31 00:45:22,168 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-03-31 00:45:22,173 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:22,173 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:22,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:22,178 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-03-31 00:45:22,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:22,190 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-03-31 00:45:22,199 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:45:22,202 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-03-31 00:45:22,202 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-03-31 00:45:22,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:22,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-03-31 00:45:22,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:22,372 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-03-31 00:45:22,420 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-31 00:45:22,420 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:45:22,424 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-03-31 00:45:22,424 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-03-31 00:45:22,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:22,773 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-03-31 00:45:22,783 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:22,792 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-03-31 00:45:22,826 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-31 00:45:22,826 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:45:22,831 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-03-31 00:45:22,831 [ scc.git] DEBUG package.json | 2 +-
2024-03-31 00:45:22,831 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-03-31 00:45:23,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:23,195 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:23,240 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:23,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:23,247 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:23,284 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:23,291 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a744e9f10> has no local changes
2024-03-31 00:45:23,291 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:23,300 [ scc.git] DEBUG [detached HEAD beae089] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:23,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:23,300 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:23,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-03-31 00:45:24,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-03-31 00:45:24,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-31 00:45:25,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:25,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-31 00:45:25,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:25,947 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-03-31 00:45:25,947 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:25,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-31 00:45:25,947 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:25,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:25,953 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:45:25,957 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:25,957 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:45:25,962 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:45:25,967 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:25,967 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-31 00:45:26,359 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-03-31 00:45:26,360 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-31 00:45:26,365 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:26,365 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:26,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:26,372 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-31 00:45:26,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:26,383 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-31 00:45:26,392 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:45:26,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:26,556 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:26,601 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:26,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:26,607 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:26,644 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:26,651 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a7453b8e0> has no local changes
2024-03-31 00:45:26,651 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:26,659 [ scc.git] DEBUG [detached HEAD 54af61f] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:26,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:26,660 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:27,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-03-31 00:45:27,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-03-31 00:45:27,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-03-31 00:45:28,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-03-31 00:45:28,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-31 00:45:29,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:29,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-31 00:45:30,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:30,247 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-31 00:45:30,247 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:30,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-31 00:45:30,247 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:30,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:30,253 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:45:30,259 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:30,259 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:45:30,266 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:45:30,273 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:30,274 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-03-31 00:45:30,763 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-03-31 00:45:30,764 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-03-31 00:45:30,769 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:30,769 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:30,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:30,775 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-03-31 00:45:30,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:30,786 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-03-31 00:45:30,795 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-03-31 00:45:30,796 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:45:30,798 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-03-31 00:45:30,798 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-03-31 00:45:30,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:30,958 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:30,998 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:30,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:31,003 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:31,042 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:31,049 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a74536550> has no local changes
2024-03-31 00:45:31,049 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:31,057 [ scc.git] DEBUG [detached HEAD 1dff9dc] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:31,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:31,058 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:31,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-03-31 00:45:31,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-03-31 00:45:32,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-03-31 00:45:32,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-31 00:45:33,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:33,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-31 00:45:34,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:34,271 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-31 00:45:34,271 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:34,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-31 00:45:34,272 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:34,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:34,283 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:45:34,291 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:34,292 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:45:34,303 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:45:34,312 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:34,313 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-31 00:45:34,778 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-03-31 00:45:34,778 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-31 00:45:34,788 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:34,788 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:34,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:34,800 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-31 00:45:34,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:34,825 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-31 00:45:34,904 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-03-31 00:45:34,904 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-03-31 00:45:34,904 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-03-31 00:45:34,904 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-03-31 00:45:34,904 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-03-31 00:45:34,904 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-03-31 00:45:34,904 [ scc.git] DEBUG Auto-merging setup.py
2024-03-31 00:45:34,904 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-03-31 00:45:34,904 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-31 00:45:34,905 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-31 00:45:34,913 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-31 00:45:34,921 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-03-31 00:45:35,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:35,083 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-31 00:45:35,094 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-31 00:45:35,102 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#17](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-03-31 00:45:35,109 [ scc.config] DEBUG Found github.token
2024-03-31 00:45:35,109 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-03-31 00:45:35,109 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:35,156 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:35,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:35,164 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:35,222 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:35,233 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a7453b6a0> has no local changes
2024-03-31 00:45:35,233 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:35,244 [ scc.git] DEBUG [detached HEAD 1df93b1] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:35,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:35,245 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:35,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-03-31 00:45:36,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-03-31 00:45:36,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-03-31 00:45:36,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-31 00:45:37,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:37,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-31 00:45:38,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:38,248 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-31 00:45:38,248 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:38,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-31 00:45:38,248 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:38,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:38,254 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:45:38,260 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:38,260 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:45:38,266 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:45:38,271 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:38,272 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-03-31 00:45:38,711 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-03-31 00:45:38,712 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-03-31 00:45:38,717 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:38,717 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:38,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:38,723 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-03-31 00:45:38,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:38,734 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-03-31 00:45:38,759 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-31 00:45:38,762 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-03-31 00:45:38,762 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-03-31 00:45:38,762 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-03-31 00:45:38,762 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-03-31 00:45:38,762 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-03-31 00:45:38,762 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-03-31 00:45:38,762 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-03-31 00:45:38,762 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-03-31 00:45:38,762 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-03-31 00:45:38,762 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-03-31 00:45:38,762 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-03-31 00:45:38,764 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-03-31 00:45:38,764 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-03-31 00:45:38,764 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-03-31 00:45:38,764 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-03-31 00:45:38,765 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-03-31 00:45:38,765 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-03-31 00:45:38,765 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-03-31 00:45:38,765 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-03-31 00:45:38,765 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-03-31 00:45:38,765 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-03-31 00:45:38,765 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-03-31 00:45:38,765 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-03-31 00:45:38,765 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-03-31 00:45:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-03-31 00:45:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-03-31 00:45:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-03-31 00:45:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-03-31 00:45:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-03-31 00:45:38,766 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-03-31 00:45:38,766 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-03-31 00:45:38,766 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-03-31 00:45:38,766 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-03-31 00:45:38,766 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-03-31 00:45:38,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:38,914 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:38,957 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:38,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:38,963 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:39,007 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:39,015 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a744e9370> has no local changes
2024-03-31 00:45:39,016 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:39,036 [ scc.git] DEBUG [detached HEAD 863a640] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:39,036 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:39,037 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:39,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-03-31 00:45:39,334 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:39,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-31 00:45:39,334 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:39,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:39,340 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:45:39,345 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:39,345 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:45:39,350 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:45:39,355 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:39,356 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:39,356 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:39,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:39,361 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:39,401 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:39,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:39,406 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:39,447 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:39,455 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a74537fa0> has no local changes
2024-03-31 00:45:39,455 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:39,465 [ scc.git] DEBUG [detached HEAD b0f4504] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:39,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:39,466 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:39,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-03-31 00:45:39,751 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:39,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-31 00:45:39,751 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:39,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:39,757 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:45:39,763 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:39,763 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:45:39,768 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:45:39,773 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:39,773 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:39,773 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:39,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:39,778 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:39,818 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:39,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:39,825 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:39,875 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:39,883 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a744f6fd0> has no local changes
2024-03-31 00:45:39,883 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:39,893 [ scc.git] DEBUG [detached HEAD 50d695c] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:39,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:39,894 [ scc.git] INFO Overriding base-branch from master to main
2024-03-31 00:45:39,894 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:40,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-03-31 00:45:40,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-03-31 00:45:41,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-03-31 00:45:41,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-03-31 00:45:42,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-31 00:45:42,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:43,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-31 00:45:43,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-31 00:45:43,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:43,961 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-31 00:45:43,962 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:43,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-31 00:45:43,962 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:43,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:43,968 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-03-31 00:45:43,975 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:43,975 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-03-31 00:45:43,982 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-03-31 00:45:43,989 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:43,989 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-03-31 00:45:44,442 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-03-31 00:45:44,442 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-03-31 00:45:44,450 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:44,451 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:44,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:44,461 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-31 00:45:44,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:44,484 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-31 00:45:44,518 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-03-31 00:45:44,519 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-03-31 00:45:44,519 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-31 00:45:44,519 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-31 00:45:44,527 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-31 00:45:44,535 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-03-31 00:45:44,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:44,692 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-31 00:45:44,703 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-31 00:45:44,717 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#17](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-03-31 00:45:44,729 [ scc.config] DEBUG Found github.token
2024-03-31 00:45:44,729 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-03-31 00:45:44,729 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:44,812 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:44,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:44,824 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:44,897 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:44,904 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a74475fd0> has no local changes
2024-03-31 00:45:44,904 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:44,916 [ scc.git] DEBUG [detached HEAD cab46cf] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:44,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:44,917 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:45,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-03-31 00:45:45,107 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:45,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-31 00:45:45,107 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:45,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:45,117 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:45:45,133 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:45,133 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:45:45,144 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:45:45,154 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:45,154 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:45,154 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:45,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:45,166 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:45,215 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:45,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:45,223 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:45,273 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:45,281 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a744f6f10> has no local changes
2024-03-31 00:45:45,281 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:45,293 [ scc.git] DEBUG [detached HEAD 981f191] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:45,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:45,294 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:45,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-03-31 00:45:45,527 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:45,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-31 00:45:45,527 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:45,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:45,534 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:45:45,541 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:45,542 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:45:45,549 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:45:45,556 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:45,556 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:45,556 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:45,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:45,562 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:45,607 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:45,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:45,615 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:45,660 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:45,668 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a74489520> has no local changes
2024-03-31 00:45:45,668 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:45,678 [ scc.git] DEBUG [detached HEAD 0676582] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:45,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:45,679 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:46,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-03-31 00:45:46,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-03-31 00:45:46,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-03-31 00:45:47,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-31 00:45:47,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:48,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-31 00:45:48,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:48,736 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-03-31 00:45:48,736 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:48,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-31 00:45:48,737 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:48,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:48,743 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-31 00:45:48,750 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:48,750 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-31 00:45:48,757 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-31 00:45:48,765 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:48,766 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-03-31 00:45:49,199 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-03-31 00:45:49,200 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-03-31 00:45:49,205 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:49,206 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:49,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:49,213 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-31 00:45:49,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:49,228 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-31 00:45:49,268 [ scc.git] DEBUG Auto-merging Dockerfile
2024-03-31 00:45:49,268 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-03-31 00:45:49,268 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-31 00:45:49,268 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-31 00:45:49,277 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-31 00:45:49,287 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-03-31 00:45:49,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:49,448 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-31 00:45:49,457 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-31 00:45:49,466 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#17](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-03-31 00:45:49,476 [ scc.config] DEBUG Found github.token
2024-03-31 00:45:49,476 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-03-31 00:45:49,477 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:49,529 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:49,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:49,535 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:49,576 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:49,587 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a744a38e0> has no local changes
2024-03-31 00:45:49,588 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:49,599 [ scc.git] DEBUG [detached HEAD 4c56d07] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:49,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:49,599 [ scc.git] INFO Overriding base-branch from master to develop
2024-03-31 00:45:49,600 [ scc.repo] DEBUG ## PRs found:
2024-03-31 00:45:50,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-03-31 00:45:50,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-03-31 00:45:50,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-03-31 00:45:51,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-03-31 00:45:51,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-03-31 00:45:52,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-03-31 00:45:52,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-03-31 00:45:53,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-31 00:45:53,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-31 00:45:54,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-31 00:45:54,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-03-31 00:45:54,604 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-31 00:45:55,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-03-31 00:45:55,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-03-31 00:45:56,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-03-31 00:45:56,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-03-31 00:45:56,508 [ scc.repo] DEBUG ## Branches found:
2024-03-31 00:45:56,508 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-31 00:45:56,508 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:56,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:56,516 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-03-31 00:45:56,521 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-31 00:45:56,522 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-03-31 00:45:56,530 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-03-31 00:45:56,538 [ scc.git] DEBUG Already up to date.
2024-03-31 00:45:56,538 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-03-31 00:45:57,002 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-03-31 00:45:57,002 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-03-31 00:45:57,006 [ scc.git] DEBUG ## Unique users: []
2024-03-31 00:45:57,006 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:57,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:57,013 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-31 00:45:57,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:57,026 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-31 00:45:57,054 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-03-31 00:45:57,054 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-03-31 00:45:57,054 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-31 00:45:57,054 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-31 00:45:57,061 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-31 00:45:57,067 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-03-31 00:45:57,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:57,220 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-31 00:45:57,230 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-31 00:45:57,236 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#17](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-03-31 00:45:57,245 [ scc.config] DEBUG Found github.token
2024-03-31 00:45:57,245 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-03-31 00:45:57,246 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-31 00:45:57,287 [ scc.git] DEBUG Get sha1 of %s
2024-03-31 00:45:57,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-31 00:45:57,294 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:57,339 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:45:57,346 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a74499b50> has no local changes
2024-03-31 00:45:57,346 [ 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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:45:57,356 [ scc.git] DEBUG [detached HEAD c7b4ab4] merge master -Dorg -Ssuccess-only
2024-03-31 00:45:57,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:45:57,356 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-31 00:45:57,432 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-03-31 00:45:57,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:57,635 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-03-31 00:45:57,640 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-03-31 00:45:58,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:58,042 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-03-31 00:45:58,048 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-03-31 00:45:58,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:58,454 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-03-31 00:45:58,461 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-03-31 00:45:58,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:58,854 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-03-31 00:45:59,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:59,258 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-03-31 00:45:59,266 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-03-31 00:45:59,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:45:59,689 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-03-31 00:45:59,694 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-03-31 00:46:00,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:00,108 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-03-31 00:46:00,113 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-03-31 00:46:00,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:00,523 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-03-31 00:46:00,529 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-03-31 00:46:00,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:00,938 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-03-31 00:46:00,948 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-03-31 00:46:01,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:01,343 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-03-31 00:46:01,350 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-03-31 00:46:01,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:01,747 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-03-31 00:46:01,752 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-03-31 00:46:02,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:02,152 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-03-31 00:46:02,157 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-03-31 00:46:02,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:02,553 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-03-31 00:46:02,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:02,949 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-03-31 00:46:03,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:03,339 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-03-31 00:46:03,343 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-03-31 00:46:03,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:03,748 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-03-31 00:46:04,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:04,157 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-03-31 00:46:04,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:04,560 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-03-31 00:46:04,566 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-03-31 00:46:04,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:04,970 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-03-31 00:46:04,975 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-03-31 00:46:05,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:05,380 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-03-31 00:46:05,385 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-03-31 00:46:05,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:05,790 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-03-31 00:46:05,795 [ scc.config] DEBUG Found submodule.scripts.url
2024-03-31 00:46:06,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-31 00:46:06,200 [ scc.config] DEBUG Found submodule.scripts.branch
2024-03-31 00:46:06,201 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-31 00:46:06,278 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0a760bcaf0> has local changes
2024-03-31 00:46:06,278 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
- PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
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#17 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/17/)'
2024-03-31 00:46:06,293 [ scc.git] DEBUG [detached HEAD c655b38] merge master -Dorg -Ssuccess-only
2024-03-31 00:46:06,293 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-03-31 00:46:06,293 [ scc.merge] INFO Repository: ome/omero-plugins
2024-03-31 00:46:06,293 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,293 [ scc.merge] INFO
2024-03-31 00:46:06,294 [ scc.merge] INFO
2024-03-31 00:46:06,294 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-03-31 00:46:06,294 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,294 [ scc.merge] INFO
2024-03-31 00:46:06,294 [ scc.merge] INFO
2024-03-31 00:46:06,294 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-03-31 00:46:06,294 [ scc.merge] INFO Excluded PRs:
2024-03-31 00:46:06,294 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-03-31 00:46:06,294 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,294 [ scc.merge] INFO
2024-03-31 00:46:06,294 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,294 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-03-31 00:46:06,294 [ scc.merge] INFO
2024-03-31 00:46:06,294 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-03-31 00:46:06,294 [ scc.merge] INFO Excluded PRs:
2024-03-31 00:46:06,294 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-03-31 00:46:06,294 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-03-31 00:46:06,294 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-03-31 00:46:06,294 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-03-31 00:46:06,294 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,294 [ scc.merge] INFO
2024-03-31 00:46:06,295 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,295 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-03-31 00:46:06,295 [ scc.merge] INFO
2024-03-31 00:46:06,295 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-03-31 00:46:06,295 [ scc.merge] INFO Excluded PRs:
2024-03-31 00:46:06,295 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-31 00:46:06,295 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-03-31 00:46:06,295 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,295 [ scc.merge] INFO
2024-03-31 00:46:06,295 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,295 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-03-31 00:46:06,295 [ scc.merge] INFO
2024-03-31 00:46:06,295 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-31 00:46:06,295 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-03-31 00:46:06,295 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-03-31 00:46:06,295 [ scc.merge] INFO
2024-03-31 00:46:06,295 [ scc.merge] INFO Repository: ome/omero-figure
2024-03-31 00:46:06,295 [ scc.merge] INFO Excluded PRs:
2024-03-31 00:46:06,295 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-03-31 00:46:06,295 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,295 [ scc.merge] INFO
2024-03-31 00:46:06,295 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,295 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-03-31 00:46:06,296 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-03-31 00:46:06,296 [ scc.merge] INFO
2024-03-31 00:46:06,296 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-03-31 00:46:06,296 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,296 [ scc.merge] INFO
2024-03-31 00:46:06,296 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,296 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-03-31 00:46:06,296 [ scc.merge] INFO
2024-03-31 00:46:06,296 [ scc.merge] INFO Repository: ome/omero-gallery
2024-03-31 00:46:06,296 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,296 [ scc.merge] INFO
2024-03-31 00:46:06,296 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,296 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-31 00:46:06,296 [ scc.merge] INFO
2024-03-31 00:46:06,296 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-03-31 00:46:06,296 [ scc.merge] INFO Excluded PRs:
2024-03-31 00:46:06,296 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-03-31 00:46:06,296 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-03-31 00:46:06,296 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,296 [ scc.merge] INFO
2024-03-31 00:46:06,296 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,296 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-31 00:46:06,296 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-03-31 00:46:06,296 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-03-31 00:46:06,297 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-03-31 00:46:06,297 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-31 00:46:06,297 [ scc.merge] INFO - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-03-31 00:46:06,297 [ scc.merge] INFO
2024-03-31 00:46:06,297 [ scc.merge] INFO Repository: ome/omero-mapr
2024-03-31 00:46:06,297 [ scc.merge] INFO Excluded PRs:
2024-03-31 00:46:06,297 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-03-31 00:46:06,297 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,297 [ scc.merge] INFO
2024-03-31 00:46:06,297 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,297 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-03-31 00:46:06,297 [ scc.merge] INFO
2024-03-31 00:46:06,297 [ scc.merge] INFO Repository: ome/omero-metadata
2024-03-31 00:46:06,297 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,297 [ scc.merge] INFO
2024-03-31 00:46:06,297 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-31 00:46:06,297 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-31 00:46:06,297 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-31 00:46:06,297 [ scc.merge] INFO
2024-03-31 00:46:06,297 [ scc.merge] INFO Repository: ome/omero-parade
2024-03-31 00:46:06,297 [ scc.merge] INFO Excluded PRs:
2024-03-31 00:46:06,297 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-03-31 00:46:06,297 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-03-31 00:46:06,298 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-03-31 00:46:06,298 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,298 [ scc.merge] INFO
2024-03-31 00:46:06,298 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,298 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-31 00:46:06,298 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-31 00:46:06,298 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-31 00:46:06,298 [ scc.merge] INFO
2024-03-31 00:46:06,298 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-03-31 00:46:06,298 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,298 [ scc.merge] INFO
2024-03-31 00:46:06,298 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,298 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-03-31 00:46:06,298 [ scc.merge] INFO
2024-03-31 00:46:06,298 [ scc.merge] INFO Repository: ome/omero-rois
2024-03-31 00:46:06,298 [ scc.merge] INFO Excluded PRs:
2024-03-31 00:46:06,298 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-31 00:46:06,298 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,298 [ scc.merge] INFO
2024-03-31 00:46:06,298 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,298 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-31 00:46:06,298 [ scc.merge] INFO
2024-03-31 00:46:06,298 [ scc.merge] INFO Repository: ome/omero-signup
2024-03-31 00:46:06,298 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,299 [ scc.merge] INFO
2024-03-31 00:46:06,299 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-31 00:46:06,299 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-31 00:46:06,299 [ scc.merge] INFO
2024-03-31 00:46:06,299 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-03-31 00:46:06,299 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,299 [ scc.merge] INFO
2024-03-31 00:46:06,299 [ scc.merge] INFO Merged PRs:
2024-03-31 00:46:06,299 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-31 00:46:06,299 [ scc.merge] INFO
2024-03-31 00:46:06,299 [ scc.merge] INFO Repository: ome/omero-upload
2024-03-31 00:46:06,299 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,299 [ scc.merge] INFO
2024-03-31 00:46:06,299 [ scc.merge] INFO
2024-03-31 00:46:06,299 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-03-31 00:46:06,299 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,299 [ scc.merge] INFO
2024-03-31 00:46:06,299 [ scc.merge] INFO
2024-03-31 00:46:06,299 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-03-31 00:46:06,299 [ scc.merge] INFO Excluded PRs:
2024-03-31 00:46:06,299 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-03-31 00:46:06,299 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,299 [ scc.merge] INFO
2024-03-31 00:46:06,299 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-31 00:46:06,300 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-31 00:46:06,300 [ scc.merge] INFO
2024-03-31 00:46:06,300 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-03-31 00:46:06,300 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,300 [ scc.merge] INFO
2024-03-31 00:46:06,300 [ scc.merge] INFO
2024-03-31 00:46:06,300 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-03-31 00:46:06,300 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,300 [ scc.merge] INFO
2024-03-31 00:46:06,300 [ scc.merge] INFO
2024-03-31 00:46:06,300 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-03-31 00:46:06,300 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,300 [ scc.merge] INFO
2024-03-31 00:46:06,300 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-31 00:46:06,300 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-03-31 00:46:06,300 [ scc.merge] INFO
2024-03-31 00:46:06,300 [ scc.merge] INFO Repository: ome/scripts
2024-03-31 00:46:06,300 [ scc.merge] INFO Excluded PRs:
2024-03-31 00:46:06,300 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-03-31 00:46:06,300 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-03-31 00:46:06,300 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-03-31 00:46:06,300 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-03-31 00:46:06,300 [ scc.merge] INFO Already up to date.
2024-03-31 00:46:06,301 [ scc.merge] INFO
2024-03-31 00:46:06,301 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-31 00:46:06,301 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-31 00:46:06,301 [ scc.merge] INFO
2024-03-31 00:46:06,301 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-31 00:46:06,301 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-03-31 00:46:06,307 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-03-31 00:46:06,313 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-03-31 00:46:06,318 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-03-31 00:46:06,324 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-03-31 00:46:06,329 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-31 00:46:06,335 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-31 00:46:06,339 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-31 00:46:06,344 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-31 00:46:06,348 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-31 00:46:06,353 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-31 00:46:06,358 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-31 00:46:06,363 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-31 00:46:06,368 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-31 00:46:06,372 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-31 00:46:06,377 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-31 00:46:06,381 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-31 00:46:06,386 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-31 00:46:06,390 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-31 00:46:06,395 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-31 00:46:06,399 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-31 00:46:06,404 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-31 00:46:06,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-31 00:46:06,408 [ scc.git] DEBUG Calling 'git remote'
2024-03-31 00:46:06,413 [ 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 9fbf6b1] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 3b7ccfa8
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a232ed0
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 2078ac7
nothing to commit, working tree clean
[detached HEAD 6828235] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-03-31 00:46:52,436 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-03-31 00:47:01,286 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-03-31 00:47:03,714 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-03-31 00:47:08,289 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-03-31 00:47:55,394 [ 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/f6f303f9/images/svgs/logo.svg){kind=logo}
