Skipping 131 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-25 00:45:07,107 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-25 00:45:07,107 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-25 00:45:07,107 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-25 00:45:07,107 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-25 00:45:07,107 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-25 00:45:07,107 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-25 00:45:07,107 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-25 00:45:07,107 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-25 00:45:07,107 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-25 00:45:07,107 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-25 00:45:07,107 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-25 00:45:07,108 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-25 00:45:07,108 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-25 00:45:07,108 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-25 00:45:07,108 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-25 00:45:07,108 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-25 00:45:07,108 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-25 00:45:07,108 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-25 00:45:07,108 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-25 00:45:07,109 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-25 00:45:07,109 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-25 00:45:07,109 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-25 00:45:07,110 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-25 00:45:07,110 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-25 00:45:07,110 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-25 00:45:07,110 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-25 00:45:07,110 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-25 00:45:07,110 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-25 00:45:07,110 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-25 00:45:07,110 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-25 00:45:07,110 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-25 00:45:07,110 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-25 00:45:07,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:07,258 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7d25b9fb49959ba7f143c70927573efb62c9667e'
2024-04-25 00:45:07,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:07,283 [ 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-25 00:45:07,332 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:45:07,336 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-25 00:45:07,337 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-25 00:45:07,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:07,671 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-25 00:45:07,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:07,690 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-25 00:45:07,730 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:45:07,733 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-04-25 00:45:07,733 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-25 00:45:08,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:08,085 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:45:08,144 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:08,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:08,152 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:45:08,200 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:45:08,214 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cd1b5be0> has no local changes
2024-04-25 00:45:08,214 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:45:08,228 [ scc.git] DEBUG [detached HEAD 5a140289] merge master -Dorg -Ssuccess-only
2024-04-25 00:45:08,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:45:08,229 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:45:08,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-25 00:45:09,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-25 00:45:09,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-25 00:45:10,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-25 00:45:10,474 [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-25 00:45:10,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-25 00:45:11,427 [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-25 00:45:11,427 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-25 00:45:11,428 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:45:11,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-25 00:45:11,428 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:11,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:11,434 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:45:11,440 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:45:11,440 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:45:11,446 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:45:11,453 [ scc.git] DEBUG Already up to date.
2024-04-25 00:45:11,453 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-25 00:45:11,882 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-25 00:45:11,883 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-25 00:45:11,888 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:45:11,888 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:11,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:11,894 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-25 00:45:11,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:11,907 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-25 00:45:11,958 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-25 00:45:11,959 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:45:11,962 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-25 00:45:11,962 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-25 00:45:12,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:12,128 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:45:12,172 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:12,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:12,180 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:45:12,223 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:45:12,230 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cd16b550> has no local changes
2024-04-25 00:45:12,230 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:45:12,240 [ scc.git] DEBUG [detached HEAD f2a94c4] merge master -Dorg -Ssuccess-only
2024-04-25 00:45:12,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:45:12,241 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:45:12,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-25 00:45:13,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-25 00:45:13,087 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-25 00:45:13,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-25 00:45:14,150 [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-25 00:45:14,693 [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-25 00:45:15,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-25 00:45:15,657 [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-25 00:45:15,658 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-25 00:45:15,658 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:45:15,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-25 00:45:15,658 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:15,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:15,664 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:45:15,669 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:45:15,670 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:45:15,676 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:45:15,683 [ scc.git] DEBUG Already up to date.
2024-04-25 00:45:15,683 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-25 00:45:16,054 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-25 00:45:16,055 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-25 00:45:16,059 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:45:16,060 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:16,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:16,065 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-25 00:45:16,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:16,077 [ 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-25 00:45:16,089 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:45:16,094 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-25 00:45:16,094 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-25 00:45:16,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:16,256 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:45:16,298 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:16,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:16,305 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:45:16,348 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:45:16,356 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cd173820> has no local changes
2024-04-25 00:45:16,357 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:45:16,368 [ scc.git] DEBUG [detached HEAD 9c0fc07] merge master -Dorg -Ssuccess-only
2024-04-25 00:45:16,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:45:16,369 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:45:16,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-25 00:45:17,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474 HTTP/1.1" 200 None
2024-04-25 00:45:17,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1 HTTP/1.1" 200 None
2024-04-25 00:45:18,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-25 00:45:18,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-25 00:45:19,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1 HTTP/1.1" 200 None
2024-04-25 00:45:19,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/fb31a249bfe16120da3403c6e450afad9f8db7e1?per_page=1 HTTP/1.1" 200 2
2024-04-25 00:45:19,545 [ scc.repo] DEBUG - PR 474 will-moore 'Img data error handling'
2024-04-25 00:45:20,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-04-25 00:45:20,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-04-25 00:45:20,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-25 00:45:21,446 [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-25 00:45:21,933 [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-25 00:45:22,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-25 00:45:22,846 [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-25 00:45:22,846 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-25 00:45:23,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-25 00:45:23,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-25 00:45:24,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-25 00:45:24,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-25 00:45:25,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-25 00:45:25,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-25 00:45:26,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99?per_page=1 HTTP/1.1" 200 2
2024-04-25 00:45:26,121 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-25 00:45:26,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-25 00:45:27,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-25 00:45:27,577 [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-25 00:45:28,062 [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-25 00:45:28,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-25 00:45:28,971 [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-25 00:45:28,972 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-25 00:45:29,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-25 00:45:29,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-25 00:45:30,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-25 00:45:30,962 [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-25 00:45:31,490 [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-25 00:45:31,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-25 00:45:32,355 [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-25 00:45:32,356 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-25 00:45:32,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-25 00:45:33,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-25 00:45:33,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-25 00:45:34,224 [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-25 00:45:34,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-25 00:45:35,066 [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-25 00:45:35,067 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-25 00:45:35,068 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:45:35,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-25 00:45:35,068 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:35,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:35,076 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:45:35,084 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:45:35,085 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:45:35,095 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:45:35,104 [ scc.git] DEBUG Already up to date.
2024-04-25 00:45:35,105 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-25 00:45:35,573 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-25 00:45:35,574 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-25 00:45:35,580 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-25 00:45:36,768 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-25 00:45:36,768 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-25 00:45:36,774 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-25 00:45:37,215 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-25 00:45:37,215 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-25 00:45:37,220 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-25 00:45:38,316 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-25 00:45:38,316 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-25 00:45:38,319 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-04-25 00:45:38,735 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-25 00:45:38,735 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-04-25 00:45:38,740 [ scc.git] DEBUG Calling 'git fetch origin pull/474/head'
2024-04-25 00:45:39,317 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-25 00:45:39,318 [ scc.git] DEBUG * branch refs/pull/474/head -> FETCH_HEAD
2024-04-25 00:45:39,320 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:45:39,320 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:39,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:39,328 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-25 00:45:39,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:39,348 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-25 00:45:39,365 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:45:39,368 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-25 00:45:39,368 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-25 00:45:39,368 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-25 00:45:39,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:39,535 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-25 00:45:39,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:39,551 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-25 00:45:39,650 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:45:39,657 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-25 00:45:39,658 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-25 00:45:39,658 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-25 00:45:39,658 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-25 00:45:39,658 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-25 00:45:39,658 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-25 00:45:39,658 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-25 00:45:39,658 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-25 00:45:39,658 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-25 00:45:39,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:39,948 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-25 00:45:39,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:39,965 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-25 00:45:40,002 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:45:40,005 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-25 00:45:40,005 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-25 00:45:40,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:40,362 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-25 00:45:40,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:40,382 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-25 00:45:40,490 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-25 00:45:40,491 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:45:40,499 [ scc.git] DEBUG css/app.css | 30 +++++++
2024-04-25 00:45:40,499 [ scc.git] DEBUG src/controls/dimension-slider.js | 6 +-
2024-04-25 00:45:40,499 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-25 00:45:40,499 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-25 00:45:40,499 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 4 +-
2024-04-25 00:45:40,499 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 165 +++++++++++++++++++++++++------------
2024-04-25 00:45:40,500 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 61 +++++++++++++-
2024-04-25 00:45:40,500 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-25 00:45:40,500 [ scc.git] DEBUG 8 files changed, 228 insertions(+), 63 deletions(-)
2024-04-25 00:45:40,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:40,775 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-25 00:45:40,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:40,797 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-25 00:45:40,848 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-04-25 00:45:40,849 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:45:40,853 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-04-25 00:45:40,853 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-04-25 00:45:40,853 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-04-25 00:45:41,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:41,184 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb31a249bfe16120da3403c6e450afad9f8db7e1'
2024-04-25 00:45:41,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:41,201 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 474 (Img data error handling) fb31a249bfe16120da3403c6e450afad9f8db7e1'
2024-04-25 00:45:41,223 [ scc.git] DEBUG Auto-merging css/app.css
2024-04-25 00:45:41,223 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-04-25 00:45:41,223 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-04-25 00:45:41,223 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:45:41,228 [ scc.git] DEBUG css/app.css | 4 ++++
2024-04-25 00:45:41,228 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 11 ++++++-----
2024-04-25 00:45:41,228 [ scc.git] DEBUG src/model/image_info.js | 41 +++++++++++++++++++++++++++++++++++++++++
2024-04-25 00:45:41,228 [ scc.git] DEBUG 3 files changed, 51 insertions(+), 5 deletions(-)
2024-04-25 00:45:41,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:41,592 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:45:41,633 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:41,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:41,638 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:45:41,678 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:45:41,686 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cd1635b0> has no local changes
2024-04-25 00:45:41,686 [ 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'
- PR 474 will-moore 'Img data error handling'
Generated by OMERO-plugins-push#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:45:41,695 [ scc.git] DEBUG [detached HEAD c4f63db] merge master -Dorg -Ssuccess-only
2024-04-25 00:45:41,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:45:41,696 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:45:42,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-25 00:45:42,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-25 00:45:43,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-25 00:45:43,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-25 00:45:44,126 [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-25 00:45:44,589 [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-25 00:45:45,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-25 00:45:45,490 [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-25 00:45:45,491 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-25 00:45:45,492 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:45:45,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-25 00:45:45,492 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:45,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:45,500 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:45:45,505 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:45:45,505 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:45:45,512 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:45:45,518 [ scc.git] DEBUG Already up to date.
2024-04-25 00:45:45,519 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-25 00:45:45,909 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-25 00:45:45,909 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-25 00:45:45,915 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:45:45,915 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:45,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:45,922 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-25 00:45:45,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:45,935 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-25 00:45:45,946 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:45:45,949 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-25 00:45:45,949 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-25 00:45:45,949 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-25 00:45:45,949 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-25 00:45:45,949 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-25 00:45:45,949 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-25 00:45:46,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:46,109 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:45:46,153 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:46,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:46,161 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:45:46,206 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:45:46,215 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cd13f4f0> has no local changes
2024-04-25 00:45:46,215 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:45:46,226 [ scc.git] DEBUG [detached HEAD 89d6d99] merge master -Dorg -Ssuccess-only
2024-04-25 00:45:46,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:45:46,227 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:45:46,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-25 00:45:47,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-25 00:45:47,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-25 00:45:48,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-25 00:45:48,565 [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-25 00:45:49,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-25 00:45:49,502 [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-25 00:45:49,503 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-25 00:45:49,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-25 00:45:50,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-25 00:45:50,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-25 00:45:51,394 [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-25 00:45:51,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-25 00:45:52,321 [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-25 00:45:52,322 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-25 00:45:52,323 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:45:52,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-25 00:45:52,323 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:52,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:52,330 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:45:52,337 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:45:52,337 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:45:52,344 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:45:52,352 [ scc.git] DEBUG Already up to date.
2024-04-25 00:45:52,352 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-25 00:45:52,875 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-25 00:45:52,876 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-25 00:45:52,881 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-25 00:45:53,428 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-25 00:45:53,428 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-25 00:45:53,433 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:45:53,433 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:53,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:53,439 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-25 00:45:53,447 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:53,453 [ 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-25 00:45:53,552 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-25 00:45:53,552 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-25 00:45:53,552 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-25 00:45:53,552 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-25 00:45:53,553 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-25 00:45:53,553 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-25 00:45:53,562 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-25 00:45:53,569 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-25 00:45:53,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:53,725 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-25 00:45:53,733 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-25 00:45:53,739 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#41](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-25 00:45:53,745 [ scc.config] DEBUG Found github.token
2024-04-25 00:45:53,745 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-25 00:45:53,745 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-25 00:45:53,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:53,758 [ 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-25 00:45:53,779 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-25 00:45:53,780 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-25 00:45:53,780 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-25 00:45:53,780 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-25 00:45:53,781 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-25 00:45:53,788 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-25 00:45:53,796 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-25 00:45:54,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:45:54,133 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-25 00:45:54,141 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-25 00:45:54,147 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#41](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/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-25 00:45:54,152 [ scc.config] DEBUG Found github.token
2024-04-25 00:45:54,153 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-25 00:45:54,153 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:45:54,217 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:45:54,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:45:54,224 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:45:54,266 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:45:54,275 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cd163550> has no local changes
2024-04-25 00:45:54,275 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:45:54,285 [ scc.git] DEBUG [detached HEAD f350929] merge master -Dorg -Ssuccess-only
2024-04-25 00:45:54,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:45:54,286 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:45:54,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-25 00:45:55,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-25 00:45:55,195 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-25 00:45:55,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-25 00:45:56,202 [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-25 00:45:56,686 [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-25 00:45:57,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-25 00:45:57,556 [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-25 00:45:57,557 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-25 00:45:58,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-25 00:45:58,029 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-25 00:45:58,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-25 00:45:59,119 [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-25 00:45:59,600 [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-25 00:46:00,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-25 00:46:00,556 [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-25 00:46:00,557 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-25 00:46:01,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-25 00:46:01,045 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-25 00:46:01,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-25 00:46:02,090 [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-25 00:46:02,632 [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-25 00:46:03,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-25 00:46:03,596 [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-25 00:46:03,597 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-25 00:46:04,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-25 00:46:04,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-25 00:46:04,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-25 00:46:05,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-25 00:46:05,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-25 00:46:06,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-25 00:46:06,506 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:06,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-25 00:46:06,506 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:06,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:06,513 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:46:06,518 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:06,518 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:46:06,525 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:46:06,530 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:06,531 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-25 00:46:06,910 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-25 00:46:06,910 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-25 00:46:06,915 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-25 00:46:07,291 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-25 00:46:07,292 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-25 00:46:07,297 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-25 00:46:07,678 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-25 00:46:07,678 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-25 00:46:07,683 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:07,684 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:07,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:07,691 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-25 00:46:07,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:07,704 [ 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-25 00:46:07,715 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:46:07,718 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-25 00:46:07,718 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-25 00:46:07,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:07,884 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-25 00:46:07,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:07,897 [ 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-25 00:46:07,965 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-25 00:46:07,966 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:46:07,969 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-25 00:46:07,969 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-25 00:46:08,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:08,305 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-25 00:46:08,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:08,316 [ 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-25 00:46:08,338 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-25 00:46:08,339 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:46:08,342 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-25 00:46:08,342 [ scc.git] DEBUG package.json | 2 +-
2024-04-25 00:46:08,342 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-25 00:46:08,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:08,730 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:08,774 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:08,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:08,780 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:08,823 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:08,831 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cd166fd0> has no local changes
2024-04-25 00:46:08,832 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:08,842 [ scc.git] DEBUG [detached HEAD 346092b] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:08,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:08,842 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:46:09,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-25 00:46:09,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-25 00:46:10,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-25 00:46:10,760 [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-25 00:46:11,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-25 00:46:11,632 [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-25 00:46:11,632 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-25 00:46:11,632 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:11,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-25 00:46:11,633 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:11,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:11,639 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:46:11,644 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:11,644 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:46:11,649 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:46:11,653 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:11,654 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-25 00:46:12,035 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-25 00:46:12,036 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-25 00:46:12,041 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:12,041 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:12,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:12,049 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-25 00:46:12,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:12,063 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-25 00:46:12,085 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:46:12,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:12,249 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:12,293 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:12,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:12,299 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:12,342 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:12,348 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cc0db340> has no local changes
2024-04-25 00:46:12,348 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:12,358 [ scc.git] DEBUG [detached HEAD 80dfbbd] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:12,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:12,358 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:46:12,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-25 00:46:13,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-25 00:46:13,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-25 00:46:14,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-25 00:46:14,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-25 00:46:15,160 [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-25 00:46:15,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-25 00:46:16,089 [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-25 00:46:16,090 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-25 00:46:16,090 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:16,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-25 00:46:16,090 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:16,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:16,096 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:46:16,102 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:16,103 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:46:16,111 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:46:16,119 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:16,119 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-25 00:46:16,600 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-25 00:46:16,600 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-25 00:46:16,605 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:16,605 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:16,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:16,612 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-25 00:46:16,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:16,626 [ 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-25 00:46:16,636 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-25 00:46:16,637 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:46:16,639 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-25 00:46:16,639 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-25 00:46:16,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:16,810 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:16,853 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:16,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:16,860 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:16,900 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:16,906 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cc11d5b0> has no local changes
2024-04-25 00:46:16,907 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:16,916 [ scc.git] DEBUG [detached HEAD c0be9d9] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:16,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:16,917 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:46:17,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-25 00:46:17,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-25 00:46:18,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-25 00:46:18,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-25 00:46:19,228 [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-25 00:46:19,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-25 00:46:20,202 [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-25 00:46:20,203 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-25 00:46:20,203 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:20,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-25 00:46:20,203 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:20,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:20,211 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:46:20,216 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:20,216 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:46:20,221 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:46:20,226 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:20,227 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-25 00:46:20,649 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-25 00:46:20,649 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-25 00:46:20,654 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:20,655 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:20,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:20,664 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-25 00:46:20,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:20,677 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-25 00:46:20,724 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-25 00:46:20,724 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-25 00:46:20,724 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-25 00:46:20,724 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-25 00:46:20,725 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-25 00:46:20,725 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-25 00:46:20,725 [ scc.git] DEBUG Auto-merging setup.py
2024-04-25 00:46:20,725 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-25 00:46:20,725 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-25 00:46:20,725 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-25 00:46:20,732 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-25 00:46:20,741 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-25 00:46:20,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:20,898 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-25 00:46:20,905 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-25 00:46:20,912 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#41](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-04-25 00:46:20,918 [ scc.config] DEBUG Found github.token
2024-04-25 00:46:20,918 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-25 00:46:20,918 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:20,958 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:20,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:20,965 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:21,007 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:21,015 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cd173df0> has no local changes
2024-04-25 00:46:21,015 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:21,024 [ scc.git] DEBUG [detached HEAD 89c0435] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:21,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:21,024 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:46:21,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-25 00:46:21,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-25 00:46:22,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-25 00:46:22,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-25 00:46:23,317 [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-25 00:46:23,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-25 00:46:24,170 [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-25 00:46:24,171 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-25 00:46:24,171 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:24,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-25 00:46:24,171 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:24,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:24,178 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:46:24,184 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:24,184 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:46:24,190 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:46:24,196 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:24,196 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-25 00:46:24,634 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-25 00:46:24,635 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-25 00:46:24,639 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:24,639 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:24,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:24,646 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-25 00:46:24,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:24,660 [ 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-25 00:46:24,687 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-25 00:46:24,690 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-25 00:46:24,690 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-25 00:46:24,690 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-25 00:46:24,690 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-25 00:46:24,690 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-25 00:46:24,690 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-25 00:46:24,690 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-25 00:46:24,690 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-25 00:46:24,690 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-25 00:46:24,691 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-25 00:46:24,691 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-25 00:46:24,691 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-25 00:46:24,691 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-25 00:46:24,691 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-25 00:46:24,693 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-25 00:46:24,693 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-25 00:46:24,693 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-25 00:46:24,693 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-25 00:46:24,693 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-25 00:46:24,693 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-25 00:46:24,693 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-25 00:46:24,693 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-25 00:46:24,693 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-25 00:46:24,694 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-25 00:46:24,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:24,857 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:24,900 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:24,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:24,908 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:24,952 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:24,959 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cd166df0> has no local changes
2024-04-25 00:46:24,959 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:24,969 [ scc.git] DEBUG [detached HEAD 10cac84] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:24,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:24,969 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:46:25,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-25 00:46:25,295 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:25,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-25 00:46:25,296 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:25,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:25,301 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:46:25,306 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:25,306 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:46:25,311 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:46:25,317 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:25,317 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:25,317 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:25,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:25,322 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:25,361 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:25,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:25,366 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:25,404 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:25,410 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cc129fa0> has no local changes
2024-04-25 00:46:25,411 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:25,419 [ scc.git] DEBUG [detached HEAD e3ba880] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:25,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:25,420 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:46:25,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-25 00:46:25,736 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:25,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-25 00:46:25,737 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:25,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:25,742 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:46:25,747 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:25,747 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:46:25,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:46:25,757 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:25,757 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:25,757 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:25,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:25,762 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:25,801 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:25,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:25,806 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:25,846 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:25,854 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cc0bff70> has no local changes
2024-04-25 00:46:25,854 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:25,862 [ scc.git] DEBUG [detached HEAD 22fc9f8] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:25,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:25,863 [ scc.git] INFO Overriding base-branch from master to main
2024-04-25 00:46:25,863 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:46:26,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-25 00:46:26,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-25 00:46:27,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-25 00:46:27,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-25 00:46:28,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-25 00:46:28,629 [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-25 00:46:29,092 [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-25 00:46:29,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-25 00:46:29,952 [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-25 00:46:29,953 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-25 00:46:29,953 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:29,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-25 00:46:29,953 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:29,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:29,959 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-25 00:46:29,963 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:29,964 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-25 00:46:29,969 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-25 00:46:29,974 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:29,974 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-25 00:46:30,436 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-25 00:46:30,437 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-25 00:46:30,441 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:30,442 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:30,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:30,449 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-25 00:46:30,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:30,462 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-25 00:46:30,499 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-25 00:46:30,500 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-25 00:46:30,500 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-25 00:46:30,500 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-25 00:46:30,507 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-25 00:46:30,513 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-25 00:46:30,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:30,672 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-25 00:46:30,678 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-25 00:46:30,689 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#41](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-25 00:46:30,694 [ scc.config] DEBUG Found github.token
2024-04-25 00:46:30,695 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-25 00:46:30,695 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:30,733 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:30,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:30,739 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:30,778 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:30,784 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cc099430> has no local changes
2024-04-25 00:46:30,785 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:30,793 [ scc.git] DEBUG [detached HEAD 652f1ef] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:30,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:30,794 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:46:31,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-25 00:46:31,116 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:31,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-25 00:46:31,116 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:31,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:31,122 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:46:31,127 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:31,127 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:46:31,132 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:46:31,137 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:31,137 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:31,137 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:31,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:31,141 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:31,184 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:31,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:31,191 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:31,233 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:31,240 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cc0c4e50> has no local changes
2024-04-25 00:46:31,240 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:31,249 [ scc.git] DEBUG [detached HEAD 2a768f9] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:31,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:31,250 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:46:31,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-25 00:46:31,562 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:31,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-25 00:46:31,563 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:31,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:31,570 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:46:31,575 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:31,575 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:46:31,582 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:46:31,587 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:31,588 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:31,588 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:31,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:31,593 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:31,633 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:31,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:31,640 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:31,679 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:31,687 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6bc7bc940> has no local changes
2024-04-25 00:46:31,687 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:31,696 [ scc.git] DEBUG [detached HEAD 2a8b69d] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:31,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:31,697 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:46:32,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-25 00:46:32,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-25 00:46:33,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-25 00:46:33,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-25 00:46:34,017 [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-25 00:46:34,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-25 00:46:34,984 [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-25 00:46:34,985 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-25 00:46:34,985 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:34,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-25 00:46:34,985 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:34,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:34,992 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-25 00:46:35,002 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:35,002 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-25 00:46:35,009 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-25 00:46:35,016 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:35,016 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-25 00:46:35,483 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-25 00:46:35,483 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-25 00:46:35,489 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:35,490 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:35,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:35,498 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-25 00:46:35,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:35,510 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-25 00:46:35,554 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-25 00:46:35,554 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-25 00:46:35,554 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-25 00:46:35,555 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-25 00:46:35,561 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-25 00:46:35,569 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-25 00:46:35,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:35,728 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-25 00:46:35,735 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-25 00:46:35,741 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#41](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-25 00:46:35,746 [ scc.config] DEBUG Found github.token
2024-04-25 00:46:35,747 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-25 00:46:35,747 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:35,788 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:35,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:35,796 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:35,837 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:35,846 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cc05c310> has no local changes
2024-04-25 00:46:35,846 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:35,857 [ scc.git] DEBUG [detached HEAD e8879e7] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:35,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:35,857 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-25 00:46:35,858 [ scc.repo] DEBUG ## PRs found:
2024-04-25 00:46:36,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-25 00:46:36,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-25 00:46:37,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-25 00:46:37,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-25 00:46:38,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-25 00:46:38,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-25 00:46:39,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-25 00:46:39,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-25 00:46:40,009 [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-25 00:46:40,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-25 00:46:40,868 [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-25 00:46:40,869 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-25 00:46:41,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-25 00:46:41,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-25 00:46:42,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-25 00:46:42,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-25 00:46:42,883 [ scc.repo] DEBUG ## Branches found:
2024-04-25 00:46:42,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-25 00:46:42,883 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:42,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:42,889 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-25 00:46:42,894 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-25 00:46:42,894 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-25 00:46:42,900 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-25 00:46:42,907 [ scc.git] DEBUG Already up to date.
2024-04-25 00:46:42,907 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-25 00:46:43,364 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-25 00:46:43,364 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-25 00:46:43,369 [ scc.git] DEBUG ## Unique users: []
2024-04-25 00:46:43,369 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:43,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:43,374 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-25 00:46:43,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:43,385 [ 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-25 00:46:43,424 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-25 00:46:43,424 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-25 00:46:43,424 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-25 00:46:43,425 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-25 00:46:43,431 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-25 00:46:43,439 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-25 00:46:43,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:43,628 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-25 00:46:43,635 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-25 00:46:43,643 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#41](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-25 00:46:43,648 [ scc.config] DEBUG Found github.token
2024-04-25 00:46:43,649 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-25 00:46:43,649 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-25 00:46:43,688 [ scc.git] DEBUG Get sha1 of %s
2024-04-25 00:46:43,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-25 00:46:43,695 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:43,737 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:43,745 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6bc7bcbb0> has no local changes
2024-04-25 00:46:43,745 [ 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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:43,755 [ scc.git] DEBUG [detached HEAD 6405453] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:43,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:43,756 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-25 00:46:43,836 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-25 00:46:44,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:44,049 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-25 00:46:44,054 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-25 00:46:44,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:44,456 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-25 00:46:44,461 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-25 00:46:44,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:44,864 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-25 00:46:44,869 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-25 00:46:45,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:45,273 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-25 00:46:45,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:45,680 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-25 00:46:45,685 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-25 00:46:46,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:46,091 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-25 00:46:46,095 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-25 00:46:46,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:46,496 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-25 00:46:46,501 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-25 00:46:46,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:46,905 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-25 00:46:46,910 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-25 00:46:47,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:47,318 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-25 00:46:47,323 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-25 00:46:47,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:47,731 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-25 00:46:47,738 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-25 00:46:48,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:48,140 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-25 00:46:48,145 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-25 00:46:48,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:48,552 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-25 00:46:48,560 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-25 00:46:48,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:48,964 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-25 00:46:49,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:49,370 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-25 00:46:49,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:49,773 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-25 00:46:49,778 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-25 00:46:50,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:50,192 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-25 00:46:50,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:50,604 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-25 00:46:51,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:51,020 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-25 00:46:51,026 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-25 00:46:51,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:51,452 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-25 00:46:51,458 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-25 00:46:51,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:51,855 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-25 00:46:51,861 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-25 00:46:52,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:52,276 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-25 00:46:52,281 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-25 00:46:52,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-25 00:46:52,679 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-25 00:46:52,679 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-25 00:46:52,770 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6ce2f9ac0> has local changes
2024-04-25 00:46:52,770 [ 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'
- PR 474 will-moore 'Img data error handling'
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#41 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/41/)'
2024-04-25 00:46:52,786 [ scc.git] DEBUG [detached HEAD 13e3826] merge master -Dorg -Ssuccess-only
2024-04-25 00:46:52,787 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-25 00:46:52,787 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-25 00:46:52,787 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,787 [ scc.merge] INFO
2024-04-25 00:46:52,787 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,787 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-04-25 00:46:52,787 [ scc.merge] INFO - PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
2024-04-25 00:46:52,787 [ scc.merge] INFO
2024-04-25 00:46:52,787 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-25 00:46:52,787 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,787 [ scc.merge] INFO
2024-04-25 00:46:52,787 [ scc.merge] INFO
2024-04-25 00:46:52,787 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-25 00:46:52,787 [ scc.merge] INFO Excluded PRs:
2024-04-25 00:46:52,787 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-25 00:46:52,788 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,788 [ scc.merge] INFO
2024-04-25 00:46:52,788 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-25 00:46:52,788 [ scc.merge] INFO
2024-04-25 00:46:52,788 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-25 00:46:52,788 [ scc.merge] INFO Excluded PRs:
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-25 00:46:52,788 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,788 [ scc.merge] INFO
2024-04-25 00:46:52,788 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-25 00:46:52,788 [ scc.merge] INFO
2024-04-25 00:46:52,788 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-25 00:46:52,788 [ scc.merge] INFO Excluded PRs:
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-25 00:46:52,788 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,788 [ scc.merge] INFO
2024-04-25 00:46:52,788 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-25 00:46:52,788 [ scc.merge] INFO
2024-04-25 00:46:52,788 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-25 00:46:52,788 [ scc.merge] INFO
2024-04-25 00:46:52,788 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-25 00:46:52,788 [ scc.merge] INFO Excluded PRs:
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-25 00:46:52,788 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-25 00:46:52,788 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,788 [ scc.merge] INFO
2024-04-25 00:46:52,789 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-04-25 00:46:52,789 [ scc.merge] INFO
2024-04-25 00:46:52,789 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-25 00:46:52,789 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,789 [ scc.merge] INFO
2024-04-25 00:46:52,789 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-25 00:46:52,789 [ scc.merge] INFO
2024-04-25 00:46:52,789 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-25 00:46:52,789 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,789 [ scc.merge] INFO
2024-04-25 00:46:52,789 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-25 00:46:52,789 [ scc.merge] INFO
2024-04-25 00:46:52,789 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-25 00:46:52,789 [ scc.merge] INFO Excluded PRs:
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-25 00:46:52,789 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,789 [ scc.merge] INFO
2024-04-25 00:46:52,789 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 474 will-moore 'Img data error handling'
2024-04-25 00:46:52,789 [ scc.merge] INFO
2024-04-25 00:46:52,789 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-25 00:46:52,789 [ scc.merge] INFO Excluded PRs:
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-25 00:46:52,789 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,789 [ scc.merge] INFO
2024-04-25 00:46:52,789 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,789 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-25 00:46:52,790 [ scc.merge] INFO
2024-04-25 00:46:52,790 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-25 00:46:52,790 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,790 [ scc.merge] INFO
2024-04-25 00:46:52,790 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-25 00:46:52,790 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-25 00:46:52,790 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-25 00:46:52,790 [ scc.merge] INFO
2024-04-25 00:46:52,790 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-25 00:46:52,790 [ scc.merge] INFO Excluded PRs:
2024-04-25 00:46:52,790 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-25 00:46:52,790 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-25 00:46:52,790 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-25 00:46:52,790 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,790 [ scc.merge] INFO
2024-04-25 00:46:52,790 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,790 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-25 00:46:52,790 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-25 00:46:52,790 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-25 00:46:52,790 [ scc.merge] INFO
2024-04-25 00:46:52,790 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-25 00:46:52,790 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,790 [ scc.merge] INFO
2024-04-25 00:46:52,790 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,790 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-25 00:46:52,790 [ scc.merge] INFO
2024-04-25 00:46:52,790 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-25 00:46:52,790 [ scc.merge] INFO Excluded PRs:
2024-04-25 00:46:52,790 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-25 00:46:52,790 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,790 [ scc.merge] INFO
2024-04-25 00:46:52,790 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,790 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-25 00:46:52,790 [ scc.merge] INFO
2024-04-25 00:46:52,790 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-25 00:46:52,790 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,790 [ scc.merge] INFO
2024-04-25 00:46:52,790 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-25 00:46:52,791 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-25 00:46:52,791 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO Merged PRs:
2024-04-25 00:46:52,791 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-25 00:46:52,791 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-25 00:46:52,791 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-25 00:46:52,791 [ scc.merge] INFO Excluded PRs:
2024-04-25 00:46:52,791 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-25 00:46:52,791 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-25 00:46:52,791 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-25 00:46:52,791 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-25 00:46:52,791 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO
2024-04-25 00:46:52,791 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-25 00:46:52,792 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,792 [ scc.merge] INFO
2024-04-25 00:46:52,792 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-25 00:46:52,792 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-25 00:46:52,792 [ scc.merge] INFO
2024-04-25 00:46:52,792 [ scc.merge] INFO Repository: ome/scripts
2024-04-25 00:46:52,792 [ scc.merge] INFO Excluded PRs:
2024-04-25 00:46:52,792 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-25 00:46:52,792 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-25 00:46:52,792 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-25 00:46:52,792 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-25 00:46:52,792 [ scc.merge] INFO Already up to date.
2024-04-25 00:46:52,792 [ scc.merge] INFO
2024-04-25 00:46:52,792 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-25 00:46:52,792 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-25 00:46:52,792 [ scc.merge] INFO
2024-04-25 00:46:52,792 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-25 00:46:52,792 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-25 00:46:52,798 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-25 00:46:52,803 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-25 00:46:52,808 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-25 00:46:52,813 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-25 00:46:52,818 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-25 00:46:52,824 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-25 00:46:52,829 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-25 00:46:52,834 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-25 00:46:52,841 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-25 00:46:52,847 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-25 00:46:52,853 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-25 00:46:52,858 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-25 00:46:52,864 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-25 00:46:52,871 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-25 00:46:52,876 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-25 00:46:52,881 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-25 00:46:52,886 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-25 00:46:52,892 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-25 00:46:52,897 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-25 00:46:52,902 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-25 00:46:52,907 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-25 00:46:52,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-25 00:46:52,912 [ scc.git] DEBUG Calling 'git remote'
2024-04-25 00:46:52,916 [ 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 ac62fd0] 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 7bdc3aa] 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-25 00:47:39,866 [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-25 00:47:49,315 [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-25 00:47:51,737 [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-25 00:47:56,469 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-25 00:48:44,902 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/4be69ed6/images/svgs/logo.svg){kind=logo}
