Skipping 120 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-02 00:45:16,353 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-02 00:45:16,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-02 00:45:16,354 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-02 00:45:16,354 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-02 00:45:16,354 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-02 00:45:16,354 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-02 00:45:16,354 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-02 00:45:16,354 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-02 00:45:16,354 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-02 00:45:16,354 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-02 00:45:16,354 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-02 00:45:16,354 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-02 00:45:16,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-02 00:45:16,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-02 00:45:16,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-02 00:45:16,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-02 00:45:16,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-02 00:45:16,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-02 00:45:16,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-02 00:45:16,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-02 00:45:16,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-02 00:45:16,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-02 00:45:16,354 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-02 00:45:16,355 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-02 00:45:16,355 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-02 00:45:16,355 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-02 00:45:16,355 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-02 00:45:16,355 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-02 00:45:16,355 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-02 00:45:16,355 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-02 00:45:16,355 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-02 00:45:16,355 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-02 00:45:16,355 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-02 00:45:16,355 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-02 00:45:16,355 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-02 00:45:16,355 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-02 00:45:16,355 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-02 00:45:16,355 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-02 00:45:16,355 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-02 00:45:16,355 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-02 00:45:16,355 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-02 00:45:16,355 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-02 00:45:16,355 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-02 00:45:16,355 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-02 00:45:16,355 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-02 00:45:16,356 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-02 00:45:16,356 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-02 00:45:16,356 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-02 00:45:16,356 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-02 00:45:16,356 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-02 00:45:16,356 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-02 00:45:16,357 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-02 00:45:16,357 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-02 00:45:16,357 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-02 00:45:16,357 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-02 00:45:16,357 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-02 00:45:16,357 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-02 00:45:16,357 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-02 00:45:16,357 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-02 00:45:16,357 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-02 00:45:16,357 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-02 00:45:16,357 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-02 00:45:16,357 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-02 00:45:16,357 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-02 00:45:16,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:45:16,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-04-02 00:45:16,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:16,530 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 548 (Fix cropping of panel labels and float usage for shape labels) 32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-04-02 00:45:16,576 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:45:16,580 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-02 00:45:16,580 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-02 00:45:16,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:45:16,902 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:45:16,951 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:16,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:16,961 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:45:17,007 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:45:17,023 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ac40f0fd0> has no local changes
2024-04-02 00:45:17,023 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
Generated by OMERO-plugins-push#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:45:17,034 [ scc.git] DEBUG [detached HEAD f94db504] merge master -Dorg -Ssuccess-only
2024-04-02 00:45:17,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:45:17,035 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:45:17,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-02 00:45:17,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-02 00:45:18,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-02 00:45:18,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-02 00:45:19,369 [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-02 00:45:19,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-02 00:45:20,277 [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-02 00:45:20,278 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-02 00:45:20,278 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:45:20,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-02 00:45:20,279 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:20,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:20,286 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:45:20,292 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:45:20,293 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:45:20,300 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:45:20,307 [ scc.git] DEBUG Already up to date.
2024-04-02 00:45:20,308 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-02 00:45:20,741 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-02 00:45:20,741 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-02 00:45:20,748 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:45:20,748 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:20,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:20,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-02 00:45:20,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:20,770 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-02 00:45:20,807 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-02 00:45:20,808 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:45:20,811 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-02 00:45:20,811 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-02 00:45:20,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:45:20,974 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:45:21,026 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:21,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:21,034 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:45:21,082 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:45:21,090 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ac40684f0> has no local changes
2024-04-02 00:45:21,091 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:45:21,101 [ scc.git] DEBUG [detached HEAD 971ff56] merge master -Dorg -Ssuccess-only
2024-04-02 00:45:21,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:45:21,102 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:45:21,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-02 00:45:21,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-02 00:45:21,899 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-02 00:45:22,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-02 00:45:22,968 [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-02 00:45:23,483 [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-02 00:45:23,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-02 00:45:24,335 [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-02 00:45:24,336 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-02 00:45:24,336 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:45:24,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-02 00:45:24,336 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:24,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:24,346 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:45:24,355 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:45:24,355 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:45:24,363 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:45:24,371 [ scc.git] DEBUG Already up to date.
2024-04-02 00:45:24,371 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-02 00:45:24,772 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-02 00:45:24,772 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-02 00:45:24,780 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:45:24,780 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:24,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:24,789 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-02 00:45:24,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:24,811 [ 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-02 00:45:24,829 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:45:24,836 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-02 00:45:24,836 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-02 00:45:24,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:45:24,988 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:45:25,063 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:25,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:25,094 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:45:25,167 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:45:25,181 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ac405da90> has no local changes
2024-04-02 00:45:25,182 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:45:25,200 [ scc.git] DEBUG [detached HEAD 1aa7525] merge master -Dorg -Ssuccess-only
2024-04-02 00:45:25,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:45:25,202 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:45:25,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-02 00:45:25,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/468 HTTP/1.1" 200 None
2024-04-02 00:45:25,963 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-02 00:45:26,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-02 00:45:27,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-02 00:45:27,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-02 00:45:27,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-02 00:45:28,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/9f06f398570cddff1332355e1eda0fe54d88881d?per_page=1 HTTP/1.1" 200 2
2024-04-02 00:45:28,348 [ scc.repo] DEBUG - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-02 00:45:28,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-04-02 00:45:28,811 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-02 00:45:29,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-02 00:45:29,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-02 00:45:30,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-02 00:45:30,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-02 00:45:31,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/78e253cccecbd349db3bcb16514f5c8b2c4185e6?per_page=1 HTTP/1.1" 200 2
2024-04-02 00:45:31,338 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-02 00:45:31,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-02 00:45:32,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-04-02 00:45:32,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-02 00:45:33,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-02 00:45:33,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-04-02 00:45:34,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/105a9369cdb853508da5ec4e0839c6f448bf3407?per_page=1 HTTP/1.1" 200 2
2024-04-02 00:45:34,131 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-02 00:45:34,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-04-02 00:45:35,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-04-02 00:45:35,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-02 00:45:36,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-02 00:45:36,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-02 00:45:36,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-02 00:45:37,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/97542d9b749f93d4902f7dce703bbf2a04316a98?per_page=1 HTTP/1.1" 200 2
2024-04-02 00:45:37,405 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-04-02 00:45:37,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-02 00:45:38,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-02 00:45:38,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-02 00:45:39,211 [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-02 00:45:39,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-02 00:45:40,108 [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-02 00:45:40,109 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-02 00:45:40,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-04-02 00:45:41,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-04-02 00:45:41,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-02 00:45:42,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-02 00:45:42,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-02 00:45:42,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-02 00:45:43,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745?per_page=1 HTTP/1.1" 200 2
2024-04-02 00:45:43,364 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-02 00:45:43,366 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:45:43,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-02 00:45:43,366 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:43,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:43,373 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:45:43,378 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:45:43,379 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:45:43,384 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:45:43,389 [ scc.git] DEBUG Already up to date.
2024-04-02 00:45:43,389 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-04-02 00:45:43,862 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-02 00:45:43,863 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-04-02 00:45:43,870 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-02 00:45:44,315 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-02 00:45:44,315 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-02 00:45:44,326 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-04-02 00:45:44,847 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-02 00:45:44,847 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-04-02 00:45:44,853 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-02 00:45:45,596 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-02 00:45:45,596 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-02 00:45:45,605 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-04-02 00:45:46,036 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-02 00:45:46,037 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-04-02 00:45:46,050 [ scc.git] DEBUG Calling 'git fetch origin pull/468/head'
2024-04-02 00:45:46,495 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-02 00:45:46,495 [ scc.git] DEBUG * branch refs/pull/468/head -> FETCH_HEAD
2024-04-02 00:45:46,504 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:45:46,504 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:46,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:46,517 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-02 00:45:46,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:46,539 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 456 (Don't use tiles for non-big movies) 2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-02 00:45:46,582 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:45:46,586 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-04-02 00:45:46,586 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-04-02 00:45:46,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:45:46,745 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-02 00:45:46,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:46,775 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-02 00:45:46,811 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:45:46,816 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-02 00:45:46,817 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-02 00:45:46,817 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-02 00:45:47,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:45:47,150 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-02 00:45:47,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:47,173 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-02 00:45:47,276 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:45:47,284 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-04-02 00:45:47,285 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-04-02 00:45:47,285 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-04-02 00:45:47,285 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-02 00:45:47,285 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-04-02 00:45:47,285 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-04-02 00:45:47,285 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-04-02 00:45:47,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:45:47,563 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-04-02 00:45:47,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:47,583 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-04-02 00:45:47,700 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-02 00:45:47,701 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:45:47,709 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-02 00:45:47,709 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-02 00:45:47,709 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-02 00:45:47,709 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-04-02 00:45:47,709 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-02 00:45:47,709 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-04-02 00:45:47,709 [ scc.git] DEBUG 6 files changed, 283 insertions(+), 6 deletions(-)
2024-04-02 00:45:47,709 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-02 00:45:47,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:45:47,974 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-04-02 00:45:47,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:48,011 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 467 (Bump webpack-dev-middleware from 5.3.3 to 5.3.4) 78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-04-02 00:45:48,079 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:45:48,113 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-04-02 00:45:48,113 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-04-02 00:45:48,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:45:48,383 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f06f398570cddff1332355e1eda0fe54d88881d'
2024-04-02 00:45:48,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:48,447 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 468 (Bump express from 4.18.2 to 4.19.2) 9f06f398570cddff1332355e1eda0fe54d88881d'
2024-04-02 00:45:48,589 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-02 00:45:48,590 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:45:48,606 [ scc.git] DEBUG package-lock.json | 76 +++++++++++++++++++++++++++----------------------------
2024-04-02 00:45:48,606 [ scc.git] DEBUG 1 file changed, 38 insertions(+), 38 deletions(-)
2024-04-02 00:45:48,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:45:48,788 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:45:48,844 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:48,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:48,852 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:45:48,912 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:45:48,929 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ac409cf70> has no local changes
2024-04-02 00:45:48,930 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
- PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
Generated by OMERO-plugins-push#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:45:48,946 [ scc.git] DEBUG [detached HEAD 4cad670] merge master -Dorg -Ssuccess-only
2024-04-02 00:45:48,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:45:48,947 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:45:49,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-02 00:45:49,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-02 00:45:50,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-02 00:45:50,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-02 00:45:51,234 [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-02 00:45:51,699 [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-02 00:45:52,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-02 00:45:52,613 [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-02 00:45:52,614 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-02 00:45:52,615 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:45:52,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-02 00:45:52,615 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:52,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:52,624 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:45:52,631 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:45:52,631 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:45:52,638 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:45:52,646 [ scc.git] DEBUG Already up to date.
2024-04-02 00:45:52,647 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-02 00:45:53,058 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-02 00:45:53,058 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-02 00:45:53,065 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:45:53,066 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:53,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:53,074 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-02 00:45:53,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:53,095 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-02 00:45:53,107 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:45:53,110 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-02 00:45:53,110 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-02 00:45:53,110 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-02 00:45:53,110 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-02 00:45:53,110 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-02 00:45:53,110 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-02 00:45:53,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:45:53,276 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:45:53,326 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:53,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:53,335 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:45:53,378 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:45:53,387 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ac40c74c0> has no local changes
2024-04-02 00:45:53,387 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:45:53,399 [ scc.git] DEBUG [detached HEAD 3f7c643] merge master -Dorg -Ssuccess-only
2024-04-02 00:45:53,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:45:53,400 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:45:53,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-02 00:45:54,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-02 00:45:54,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-02 00:45:55,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-02 00:45:55,722 [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-02 00:45:56,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-02 00:45:56,632 [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-02 00:45:56,633 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-02 00:45:57,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-02 00:45:57,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-02 00:45:58,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-02 00:45:58,490 [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-02 00:45:58,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-02 00:45:59,391 [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-02 00:45:59,392 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-02 00:45:59,392 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:45:59,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-02 00:45:59,392 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:45:59,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:45:59,401 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:45:59,409 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:45:59,409 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:45:59,417 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:45:59,426 [ scc.git] DEBUG Already up to date.
2024-04-02 00:45:59,426 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-02 00:45:59,978 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-02 00:45:59,979 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-02 00:45:59,985 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-02 00:46:00,831 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-02 00:46:00,831 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-02 00:46:00,837 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:00,837 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:00,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:00,845 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-02 00:46:00,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:00,861 [ 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-02 00:46:00,925 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-02 00:46:00,925 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-02 00:46:00,925 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-02 00:46:00,925 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-02 00:46:00,926 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-02 00:46:00,927 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-02 00:46:00,936 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-02 00:46:00,949 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-02 00:46:01,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:01,096 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-02 00:46:01,108 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-02 00:46:01,118 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#19](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-04-02 00:46:01,126 [ scc.config] DEBUG Found github.token
2024-04-02 00:46:01,126 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-02 00:46:01,126 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-02 00:46:01,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:01,142 [ 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-02 00:46:01,192 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-02 00:46:01,192 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-02 00:46:01,192 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-02 00:46:01,192 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-02 00:46:01,193 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-02 00:46:01,202 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-02 00:46:01,215 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-02 00:46:01,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:01,513 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-02 00:46:01,521 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-02 00:46:01,526 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#19](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/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-02 00:46:01,538 [ scc.config] DEBUG Found github.token
2024-04-02 00:46:01,538 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-02 00:46:01,538 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:01,583 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:01,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:01,592 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:01,643 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:01,652 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ac40b9eb0> has no local changes
2024-04-02 00:46:01,653 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:01,665 [ scc.git] DEBUG [detached HEAD f57870e] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:01,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:01,666 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:02,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-02 00:46:02,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-02 00:46:02,553 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-02 00:46:03,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-02 00:46:03,612 [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-02 00:46:04,097 [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-02 00:46:04,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-02 00:46:04,958 [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-02 00:46:04,959 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-02 00:46:05,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-02 00:46:05,406 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-02 00:46:05,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-02 00:46:06,457 [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-02 00:46:06,909 [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-02 00:46:07,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-02 00:46:07,801 [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-02 00:46:07,802 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-02 00:46:08,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-02 00:46:08,265 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-02 00:46:08,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-02 00:46:09,309 [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-02 00:46:09,822 [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-02 00:46:10,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-02 00:46:10,786 [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-02 00:46:10,787 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-02 00:46:11,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-02 00:46:11,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-02 00:46:12,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-02 00:46:12,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-02 00:46:13,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-02 00:46:13,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-02 00:46:13,600 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:13,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-02 00:46:13,600 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:13,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:13,607 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:46:13,614 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:13,614 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:46:13,623 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:46:13,631 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:13,632 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-02 00:46:14,028 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-02 00:46:14,028 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-02 00:46:14,033 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-02 00:46:14,435 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-02 00:46:14,435 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-02 00:46:14,441 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-02 00:46:14,864 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-02 00:46:14,865 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-02 00:46:14,871 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:14,871 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:14,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:14,878 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-02 00:46:14,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:14,890 [ 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-02 00:46:14,901 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:46:14,904 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-02 00:46:14,904 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-02 00:46:15,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:15,060 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-02 00:46:15,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:15,075 [ 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-02 00:46:15,133 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-02 00:46:15,134 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:46:15,138 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-02 00:46:15,138 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-02 00:46:15,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:15,467 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-02 00:46:15,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:15,484 [ 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-02 00:46:15,513 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-02 00:46:15,514 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:46:15,518 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-02 00:46:15,518 [ scc.git] DEBUG package.json | 2 +-
2024-04-02 00:46:15,518 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-02 00:46:15,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:15,882 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:15,930 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:15,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:15,942 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:15,993 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:16,003 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5abc7bcf40> has no local changes
2024-04-02 00:46:16,004 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:16,016 [ scc.git] DEBUG [detached HEAD e013955] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:16,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:16,017 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:16,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-02 00:46:16,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-02 00:46:17,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-02 00:46:17,823 [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-02 00:46:18,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-02 00:46:18,718 [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-02 00:46:18,719 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-02 00:46:18,719 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:18,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-02 00:46:18,719 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:18,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:18,727 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:46:18,735 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:18,736 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:46:18,743 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:46:18,752 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:18,752 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-02 00:46:19,148 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-02 00:46:19,149 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-02 00:46:19,154 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:19,154 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:19,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:19,161 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-02 00:46:19,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:19,174 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-02 00:46:19,197 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:46:19,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:19,360 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:19,404 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:19,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:19,410 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:19,450 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:19,456 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ac4008100> has no local changes
2024-04-02 00:46:19,456 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:19,465 [ scc.git] DEBUG [detached HEAD 104cf37] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:19,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:19,465 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:19,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-02 00:46:20,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-02 00:46:20,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-02 00:46:21,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-02 00:46:21,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-02 00:46:22,275 [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-02 00:46:22,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-02 00:46:23,123 [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-02 00:46:23,124 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-02 00:46:23,124 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:23,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-02 00:46:23,124 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:23,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:23,132 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:46:23,137 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:23,137 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:46:23,143 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:46:23,148 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:23,149 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-02 00:46:23,626 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-02 00:46:23,626 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-02 00:46:23,633 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:23,633 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:23,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:23,642 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-02 00:46:23,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:23,659 [ 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-02 00:46:23,671 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-02 00:46:23,672 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:46:23,675 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-02 00:46:23,675 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-02 00:46:23,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:23,825 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:23,878 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:23,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:23,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:23,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:23,936 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ac4035580> has no local changes
2024-04-02 00:46:23,936 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:23,946 [ scc.git] DEBUG [detached HEAD 52ab74d] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:23,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:23,947 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:24,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-02 00:46:24,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-02 00:46:25,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-02 00:46:25,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-02 00:46:26,215 [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-02 00:46:26,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-02 00:46:27,071 [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-02 00:46:27,072 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-02 00:46:27,073 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:27,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-02 00:46:27,073 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:27,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:27,082 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:46:27,090 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:27,090 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:46:27,098 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:46:27,106 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:27,106 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-02 00:46:27,525 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-02 00:46:27,525 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-02 00:46:27,532 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:27,532 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:27,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:27,540 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-02 00:46:27,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:27,558 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-02 00:46:27,635 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-02 00:46:27,635 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-02 00:46:27,636 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-02 00:46:27,636 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-02 00:46:27,636 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-02 00:46:27,636 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-02 00:46:27,636 [ scc.git] DEBUG Auto-merging setup.py
2024-04-02 00:46:27,636 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-02 00:46:27,636 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-02 00:46:27,636 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-02 00:46:27,645 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-02 00:46:27,656 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-02 00:46:27,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:27,816 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-02 00:46:27,823 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-02 00:46:27,830 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#19](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2024-04-02 00:46:27,836 [ scc.config] DEBUG Found github.token
2024-04-02 00:46:27,836 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-02 00:46:27,837 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:27,878 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:27,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:27,885 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:27,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:27,936 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ac4008910> has no local changes
2024-04-02 00:46:27,936 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:27,946 [ scc.git] DEBUG [detached HEAD e164693] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:27,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:27,946 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:28,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-02 00:46:28,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-02 00:46:29,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-02 00:46:29,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-02 00:46:30,116 [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-02 00:46:30,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-02 00:46:30,961 [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-02 00:46:30,962 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-02 00:46:30,962 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:30,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-02 00:46:30,962 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:30,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:30,971 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:46:30,977 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:30,977 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:46:30,984 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:46:30,991 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:30,992 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-02 00:46:31,474 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-02 00:46:31,474 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-02 00:46:31,479 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:31,480 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:31,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:31,486 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-02 00:46:31,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:31,501 [ 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-02 00:46:31,529 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-02 00:46:31,533 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-02 00:46:31,533 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-02 00:46:31,533 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-02 00:46:31,533 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-02 00:46:31,533 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-02 00:46:31,533 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-02 00:46:31,534 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-02 00:46:31,536 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-02 00:46:31,536 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-02 00:46:31,536 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-02 00:46:31,537 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-02 00:46:31,537 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-02 00:46:31,537 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-02 00:46:31,537 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-02 00:46:31,537 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-02 00:46:31,537 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-02 00:46:31,537 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-02 00:46:31,537 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-02 00:46:31,537 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-02 00:46:31,537 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-02 00:46:31,537 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-02 00:46:31,537 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-02 00:46:31,538 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-02 00:46:31,538 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-02 00:46:31,538 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-02 00:46:31,538 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-02 00:46:31,538 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-02 00:46:31,538 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-02 00:46:31,538 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-02 00:46:31,538 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-02 00:46:31,538 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-02 00:46:31,538 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-02 00:46:31,538 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-02 00:46:31,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:31,803 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:31,848 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:31,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:31,855 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:31,898 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:31,905 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5abc7bc3a0> has no local changes
2024-04-02 00:46:31,906 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:31,924 [ scc.git] DEBUG [detached HEAD a6754db] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:31,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:31,924 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:32,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-02 00:46:32,226 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:32,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-02 00:46:32,226 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:32,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:32,233 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:46:32,239 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:32,239 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:46:32,246 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:46:32,253 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:32,253 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:32,253 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:32,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:32,259 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:32,302 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:32,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:32,309 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:32,351 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:32,358 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ac4009fd0> has no local changes
2024-04-02 00:46:32,358 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:32,367 [ scc.git] DEBUG [detached HEAD 6a98966] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:32,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:32,367 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:32,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-02 00:46:32,642 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:32,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-02 00:46:32,643 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:32,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:32,649 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:46:32,655 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:32,655 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:46:32,662 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:46:32,670 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:32,670 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:32,670 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:32,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:32,677 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:32,724 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:32,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:32,730 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:32,775 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:32,781 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5abc7c7f40> has no local changes
2024-04-02 00:46:32,782 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:32,805 [ scc.git] DEBUG [detached HEAD 947c1a3] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:32,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:32,806 [ scc.git] INFO Overriding base-branch from master to main
2024-04-02 00:46:32,806 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:33,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-02 00:46:33,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-02 00:46:34,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-02 00:46:34,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-02 00:46:35,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-02 00:46:35,504 [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-02 00:46:35,953 [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-02 00:46:36,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-02 00:46:36,790 [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-02 00:46:36,791 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-02 00:46:36,791 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:36,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-02 00:46:36,792 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:36,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:36,802 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-02 00:46:36,810 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:36,811 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-02 00:46:36,821 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-02 00:46:36,833 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:36,833 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-02 00:46:37,336 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-02 00:46:37,336 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-02 00:46:37,346 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:37,346 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:37,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:37,358 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-02 00:46:37,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:37,376 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-02 00:46:37,420 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-02 00:46:37,421 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-02 00:46:37,421 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-02 00:46:37,421 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-02 00:46:37,430 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-02 00:46:37,442 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-02 00:46:37,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:37,686 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-02 00:46:37,696 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-02 00:46:37,702 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#19](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-02 00:46:37,707 [ scc.config] DEBUG Found github.token
2024-04-02 00:46:37,708 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-02 00:46:37,708 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:37,748 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:37,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:37,754 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:37,794 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:37,801 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5abc747fa0> has no local changes
2024-04-02 00:46:37,801 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:37,812 [ scc.git] DEBUG [detached HEAD 06d1a14] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:37,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:37,812 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:38,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-02 00:46:38,120 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:38,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-02 00:46:38,121 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:38,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:38,129 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:46:38,137 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:38,137 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:46:38,147 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:46:38,156 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:38,156 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:38,156 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:38,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:38,163 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:38,223 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:38,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:38,231 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:38,276 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:38,283 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5abc7d0be0> has no local changes
2024-04-02 00:46:38,283 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:38,292 [ scc.git] DEBUG [detached HEAD c88156e] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:38,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:38,293 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:38,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-02 00:46:38,540 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:38,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-02 00:46:38,540 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:38,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:38,546 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:46:38,552 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:38,553 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:46:38,559 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:46:38,565 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:38,565 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:38,565 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:38,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:38,571 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:38,615 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:38,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:38,621 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:38,672 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:38,680 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5abc75b550> has no local changes
2024-04-02 00:46:38,681 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:38,691 [ scc.git] DEBUG [detached HEAD d80f662] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:38,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:38,692 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:39,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-02 00:46:39,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-02 00:46:39,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-02 00:46:40,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-02 00:46:40,858 [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-02 00:46:41,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-02 00:46:41,732 [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-02 00:46:41,733 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-02 00:46:41,733 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:41,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-02 00:46:41,733 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:41,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:41,740 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-02 00:46:41,745 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:41,745 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-02 00:46:41,750 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-02 00:46:41,756 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:41,756 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-02 00:46:42,182 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-02 00:46:42,182 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-02 00:46:42,190 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:42,190 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:42,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:42,198 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-02 00:46:42,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:42,217 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-02 00:46:42,248 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-02 00:46:42,249 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-02 00:46:42,249 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-02 00:46:42,249 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-02 00:46:42,258 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-02 00:46:42,268 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-02 00:46:42,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:42,434 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-02 00:46:42,441 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-02 00:46:42,449 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#19](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-02 00:46:42,459 [ scc.config] DEBUG Found github.token
2024-04-02 00:46:42,459 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-02 00:46:42,460 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:42,515 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:42,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:42,523 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:42,575 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:42,584 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5abc776d30> has no local changes
2024-04-02 00:46:42,585 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:42,595 [ scc.git] DEBUG [detached HEAD f1f4914] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:42,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:42,596 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-02 00:46:42,596 [ scc.repo] DEBUG ## PRs found:
2024-04-02 00:46:42,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-02 00:46:43,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-02 00:46:43,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-02 00:46:44,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-02 00:46:44,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-02 00:46:45,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-02 00:46:45,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-02 00:46:46,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-02 00:46:46,649 [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-02 00:46:47,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-02 00:46:47,500 [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-02 00:46:47,501 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-02 00:46:47,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-02 00:46:48,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-02 00:46:48,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-02 00:46:49,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-02 00:46:49,402 [ scc.repo] DEBUG ## Branches found:
2024-04-02 00:46:49,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-02 00:46:49,402 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:49,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:49,409 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-02 00:46:49,414 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-02 00:46:49,414 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-02 00:46:49,419 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-02 00:46:49,424 [ scc.git] DEBUG Already up to date.
2024-04-02 00:46:49,425 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-02 00:46:49,837 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-02 00:46:49,837 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-02 00:46:49,843 [ scc.git] DEBUG ## Unique users: []
2024-04-02 00:46:49,843 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:49,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:49,849 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-02 00:46:49,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:49,860 [ 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-02 00:46:49,889 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-02 00:46:49,889 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-02 00:46:49,889 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-02 00:46:49,890 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-02 00:46:49,896 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-02 00:46:49,901 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-02 00:46:50,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:50,060 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-02 00:46:50,069 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-02 00:46:50,076 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#19](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-02 00:46:50,081 [ scc.config] DEBUG Found github.token
2024-04-02 00:46:50,082 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-02 00:46:50,082 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-02 00:46:50,122 [ scc.git] DEBUG Get sha1 of %s
2024-04-02 00:46:50,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-02 00:46:50,127 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:50,167 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:50,176 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5abc76b910> has no local changes
2024-04-02 00:46:50,176 [ 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#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:50,192 [ scc.git] DEBUG [detached HEAD a15c212] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:50,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:50,193 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-02 00:46:50,270 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-02 00:46:50,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:50,468 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-02 00:46:50,473 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-02 00:46:50,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:50,887 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-02 00:46:50,895 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-02 00:46:51,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:51,286 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-02 00:46:51,292 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-02 00:46:51,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:51,702 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-02 00:46:52,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:52,102 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-02 00:46:52,108 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-02 00:46:52,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:52,520 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-02 00:46:52,528 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-02 00:46:52,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:52,926 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-02 00:46:52,933 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-02 00:46:53,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:53,330 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-02 00:46:53,335 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-02 00:46:53,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:53,728 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-02 00:46:53,733 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-02 00:46:54,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:54,132 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-02 00:46:54,137 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-02 00:46:54,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:54,541 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-02 00:46:54,545 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-02 00:46:54,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:54,945 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-02 00:46:54,949 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-02 00:46:55,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:55,359 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-02 00:46:55,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:55,771 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-02 00:46:56,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:56,170 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-02 00:46:56,174 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-02 00:46:56,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:56,577 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-02 00:46:56,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:57,003 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-02 00:46:57,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:57,392 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-02 00:46:57,396 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-02 00:46:57,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:57,812 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-02 00:46:57,818 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-02 00:46:58,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:58,217 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-02 00:46:58,221 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-02 00:46:58,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:58,641 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-02 00:46:58,645 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-02 00:46:59,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-02 00:46:59,049 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-02 00:46:59,049 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-02 00:46:59,156 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ac49bbb20> has local changes
2024-04-02 00:46:59,157 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
- PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#19 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/19/)'
2024-04-02 00:46:59,172 [ scc.git] DEBUG [detached HEAD ea85c08] merge master -Dorg -Ssuccess-only
2024-04-02 00:46:59,172 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-02 00:46:59,172 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-02 00:46:59,172 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,172 [ scc.merge] INFO
2024-04-02 00:46:59,172 [ scc.merge] INFO
2024-04-02 00:46:59,172 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-02 00:46:59,172 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,172 [ scc.merge] INFO
2024-04-02 00:46:59,173 [ scc.merge] INFO
2024-04-02 00:46:59,173 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-02 00:46:59,173 [ scc.merge] INFO Excluded PRs:
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-02 00:46:59,173 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,173 [ scc.merge] INFO
2024-04-02 00:46:59,173 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-02 00:46:59,173 [ scc.merge] INFO
2024-04-02 00:46:59,173 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-02 00:46:59,173 [ scc.merge] INFO Excluded PRs:
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-02 00:46:59,173 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,173 [ scc.merge] INFO
2024-04-02 00:46:59,173 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-02 00:46:59,173 [ scc.merge] INFO
2024-04-02 00:46:59,173 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-02 00:46:59,173 [ scc.merge] INFO Excluded PRs:
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-02 00:46:59,173 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,173 [ scc.merge] INFO
2024-04-02 00:46:59,173 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-02 00:46:59,173 [ scc.merge] INFO
2024-04-02 00:46:59,173 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-02 00:46:59,173 [ scc.merge] INFO
2024-04-02 00:46:59,173 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-02 00:46:59,173 [ scc.merge] INFO Excluded PRs:
2024-04-02 00:46:59,173 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-02 00:46:59,173 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,173 [ scc.merge] INFO
2024-04-02 00:46:59,174 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-04-02 00:46:59,174 [ scc.merge] INFO
2024-04-02 00:46:59,174 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-02 00:46:59,174 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,174 [ scc.merge] INFO
2024-04-02 00:46:59,174 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-02 00:46:59,174 [ scc.merge] INFO
2024-04-02 00:46:59,174 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-02 00:46:59,174 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,174 [ scc.merge] INFO
2024-04-02 00:46:59,174 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-02 00:46:59,174 [ scc.merge] INFO
2024-04-02 00:46:59,174 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-02 00:46:59,174 [ scc.merge] INFO Excluded PRs:
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-02 00:46:59,174 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,174 [ scc.merge] INFO
2024-04-02 00:46:59,174 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-02 00:46:59,174 [ scc.merge] INFO
2024-04-02 00:46:59,174 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-02 00:46:59,174 [ scc.merge] INFO Excluded PRs:
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-02 00:46:59,174 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,174 [ scc.merge] INFO
2024-04-02 00:46:59,174 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,174 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-02 00:46:59,174 [ scc.merge] INFO
2024-04-02 00:46:59,175 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-02 00:46:59,175 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,175 [ scc.merge] INFO
2024-04-02 00:46:59,175 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-02 00:46:59,175 [ scc.merge] INFO
2024-04-02 00:46:59,175 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-02 00:46:59,175 [ scc.merge] INFO Excluded PRs:
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-02 00:46:59,175 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,175 [ scc.merge] INFO
2024-04-02 00:46:59,175 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-02 00:46:59,175 [ scc.merge] INFO
2024-04-02 00:46:59,175 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-02 00:46:59,175 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,175 [ scc.merge] INFO
2024-04-02 00:46:59,175 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-02 00:46:59,175 [ scc.merge] INFO
2024-04-02 00:46:59,175 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-02 00:46:59,175 [ scc.merge] INFO Excluded PRs:
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-02 00:46:59,175 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,175 [ scc.merge] INFO
2024-04-02 00:46:59,175 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-02 00:46:59,175 [ scc.merge] INFO
2024-04-02 00:46:59,175 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-02 00:46:59,175 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,175 [ scc.merge] INFO
2024-04-02 00:46:59,175 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-02 00:46:59,175 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-02 00:46:59,175 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-02 00:46:59,176 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO Merged PRs:
2024-04-02 00:46:59,176 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-02 00:46:59,176 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-02 00:46:59,176 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-02 00:46:59,176 [ scc.merge] INFO Excluded PRs:
2024-04-02 00:46:59,176 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-02 00:46:59,176 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-02 00:46:59,176 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-02 00:46:59,176 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-02 00:46:59,176 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-02 00:46:59,176 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-02 00:46:59,176 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-02 00:46:59,176 [ scc.merge] INFO
2024-04-02 00:46:59,176 [ scc.merge] INFO Repository: ome/scripts
2024-04-02 00:46:59,176 [ scc.merge] INFO Excluded PRs:
2024-04-02 00:46:59,176 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-02 00:46:59,177 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-02 00:46:59,177 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-02 00:46:59,177 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-02 00:46:59,177 [ scc.merge] INFO Already up to date.
2024-04-02 00:46:59,177 [ scc.merge] INFO
2024-04-02 00:46:59,177 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-02 00:46:59,177 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-02 00:46:59,177 [ scc.merge] INFO
2024-04-02 00:46:59,177 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-02 00:46:59,177 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-02 00:46:59,183 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,188 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,188 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-02 00:46:59,188 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-02 00:46:59,193 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-02 00:46:59,198 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-02 00:46:59,203 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-02 00:46:59,208 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-02 00:46:59,212 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-02 00:46:59,217 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-02 00:46:59,222 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-02 00:46:59,227 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-02 00:46:59,232 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-02 00:46:59,236 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-02 00:46:59,241 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-02 00:46:59,246 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-02 00:46:59,251 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-02 00:46:59,256 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-02 00:46:59,261 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,265 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,265 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-02 00:46:59,265 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-02 00:46:59,270 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-02 00:46:59,275 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-02 00:46:59,279 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-02 00:46:59,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-02 00:46:59,284 [ scc.git] DEBUG Calling 'git remote'
2024-04-02 00:46:59,288 [ 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 d2d6f99] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 3b7ccfa8
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a232ed0
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 2078ac7
nothing to commit, working tree clean
[detached HEAD f597883] 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-02 00:47:45,268 [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-02 00:47:54,187 [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-02 00:47:56,562 [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-02 00:48:01,069 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-02 00:48:49,208 [ 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}
