Skipping 128 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-24 00:43:14,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-04-24 00:43:14,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-04-24 00:43:14,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-04-24 00:43:14,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-04-24 00:43:14,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-04-24 00:43:14,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-04-24 00:43:14,507 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-24 00:43:14,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-24 00:43:14,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-24 00:43:14,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-24 00:43:14,507 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-24 00:43:14,508 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-24 00:43:14,508 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-24 00:43:14,508 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-24 00:43:14,508 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-24 00:43:14,508 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-24 00:43:14,508 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-24 00:43:14,508 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-24 00:43:14,508 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-24 00:43:14,508 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-24 00:43:14,509 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-24 00:43:14,509 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-24 00:43:14,509 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-24 00:43:14,509 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-24 00:43:14,509 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-24 00:43:14,509 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-24 00:43:14,509 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-24 00:43:14,509 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-24 00:43:14,509 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-24 00:43:14,509 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-24 00:43:14,509 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-24 00:43:14,509 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-24 00:43:14,509 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-24 00:43:14,509 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-24 00:43:14,509 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-24 00:43:14,509 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-24 00:43:14,509 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-24 00:43:14,509 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-24 00:43:14,509 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-24 00:43:14,509 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-24 00:43:14,509 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-24 00:43:14,509 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-24 00:43:14,510 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-24 00:43:14,510 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-24 00:43:14,510 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-24 00:43:14,510 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-24 00:43:14,510 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-24 00:43:14,511 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-24 00:43:14,511 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-24 00:43:14,511 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-24 00:43:14,511 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-24 00:43:14,511 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-24 00:43:14,511 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-24 00:43:14,511 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-24 00:43:14,511 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-24 00:43:14,511 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-24 00:43:14,511 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-24 00:43:14,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:14,663 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7d25b9fb49959ba7f143c70927573efb62c9667e'
2024-04-24 00:43:14,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:14,682 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 553 (Figure_To_Pdf: use max plane size to select the appropriate zoom level) 7d25b9fb49959ba7f143c70927573efb62c9667e'
2024-04-24 00:43:14,707 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:43:14,711 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-24 00:43:14,711 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-24 00:43:15,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:15,079 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-24 00:43:15,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:15,109 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-24 00:43:15,130 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:43:15,134 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-04-24 00:43:15,134 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-24 00:43:15,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:15,498 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:43:15,542 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:15,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:15,549 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:43:15,587 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:43:15,594 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f4995be0> has no local changes
2024-04-24 00:43:15,594 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
- PR 554 jburel 'Update publish'
Generated by OMERO-plugins-push#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:43:15,602 [ scc.git] DEBUG [detached HEAD b6a6b4ab] merge master -Dorg -Ssuccess-only
2024-04-24 00:43:15,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:43:15,603 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:43:16,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-24 00:43:16,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-24 00:43:16,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-24 00:43:17,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-24 00:43:17,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:43:18,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-24 00:43:18,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:43:18,812 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-24 00:43:18,812 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:43:18,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-24 00:43:18,812 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:18,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:18,818 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:43:18,823 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:43:18,823 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:43:18,828 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:43:18,834 [ scc.git] DEBUG Already up to date.
2024-04-24 00:43:18,834 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-24 00:43:19,262 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-24 00:43:19,262 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-24 00:43:19,267 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:43:19,267 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:19,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:19,274 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-24 00:43:19,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:19,284 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-24 00:43:19,298 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-24 00:43:19,299 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:43:19,301 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-24 00:43:19,301 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-24 00:43:19,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:19,457 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:43:19,494 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:19,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:19,499 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:43:19,534 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:43:19,540 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f494c550> has no local changes
2024-04-24 00:43:19,540 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:43:19,547 [ scc.git] DEBUG [detached HEAD 772eedc] merge master -Dorg -Ssuccess-only
2024-04-24 00:43:19,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:43:19,548 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:43:19,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-24 00:43:20,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-24 00:43:20,435 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-24 00:43:20,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-24 00:43:21,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:43:22,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-24 00:43:22,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-24 00:43:22,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:43:22,861 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-24 00:43:22,861 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:43:22,861 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-24 00:43:22,862 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:22,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:22,868 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:43:22,874 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:43:22,874 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:43:22,880 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:43:22,889 [ scc.git] DEBUG Already up to date.
2024-04-24 00:43:22,889 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-24 00:43:23,319 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-24 00:43:23,319 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-24 00:43:23,323 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:43:23,323 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:23,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:23,330 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-24 00:43:23,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:23,341 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-24 00:43:23,352 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:43:23,356 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-24 00:43:23,356 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-24 00:43:23,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:23,519 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:43:23,559 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:23,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:23,568 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:43:23,619 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:43:23,629 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f4954820> has no local changes
2024-04-24 00:43:23,630 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:43:23,641 [ scc.git] DEBUG [detached HEAD 6cd7a03] merge master -Dorg -Ssuccess-only
2024-04-24 00:43:23,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:43:23,642 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:43:24,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-24 00:43:24,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-04-24 00:43:24,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-04-24 00:43:25,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-24 00:43:25,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:43:26,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-24 00:43:26,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-24 00:43:27,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:43:27,347 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-24 00:43:27,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-24 00:43:28,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-24 00:43:28,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/bc2e42c6b90a29996c102eb2ae19106ad785878f HTTP/1.1" 200 None
2024-04-24 00:43:29,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/bc2e42c6b90a29996c102eb2ae19106ad785878f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:43:29,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/bc2e42c6b90a29996c102eb2ae19106ad785878f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-24 00:43:30,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/bc2e42c6b90a29996c102eb2ae19106ad785878f HTTP/1.1" 200 None
2024-04-24 00:43:30,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/bc2e42c6b90a29996c102eb2ae19106ad785878f?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:43:30,712 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-24 00:43:31,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-24 00:43:31,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-24 00:43:32,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:43:32,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-24 00:43:33,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-24 00:43:33,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:43:33,543 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-24 00:43:34,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-24 00:43:34,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-24 00:43:35,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-24 00:43:35,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:43:36,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-24 00:43:36,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-24 00:43:36,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:43:36,898 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-24 00:43:37,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-24 00:43:37,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-24 00:43:38,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-24 00:43:38,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:43:39,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-24 00:43:39,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:43:39,675 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-24 00:43:39,676 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:43:39,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-24 00:43:39,676 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:39,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:39,682 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:43:39,687 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:43:39,688 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:43:39,694 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:43:39,699 [ scc.git] DEBUG Already up to date.
2024-04-24 00:43:39,699 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-24 00:43:40,166 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-24 00:43:40,166 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-24 00:43:40,170 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-24 00:43:41,314 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-24 00:43:41,314 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-24 00:43:41,320 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-24 00:43:41,738 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-24 00:43:41,738 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-24 00:43:41,743 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-24 00:43:42,773 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-24 00:43:42,773 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-24 00:43:42,777 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-04-24 00:43:43,243 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-24 00:43:43,243 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-04-24 00:43:43,248 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:43:43,249 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:43,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:43,257 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-24 00:43:43,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:43,276 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-24 00:43:43,295 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:43:43,298 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-24 00:43:43,298 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-24 00:43:43,298 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-24 00:43:43,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:43,454 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-24 00:43:43,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:43,467 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-24 00:43:43,519 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:43:43,525 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-24 00:43:43,525 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-24 00:43:43,525 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-24 00:43:43,525 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-24 00:43:43,525 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-24 00:43:43,525 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-24 00:43:43,526 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-24 00:43:43,526 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-24 00:43:43,526 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-24 00:43:43,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:43,861 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-24 00:43:43,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:43,875 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-24 00:43:43,899 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:43:43,902 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-24 00:43:43,902 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-24 00:43:44,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:44,278 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bc2e42c6b90a29996c102eb2ae19106ad785878f'
2024-04-24 00:43:44,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:44,292 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) bc2e42c6b90a29996c102eb2ae19106ad785878f'
2024-04-24 00:43:44,312 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-24 00:43:44,312 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:43:44,318 [ scc.git] DEBUG css/app.css | 30 +++++++
2024-04-24 00:43:44,318 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-24 00:43:44,318 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-24 00:43:44,318 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 4 +-
2024-04-24 00:43:44,318 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 165 +++++++++++++++++++++++++------------
2024-04-24 00:43:44,318 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 61 +++++++++++++-
2024-04-24 00:43:44,318 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-24 00:43:44,319 [ scc.git] DEBUG 7 files changed, 224 insertions(+), 61 deletions(-)
2024-04-24 00:43:44,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:44,678 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-24 00:43:44,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:44,691 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-24 00:43:44,707 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:43:44,709 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-04-24 00:43:44,710 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-04-24 00:43:44,710 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-04-24 00:43:45,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:45,092 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:43:45,134 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:45,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:45,140 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:43:45,182 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:43:45,192 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f49445b0> has no local changes
2024-04-24 00:43:45,192 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:43:45,209 [ scc.git] DEBUG [detached HEAD 5971afa] merge master -Dorg -Ssuccess-only
2024-04-24 00:43:45,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:43:45,212 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:43:45,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-24 00:43:46,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-24 00:43:46,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-24 00:43:47,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-24 00:43:47,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:43:48,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-24 00:43:48,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-24 00:43:49,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:43:49,050 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-24 00:43:49,051 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:43:49,051 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-24 00:43:49,051 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:49,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:49,058 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:43:49,065 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:43:49,065 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:43:49,072 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:43:49,081 [ scc.git] DEBUG Already up to date.
2024-04-24 00:43:49,081 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-24 00:43:49,498 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-24 00:43:49,498 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-24 00:43:49,503 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:43:49,503 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:49,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:49,509 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-24 00:43:49,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:49,522 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-24 00:43:49,544 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:43:49,547 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-24 00:43:49,547 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-24 00:43:49,547 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-24 00:43:49,547 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-24 00:43:49,547 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-24 00:43:49,547 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-24 00:43:49,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:49,712 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:43:49,757 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:49,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:49,763 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:43:49,801 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:43:49,808 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f494e160> has no local changes
2024-04-24 00:43:49,808 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:43:49,815 [ scc.git] DEBUG [detached HEAD dd664aa] merge master -Dorg -Ssuccess-only
2024-04-24 00:43:49,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:43:49,816 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:43:50,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-24 00:43:50,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-24 00:43:51,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-24 00:43:51,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-24 00:43:52,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:43:52,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-24 00:43:53,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:43:53,136 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-24 00:43:53,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-24 00:43:54,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-24 00:43:54,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-24 00:43:54,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:43:55,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-24 00:43:55,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:43:55,882 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-24 00:43:55,882 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:43:55,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-24 00:43:55,882 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:55,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:55,888 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:43:55,893 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:43:55,893 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:43:55,898 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:43:55,904 [ scc.git] DEBUG Already up to date.
2024-04-24 00:43:55,905 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-24 00:43:56,531 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-24 00:43:56,532 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-24 00:43:56,536 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-24 00:43:57,238 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-24 00:43:57,238 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-24 00:43:57,242 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:43:57,243 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:57,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:57,248 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-24 00:43:57,256 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:57,261 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-24 00:43:57,323 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-24 00:43:57,324 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-24 00:43:57,324 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-24 00:43:57,324 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-24 00:43:57,324 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-24 00:43:57,325 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-24 00:43:57,332 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-24 00:43:57,340 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-24 00:43:57,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:57,507 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-24 00:43:57,514 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-24 00:43:57,520 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#40](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-24 00:43:57,534 [ scc.config] DEBUG Found github.token
2024-04-24 00:43:57,535 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-24 00:43:57,535 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-24 00:43:57,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:57,549 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-24 00:43:57,568 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-24 00:43:57,568 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-24 00:43:57,568 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-24 00:43:57,568 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-24 00:43:57,568 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-24 00:43:57,575 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-24 00:43:57,583 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-24 00:43:57,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:43:57,911 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-24 00:43:57,919 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-24 00:43:57,926 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#40](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-04-24 00:43:57,931 [ scc.config] DEBUG Found github.token
2024-04-24 00:43:57,932 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-24 00:43:57,932 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:43:57,971 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:43:57,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:43:57,976 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:43:58,015 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:43:58,023 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f4944550> has no local changes
2024-04-24 00:43:58,023 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:43:58,033 [ scc.git] DEBUG [detached HEAD 730a51e] merge master -Dorg -Ssuccess-only
2024-04-24 00:43:58,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:43:58,034 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:43:58,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-24 00:43:58,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-24 00:43:58,962 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-24 00:43:59,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-24 00:44:00,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:44:00,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-24 00:44:00,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-24 00:44:01,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:44:01,433 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-24 00:44:01,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-24 00:44:01,893 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-24 00:44:02,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-24 00:44:03,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:44:03,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-24 00:44:04,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-24 00:44:04,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:44:04,608 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-24 00:44:05,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-24 00:44:05,275 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-24 00:44:05,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-24 00:44:06,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:44:06,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-24 00:44:07,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-24 00:44:07,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:44:07,755 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-24 00:44:08,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-24 00:44:08,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-24 00:44:09,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-24 00:44:09,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-24 00:44:10,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-24 00:44:10,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-24 00:44:10,647 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:10,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-24 00:44:10,647 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:10,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:10,654 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:44:10,661 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:10,661 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:44:10,668 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:44:10,675 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:10,675 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-24 00:44:11,074 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-24 00:44:11,075 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-24 00:44:11,079 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-24 00:44:11,451 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-24 00:44:11,452 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-24 00:44:11,456 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-24 00:44:11,853 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-24 00:44:11,853 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-24 00:44:11,859 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:11,859 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:11,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:11,866 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-24 00:44:11,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:11,883 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-24 00:44:11,894 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:44:11,897 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-24 00:44:11,897 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-24 00:44:12,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:12,063 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-24 00:44:12,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:12,079 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-24 00:44:12,109 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-24 00:44:12,110 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:44:12,113 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-24 00:44:12,113 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-24 00:44:12,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:12,468 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-24 00:44:12,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:12,482 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-24 00:44:12,496 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-24 00:44:12,497 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:44:12,502 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-24 00:44:12,504 [ scc.git] DEBUG package.json | 2 +-
2024-04-24 00:44:12,504 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-24 00:44:12,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:12,878 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:12,917 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:12,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:12,922 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:12,962 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:12,969 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f4947fd0> has no local changes
2024-04-24 00:44:12,969 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:12,981 [ scc.git] DEBUG [detached HEAD 8546df0] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:12,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:12,982 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:44:13,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-24 00:44:13,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-24 00:44:14,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-24 00:44:14,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:44:15,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-24 00:44:15,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:44:15,866 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-24 00:44:15,866 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:15,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-24 00:44:15,867 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:15,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:15,873 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:44:15,880 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:15,880 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:44:15,887 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:44:15,893 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:15,893 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-24 00:44:16,322 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-24 00:44:16,322 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-24 00:44:16,329 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:16,329 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:16,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:16,336 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-24 00:44:16,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:16,351 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-24 00:44:16,360 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:44:16,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:16,531 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:16,572 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:16,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:16,579 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:16,619 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:16,625 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f40bd340> has no local changes
2024-04-24 00:44:16,626 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:16,636 [ scc.git] DEBUG [detached HEAD e0a24d8] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:16,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:16,636 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:44:17,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-24 00:44:17,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-24 00:44:18,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-24 00:44:18,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-24 00:44:18,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-24 00:44:19,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:44:19,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-24 00:44:20,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:44:20,362 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-24 00:44:20,362 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:20,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-24 00:44:20,362 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:20,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:20,369 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:44:20,375 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:20,375 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:44:20,383 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:44:20,390 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:20,391 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-24 00:44:20,851 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-24 00:44:20,851 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-24 00:44:20,855 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:20,856 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:20,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:20,862 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-24 00:44:20,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:20,876 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-24 00:44:20,887 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-24 00:44:20,887 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:44:20,890 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-24 00:44:20,890 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-24 00:44:21,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:21,044 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:21,085 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:21,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:21,092 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:21,132 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:21,139 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f41125b0> has no local changes
2024-04-24 00:44:21,139 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:21,148 [ scc.git] DEBUG [detached HEAD 145c7e8] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:21,149 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:21,149 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:44:21,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-24 00:44:22,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-24 00:44:22,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-24 00:44:23,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-24 00:44:23,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:44:23,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-24 00:44:24,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:44:24,389 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-24 00:44:24,389 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:24,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-24 00:44:24,389 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:24,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:24,396 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:44:24,402 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:24,403 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:44:24,409 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:44:24,416 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:24,417 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-24 00:44:24,857 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-24 00:44:24,857 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-24 00:44:24,862 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:24,862 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:24,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:24,868 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-24 00:44:24,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:24,882 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-24 00:44:24,933 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-24 00:44:24,933 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-24 00:44:24,933 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-24 00:44:24,934 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-24 00:44:24,934 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-24 00:44:24,934 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-24 00:44:24,934 [ scc.git] DEBUG Auto-merging setup.py
2024-04-24 00:44:24,934 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-24 00:44:24,934 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-24 00:44:24,934 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-24 00:44:24,942 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-24 00:44:24,950 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-24 00:44:25,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:25,147 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-24 00:44:25,154 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-24 00:44:25,161 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#40](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/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-04-24 00:44:25,167 [ scc.config] DEBUG Found github.token
2024-04-24 00:44:25,167 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-24 00:44:25,167 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:25,206 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:25,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:25,213 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:25,254 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:25,261 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f4954df0> has no local changes
2024-04-24 00:44:25,262 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:25,271 [ scc.git] DEBUG [detached HEAD 9d0a271] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:25,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:25,272 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:44:25,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-24 00:44:26,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-24 00:44:26,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-24 00:44:27,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-24 00:44:27,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:44:28,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-24 00:44:28,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:44:28,485 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-24 00:44:28,485 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:28,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-24 00:44:28,486 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:28,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:28,492 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:44:28,498 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:28,498 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:44:28,504 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:44:28,511 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:28,511 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-24 00:44:28,923 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-24 00:44:28,923 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-24 00:44:28,929 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:28,929 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:28,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:28,936 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-24 00:44:28,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:28,953 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-04-24 00:44:28,972 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-24 00:44:28,976 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-24 00:44:28,976 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-24 00:44:28,976 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-24 00:44:28,976 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-24 00:44:28,976 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-24 00:44:28,976 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-24 00:44:28,979 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-24 00:44:28,979 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-24 00:44:28,979 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-24 00:44:28,979 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-24 00:44:28,979 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-24 00:44:28,980 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-24 00:44:28,980 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-24 00:44:28,980 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-24 00:44:28,980 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-24 00:44:28,980 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-24 00:44:28,980 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-24 00:44:28,980 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-24 00:44:28,980 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-24 00:44:28,980 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-24 00:44:28,980 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-24 00:44:28,980 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-24 00:44:28,980 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-24 00:44:28,980 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-24 00:44:28,980 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-24 00:44:28,980 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-24 00:44:28,980 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-24 00:44:28,980 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-24 00:44:28,980 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-24 00:44:28,980 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-24 00:44:28,980 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-24 00:44:28,981 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-24 00:44:29,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:29,145 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:29,189 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:29,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:29,196 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:29,238 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:29,246 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f4947df0> has no local changes
2024-04-24 00:44:29,246 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:29,256 [ scc.git] DEBUG [detached HEAD 9b055d4] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:29,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:29,257 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:44:29,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-24 00:44:29,579 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:29,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-24 00:44:29,579 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:29,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:29,585 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:44:29,590 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:29,591 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:44:29,596 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:44:29,601 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:29,601 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:29,601 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:29,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:29,606 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:29,644 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:29,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:29,650 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:29,690 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:29,696 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f4113fa0> has no local changes
2024-04-24 00:44:29,696 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:29,705 [ scc.git] DEBUG [detached HEAD 32592ec] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:29,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:29,706 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:44:30,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-24 00:44:30,012 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:30,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-24 00:44:30,012 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:30,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:30,018 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:44:30,027 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:30,028 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:44:30,034 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:44:30,041 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:30,041 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:30,041 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:30,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:30,047 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:30,085 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:30,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:30,090 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:30,132 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:30,140 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f40c9f70> has no local changes
2024-04-24 00:44:30,140 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:30,150 [ scc.git] DEBUG [detached HEAD 5a77042] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:30,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:30,151 [ scc.git] INFO Overriding base-branch from master to main
2024-04-24 00:44:30,151 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:44:30,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-24 00:44:31,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-24 00:44:31,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-24 00:44:31,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-24 00:44:32,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-24 00:44:32,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:44:33,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-24 00:44:33,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-24 00:44:34,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:44:34,263 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-24 00:44:34,263 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:34,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-24 00:44:34,263 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:34,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:34,269 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-24 00:44:34,275 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:34,275 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-24 00:44:34,282 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-24 00:44:34,288 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:34,289 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-24 00:44:34,694 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-24 00:44:34,694 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-24 00:44:34,699 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:34,699 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:34,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:34,705 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-24 00:44:34,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:34,718 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-24 00:44:34,746 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-24 00:44:34,746 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-24 00:44:34,746 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-24 00:44:34,746 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-24 00:44:34,753 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-24 00:44:34,761 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-24 00:44:34,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:34,920 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-24 00:44:34,928 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-24 00:44:34,935 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#40](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-24 00:44:34,942 [ scc.config] DEBUG Found github.token
2024-04-24 00:44:34,942 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-24 00:44:34,942 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:35,003 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:35,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:35,009 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:35,053 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:35,062 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f4097430> has no local changes
2024-04-24 00:44:35,062 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:35,072 [ scc.git] DEBUG [detached HEAD 764fd20] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:35,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:35,073 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:44:35,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-24 00:44:35,354 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:35,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-24 00:44:35,355 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:35,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:35,361 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:44:35,367 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:35,367 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:44:35,374 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:44:35,381 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:35,381 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:35,381 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:35,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:35,388 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:35,429 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:35,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:35,436 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:35,476 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:35,483 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f40a7e50> has no local changes
2024-04-24 00:44:35,483 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:35,492 [ scc.git] DEBUG [detached HEAD 1a96da2] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:35,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:35,493 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:44:35,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-24 00:44:35,785 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:35,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-24 00:44:35,786 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:35,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:35,792 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:44:35,797 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:35,798 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:44:35,803 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:44:35,810 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:35,810 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:35,810 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:35,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:35,816 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:35,864 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:35,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:35,870 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:35,914 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:35,921 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4e47bc940> has no local changes
2024-04-24 00:44:35,921 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:35,930 [ scc.git] DEBUG [detached HEAD 5bab165] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:35,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:35,931 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:44:36,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-24 00:44:36,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-24 00:44:37,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-24 00:44:37,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-24 00:44:38,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:44:38,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-24 00:44:39,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:44:39,123 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-24 00:44:39,123 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:39,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-24 00:44:39,123 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:39,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:39,129 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-24 00:44:39,136 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:39,137 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-24 00:44:39,145 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-24 00:44:39,154 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:39,154 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-24 00:44:39,612 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-24 00:44:39,613 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-24 00:44:39,618 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:39,618 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:39,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:39,625 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-24 00:44:39,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:39,641 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-24 00:44:39,686 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-24 00:44:39,686 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-24 00:44:39,686 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-24 00:44:39,687 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-24 00:44:39,694 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-24 00:44:39,703 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-24 00:44:39,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:39,866 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-24 00:44:39,874 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-24 00:44:39,881 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#40](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-24 00:44:39,888 [ scc.config] DEBUG Found github.token
2024-04-24 00:44:39,888 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-24 00:44:39,888 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:39,928 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:39,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:39,934 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:39,973 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:39,980 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f403e310> has no local changes
2024-04-24 00:44:39,980 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:39,991 [ scc.git] DEBUG [detached HEAD 7888b13] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:39,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:39,992 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-24 00:44:39,992 [ scc.repo] DEBUG ## PRs found:
2024-04-24 00:44:40,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-24 00:44:40,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-24 00:44:41,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-24 00:44:41,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-24 00:44:42,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-24 00:44:42,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-24 00:44:43,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-24 00:44:43,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-24 00:44:44,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-24 00:44:44,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-24 00:44:45,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-24 00:44:45,039 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-24 00:44:45,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-24 00:44:46,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-24 00:44:46,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-24 00:44:47,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-24 00:44:47,018 [ scc.repo] DEBUG ## Branches found:
2024-04-24 00:44:47,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-24 00:44:47,018 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:47,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:47,025 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-24 00:44:47,031 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-24 00:44:47,031 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-24 00:44:47,038 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-24 00:44:47,045 [ scc.git] DEBUG Already up to date.
2024-04-24 00:44:47,045 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-24 00:44:47,480 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-24 00:44:47,480 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-24 00:44:47,485 [ scc.git] DEBUG ## Unique users: []
2024-04-24 00:44:47,485 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:47,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:47,491 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-24 00:44:47,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:47,504 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-24 00:44:47,536 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-24 00:44:47,537 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-24 00:44:47,537 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-24 00:44:47,537 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-24 00:44:47,544 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-24 00:44:47,551 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-24 00:44:47,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:47,704 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-24 00:44:47,712 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-24 00:44:47,719 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#40](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-24 00:44:47,725 [ scc.config] DEBUG Found github.token
2024-04-24 00:44:47,725 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-24 00:44:47,725 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-24 00:44:47,766 [ scc.git] DEBUG Get sha1 of %s
2024-04-24 00:44:47,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-24 00:44:47,772 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:47,821 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:47,828 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4e47bcbb0> has no local changes
2024-04-24 00:44:47,829 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:47,839 [ scc.git] DEBUG [detached HEAD a385e90] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:47,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:47,839 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-24 00:44:47,918 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-24 00:44:48,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:48,131 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-24 00:44:48,135 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-24 00:44:48,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:48,536 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-24 00:44:48,541 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-24 00:44:48,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:48,936 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-24 00:44:48,941 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-24 00:44:49,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:49,342 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-24 00:44:49,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:49,748 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-24 00:44:49,753 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-24 00:44:50,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:50,170 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-24 00:44:50,175 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-24 00:44:50,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:50,573 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-24 00:44:50,578 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-24 00:44:50,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:50,985 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-24 00:44:50,990 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-24 00:44:51,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:51,423 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-24 00:44:51,427 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-24 00:44:51,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:51,847 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-24 00:44:51,851 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-24 00:44:52,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:52,252 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-24 00:44:52,257 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-24 00:44:52,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:52,664 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-24 00:44:52,670 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-24 00:44:53,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:53,075 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-24 00:44:53,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:53,477 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-24 00:44:53,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:53,891 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-24 00:44:53,896 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-24 00:44:54,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:54,303 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-24 00:44:54,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:54,704 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-24 00:44:55,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:55,117 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-24 00:44:55,122 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-24 00:44:55,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:55,543 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-24 00:44:55,551 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-24 00:44:55,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:55,941 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-24 00:44:55,947 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-24 00:44:56,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:56,352 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-24 00:44:56,358 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-24 00:44:56,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-24 00:44:56,771 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-24 00:44:56,772 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-24 00:44:56,861 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4f7df0460> has local changes
2024-04-24 00:44:56,861 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
- PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
- PR 554 jburel 'Update publish'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/40/)'
2024-04-24 00:44:56,885 [ scc.git] DEBUG [detached HEAD 68ab82f] merge master -Dorg -Ssuccess-only
2024-04-24 00:44:56,885 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-24 00:44:56,886 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-24 00:44:56,886 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,886 [ scc.merge] INFO
2024-04-24 00:44:56,886 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,886 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-04-24 00:44:56,886 [ scc.merge] INFO - PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
2024-04-24 00:44:56,886 [ scc.merge] INFO
2024-04-24 00:44:56,886 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-24 00:44:56,886 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,886 [ scc.merge] INFO
2024-04-24 00:44:56,886 [ scc.merge] INFO
2024-04-24 00:44:56,886 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-24 00:44:56,886 [ scc.merge] INFO Excluded PRs:
2024-04-24 00:44:56,886 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-24 00:44:56,886 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,887 [ scc.merge] INFO
2024-04-24 00:44:56,887 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,887 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-24 00:44:56,887 [ scc.merge] INFO
2024-04-24 00:44:56,887 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-24 00:44:56,887 [ scc.merge] INFO Excluded PRs:
2024-04-24 00:44:56,887 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-24 00:44:56,887 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-24 00:44:56,887 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-24 00:44:56,887 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-24 00:44:56,887 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,887 [ scc.merge] INFO
2024-04-24 00:44:56,887 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,887 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-24 00:44:56,887 [ scc.merge] INFO
2024-04-24 00:44:56,887 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-24 00:44:56,887 [ scc.merge] INFO Excluded PRs:
2024-04-24 00:44:56,887 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-24 00:44:56,887 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-24 00:44:56,887 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,887 [ scc.merge] INFO
2024-04-24 00:44:56,887 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,887 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-24 00:44:56,887 [ scc.merge] INFO
2024-04-24 00:44:56,887 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-24 00:44:56,888 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-24 00:44:56,888 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-24 00:44:56,888 [ scc.merge] INFO
2024-04-24 00:44:56,888 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-24 00:44:56,888 [ scc.merge] INFO Excluded PRs:
2024-04-24 00:44:56,888 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-24 00:44:56,888 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-24 00:44:56,888 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,888 [ scc.merge] INFO
2024-04-24 00:44:56,888 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,888 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-24 00:44:56,888 [ scc.merge] INFO - PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
2024-04-24 00:44:56,888 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-04-24 00:44:56,888 [ scc.merge] INFO
2024-04-24 00:44:56,888 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-24 00:44:56,888 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,888 [ scc.merge] INFO
2024-04-24 00:44:56,888 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,888 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-24 00:44:56,888 [ scc.merge] INFO
2024-04-24 00:44:56,888 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-24 00:44:56,888 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,888 [ scc.merge] INFO
2024-04-24 00:44:56,888 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,888 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-24 00:44:56,889 [ scc.merge] INFO
2024-04-24 00:44:56,889 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-24 00:44:56,889 [ scc.merge] INFO Excluded PRs:
2024-04-24 00:44:56,889 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-24 00:44:56,889 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-24 00:44:56,889 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,889 [ scc.merge] INFO
2024-04-24 00:44:56,889 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,889 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-24 00:44:56,889 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-24 00:44:56,889 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-24 00:44:56,889 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-24 00:44:56,889 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-24 00:44:56,889 [ scc.merge] INFO
2024-04-24 00:44:56,889 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-24 00:44:56,889 [ scc.merge] INFO Excluded PRs:
2024-04-24 00:44:56,889 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-24 00:44:56,889 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,889 [ scc.merge] INFO
2024-04-24 00:44:56,889 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,889 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-24 00:44:56,889 [ scc.merge] INFO
2024-04-24 00:44:56,889 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-24 00:44:56,889 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,889 [ scc.merge] INFO
2024-04-24 00:44:56,889 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-24 00:44:56,890 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-24 00:44:56,890 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-24 00:44:56,890 [ scc.merge] INFO
2024-04-24 00:44:56,890 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-24 00:44:56,890 [ scc.merge] INFO Excluded PRs:
2024-04-24 00:44:56,890 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-24 00:44:56,890 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-24 00:44:56,890 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-24 00:44:56,890 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,890 [ scc.merge] INFO
2024-04-24 00:44:56,890 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,890 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-24 00:44:56,890 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-24 00:44:56,890 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-24 00:44:56,890 [ scc.merge] INFO
2024-04-24 00:44:56,890 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-24 00:44:56,890 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,890 [ scc.merge] INFO
2024-04-24 00:44:56,890 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,890 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-24 00:44:56,890 [ scc.merge] INFO
2024-04-24 00:44:56,890 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-24 00:44:56,890 [ scc.merge] INFO Excluded PRs:
2024-04-24 00:44:56,890 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-24 00:44:56,890 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,891 [ scc.merge] INFO
2024-04-24 00:44:56,891 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,891 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-24 00:44:56,891 [ scc.merge] INFO
2024-04-24 00:44:56,891 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-24 00:44:56,891 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,891 [ scc.merge] INFO
2024-04-24 00:44:56,891 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-24 00:44:56,891 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-24 00:44:56,891 [ scc.merge] INFO
2024-04-24 00:44:56,891 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-24 00:44:56,891 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,891 [ scc.merge] INFO
2024-04-24 00:44:56,891 [ scc.merge] INFO Merged PRs:
2024-04-24 00:44:56,891 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-24 00:44:56,891 [ scc.merge] INFO
2024-04-24 00:44:56,891 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-24 00:44:56,891 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,891 [ scc.merge] INFO
2024-04-24 00:44:56,891 [ scc.merge] INFO
2024-04-24 00:44:56,891 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-24 00:44:56,891 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,891 [ scc.merge] INFO
2024-04-24 00:44:56,891 [ scc.merge] INFO
2024-04-24 00:44:56,891 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-24 00:44:56,892 [ scc.merge] INFO Excluded PRs:
2024-04-24 00:44:56,892 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-24 00:44:56,892 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,892 [ scc.merge] INFO
2024-04-24 00:44:56,892 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-24 00:44:56,892 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-24 00:44:56,892 [ scc.merge] INFO
2024-04-24 00:44:56,892 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-24 00:44:56,892 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,892 [ scc.merge] INFO
2024-04-24 00:44:56,892 [ scc.merge] INFO
2024-04-24 00:44:56,892 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-24 00:44:56,892 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,892 [ scc.merge] INFO
2024-04-24 00:44:56,892 [ scc.merge] INFO
2024-04-24 00:44:56,892 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-24 00:44:56,892 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,892 [ scc.merge] INFO
2024-04-24 00:44:56,892 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-24 00:44:56,892 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-24 00:44:56,892 [ scc.merge] INFO
2024-04-24 00:44:56,892 [ scc.merge] INFO Repository: ome/scripts
2024-04-24 00:44:56,892 [ scc.merge] INFO Excluded PRs:
2024-04-24 00:44:56,892 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-24 00:44:56,892 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-24 00:44:56,892 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-24 00:44:56,893 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-24 00:44:56,893 [ scc.merge] INFO Already up to date.
2024-04-24 00:44:56,893 [ scc.merge] INFO
2024-04-24 00:44:56,893 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-24 00:44:56,893 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-24 00:44:56,893 [ scc.merge] INFO
2024-04-24 00:44:56,893 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-24 00:44:56,893 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-24 00:44:56,901 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-24 00:44:56,908 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-24 00:44:56,914 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-24 00:44:56,920 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-24 00:44:56,927 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-24 00:44:56,933 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-24 00:44:56,940 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-24 00:44:56,946 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-24 00:44:56,952 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-24 00:44:56,959 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-24 00:44:56,965 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-24 00:44:56,971 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-24 00:44:56,976 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-24 00:44:56,983 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-24 00:44:56,989 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:56,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:56,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-24 00:44:56,995 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:57,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:57,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-24 00:44:57,001 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:57,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:57,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-24 00:44:57,007 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:57,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:57,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-24 00:44:57,014 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:57,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:57,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-24 00:44:57,020 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:57,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:57,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-24 00:44:57,027 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:57,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-24 00:44:57,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-24 00:44:57,034 [ scc.git] DEBUG Calling 'git remote'
2024-04-24 00:44:57,039 [ 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 debf35f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 87d179a0
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 9d8d147
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD e634556] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-04-24 00:45:42,840 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-04-24 00:45:51,859 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-04-24 00:45:54,293 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-24 00:45:58,864 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-24 00:46:46,541 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
