Skipping 118 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-03-24 00:41:57,415 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-03-24 00:41:57,416 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-03-24 00:41:57,416 [ scc.git] DEBUG create mode 100644 src/.env
2024-03-24 00:41:57,416 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-03-24 00:41:57,416 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-03-24 00:41:57,416 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/index.html
2024-03-24 00:41:57,417 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-03-24 00:41:57,417 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-03-24 00:41:57,417 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-03-24 00:41:57,417 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-03-24 00:41:57,418 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-03-24 00:41:57,418 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-03-24 00:41:57,418 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-03-24 00:41:57,418 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-03-24 00:41:57,418 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-03-24 00:41:57,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:41:57,576 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-24 00:41:57,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:41:57,589 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 548 (Fix cropping of panel labels and float usage for shape labels) 32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-24 00:41:57,632 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:41:57,636 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-03-24 00:41:57,636 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-03-24 00:41:57,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:41:57,977 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:41:58,020 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:41:58,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:41:58,026 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:41:58,065 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:41:58,095 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efd6a9bb0> has no local changes
2024-03-24 00:41:58,095 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:41:58,105 [ scc.git] DEBUG [detached HEAD bb44f650] merge master -Dorg -Ssuccess-only
2024-03-24 00:41:58,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:41:58,106 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:41:58,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-03-24 00:41:58,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-03-24 00:41:59,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-03-24 00:41:59,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-24 00:42:00,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:00,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-24 00:42:01,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:01,181 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-03-24 00:42:01,181 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:42:01,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-24 00:42:01,182 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:01,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:01,188 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:42:01,193 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:42:01,194 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:42:01,200 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:42:01,207 [ scc.git] DEBUG Already up to date.
2024-03-24 00:42:01,207 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-03-24 00:42:01,635 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-03-24 00:42:01,635 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-03-24 00:42:01,640 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:42:01,640 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:01,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:01,645 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-24 00:42:01,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:01,655 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-24 00:42:01,692 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-03-24 00:42:01,693 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:01,696 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-03-24 00:42:01,696 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-03-24 00:42:01,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:01,855 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:42:01,898 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:01,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:01,903 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:42:01,944 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:42:01,951 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efe70c430> has no local changes
2024-03-24 00:42:01,951 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:42:01,961 [ scc.git] DEBUG [detached HEAD 40dd575] merge master -Dorg -Ssuccess-only
2024-03-24 00:42:01,961 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:42:01,961 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:42:02,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-03-24 00:42:02,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-03-24 00:42:02,842 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-24 00:42:03,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-24 00:42:03,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:04,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-24 00:42:04,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-24 00:42:05,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:05,281 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-24 00:42:05,281 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:42:05,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-24 00:42:05,281 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:05,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:05,287 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:42:05,292 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:42:05,292 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:42:05,296 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:42:05,302 [ scc.git] DEBUG Already up to date.
2024-03-24 00:42:05,302 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-03-24 00:42:05,697 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-03-24 00:42:05,698 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-03-24 00:42:05,702 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:42:05,702 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:05,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:05,707 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-03-24 00:42:05,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:05,717 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-03-24 00:42:05,728 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:05,732 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-03-24 00:42:05,732 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-03-24 00:42:05,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:05,897 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:42:05,939 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:05,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:05,945 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:42:05,985 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:42:05,993 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efd6985e0> has no local changes
2024-03-24 00:42:05,993 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:42:06,003 [ scc.git] DEBUG [detached HEAD 6c96875] merge master -Dorg -Ssuccess-only
2024-03-24 00:42:06,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:42:06,004 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:42:06,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-03-24 00:42:06,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-03-24 00:42:06,849 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-24 00:42:07,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-24 00:42:07,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:08,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-24 00:42:08,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-24 00:42:09,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/78e253cccecbd349db3bcb16514f5c8b2c4185e6?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:09,274 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-24 00:42:09,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-03-24 00:42:10,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061 HTTP/1.1" 200 None
2024-03-24 00:42:10,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:11,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-24 00:42:11,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061 HTTP/1.1" 200 None
2024-03-24 00:42:12,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/9f22ba44a88528bde6fa49c5bab1736ee00e9061?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:12,040 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-03-24 00:42:12,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-03-24 00:42:12,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-03-24 00:42:13,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-24 00:42:13,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:14,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-24 00:42:14,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-24 00:42:15,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/97542d9b749f93d4902f7dce703bbf2a04316a98?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:15,296 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-03-24 00:42:15,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-03-24 00:42:16,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-03-24 00:42:16,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-24 00:42:17,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:17,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-24 00:42:18,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:18,102 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-03-24 00:42:18,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-03-24 00:42:19,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-03-24 00:42:19,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-24 00:42:20,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:20,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-24 00:42:20,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-24 00:42:21,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:21,316 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-24 00:42:21,316 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:42:21,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-24 00:42:21,316 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:21,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:21,331 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:42:21,337 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:42:21,337 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:42:21,343 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:42:21,349 [ scc.git] DEBUG Already up to date.
2024-03-24 00:42:21,349 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-03-24 00:42:21,817 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-24 00:42:21,818 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-03-24 00:42:21,823 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-03-24 00:42:22,230 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-24 00:42:22,230 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-03-24 00:42:22,235 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-03-24 00:42:22,750 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-24 00:42:22,751 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-03-24 00:42:22,755 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-03-24 00:42:23,519 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-24 00:42:23,519 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-03-24 00:42:23,524 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-03-24 00:42:23,946 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-24 00:42:23,946 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-03-24 00:42:23,950 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:42:23,951 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:23,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:23,956 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-03-24 00:42:23,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:23,967 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 456 (Don't use tiles for non-big movies) 2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-03-24 00:42:23,993 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:23,996 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-03-24 00:42:23,996 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-03-24 00:42:24,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:24,154 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-24 00:42:24,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:24,165 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-24 00:42:24,233 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:24,237 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-03-24 00:42:24,237 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-03-24 00:42:24,237 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-03-24 00:42:24,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:24,561 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-24 00:42:24,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:24,574 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-24 00:42:24,619 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:24,624 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-03-24 00:42:24,624 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-03-24 00:42:24,624 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-03-24 00:42:24,625 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-03-24 00:42:24,625 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-03-24 00:42:24,625 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-03-24 00:42:24,625 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-03-24 00:42:24,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:24,976 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f22ba44a88528bde6fa49c5bab1736ee00e9061'
2024-03-24 00:42:24,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:24,989 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 9f22ba44a88528bde6fa49c5bab1736ee00e9061'
2024-03-24 00:42:25,081 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-03-24 00:42:25,082 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:25,086 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 7 +-
2024-03-24 00:42:25,086 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-03-24 00:42:25,086 [ scc.git] DEBUG src/app/header.html | 5 ++
2024-03-24 00:42:25,086 [ scc.git] DEBUG src/app/header.js | 45 +++++++++-
2024-03-24 00:42:25,086 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-03-24 00:42:25,086 [ scc.git] DEBUG src/utils/figure.js | 203 ++++++++++++++++++++++++++++++++++++++++++
2024-03-24 00:42:25,086 [ scc.git] DEBUG 6 files changed, 269 insertions(+), 3 deletions(-)
2024-03-24 00:42:25,086 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-03-24 00:42:25,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:25,389 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-24 00:42:25,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:25,401 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 467 (Bump webpack-dev-middleware from 5.3.3 to 5.3.4) 78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-24 00:42:25,418 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:25,444 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-03-24 00:42:25,444 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-03-24 00:42:25,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:25,793 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:42:25,835 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:25,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:25,844 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:42:25,891 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:42:25,903 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efd6bd4f0> has no local changes
2024-03-24 00:42:25,904 [ 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'
Generated by OMERO-plugins-push#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:42:25,932 [ scc.git] DEBUG [detached HEAD c86bf6c] merge master -Dorg -Ssuccess-only
2024-03-24 00:42:25,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:42:25,933 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:42:26,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-03-24 00:42:26,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-03-24 00:42:27,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-03-24 00:42:27,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-24 00:42:28,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:28,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-24 00:42:29,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-24 00:42:29,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:29,554 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-03-24 00:42:29,554 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:42:29,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-24 00:42:29,554 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:29,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:29,560 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:42:29,566 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:42:29,566 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:42:29,572 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:42:29,578 [ scc.git] DEBUG Already up to date.
2024-03-24 00:42:29,578 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-03-24 00:42:30,002 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-03-24 00:42:30,002 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-03-24 00:42:30,007 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:42:30,007 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:30,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:30,012 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-24 00:42:30,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:30,022 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-24 00:42:30,032 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:30,035 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-03-24 00:42:30,035 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-03-24 00:42:30,035 [ scc.git] DEBUG requirements.txt | 2 +-
2024-03-24 00:42:30,036 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-03-24 00:42:30,036 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-03-24 00:42:30,036 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-03-24 00:42:30,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:30,201 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:42:30,241 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:30,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:30,247 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:42:30,288 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:42:30,295 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efc671ac0> has no local changes
2024-03-24 00:42:30,295 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:42:30,305 [ scc.git] DEBUG [detached HEAD 0bd20af] merge master -Dorg -Ssuccess-only
2024-03-24 00:42:30,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:42:30,306 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:42:30,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-03-24 00:42:31,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-03-24 00:42:31,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-03-24 00:42:32,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-24 00:42:32,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:33,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-24 00:42:33,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-24 00:42:34,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:34,077 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-24 00:42:34,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-03-24 00:42:34,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-03-24 00:42:35,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-24 00:42:35,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:36,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-24 00:42:36,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:36,825 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-24 00:42:36,825 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:42:36,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-24 00:42:36,825 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:36,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:36,832 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:42:36,838 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:42:36,838 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:42:36,844 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:42:36,850 [ scc.git] DEBUG Already up to date.
2024-03-24 00:42:36,850 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-03-24 00:42:37,477 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-24 00:42:37,477 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-03-24 00:42:37,482 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-03-24 00:42:38,055 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-24 00:42:38,055 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-03-24 00:42:38,060 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:42:38,060 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:38,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:38,067 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-24 00:42:38,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:38,080 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-24 00:42:38,179 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-03-24 00:42:38,179 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-03-24 00:42:38,179 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-24 00:42:38,179 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-24 00:42:38,180 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-24 00:42:38,180 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-24 00:42:38,187 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-24 00:42:38,194 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-24 00:42:38,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:38,348 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-24 00:42:38,356 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-24 00:42:38,363 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#9](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-03-24 00:42:38,367 [ scc.config] DEBUG Found github.token
2024-03-24 00:42:38,368 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-03-24 00:42:38,368 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-24 00:42:38,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:38,380 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-24 00:42:38,412 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-24 00:42:38,412 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-24 00:42:38,412 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-03-24 00:42:38,412 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-24 00:42:38,413 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-24 00:42:38,420 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-24 00:42:38,427 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-24 00:42:38,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:38,756 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-24 00:42:38,763 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-24 00:42:38,769 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#9](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-03-24 00:42:38,774 [ scc.config] DEBUG Found github.token
2024-03-24 00:42:38,775 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-03-24 00:42:38,775 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:42:38,818 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:38,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:38,824 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:42:38,863 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:42:38,870 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efd68b5b0> has no local changes
2024-03-24 00:42:38,870 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:42:38,879 [ scc.git] DEBUG [detached HEAD e0031d5] merge master -Dorg -Ssuccess-only
2024-03-24 00:42:38,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:42:38,879 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:42:39,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-03-24 00:42:39,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-03-24 00:42:39,769 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-24 00:42:40,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-24 00:42:40,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:41,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-24 00:42:41,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-24 00:42:42,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:42,142 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-24 00:42:42,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-03-24 00:42:42,606 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-24 00:42:43,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-24 00:42:43,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:44,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-24 00:42:44,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-24 00:42:45,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:45,021 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-24 00:42:45,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-03-24 00:42:45,476 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-24 00:42:46,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-24 00:42:46,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:47,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-24 00:42:47,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-24 00:42:48,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:48,062 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-24 00:42:48,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-03-24 00:42:49,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-03-24 00:42:49,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-03-24 00:42:49,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-03-24 00:42:50,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-03-24 00:42:50,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-03-24 00:42:50,901 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:42:50,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-24 00:42:50,901 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:50,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:50,907 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:42:50,913 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:42:50,913 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:42:50,920 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:42:50,927 [ scc.git] DEBUG Already up to date.
2024-03-24 00:42:50,927 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-03-24 00:42:51,319 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-24 00:42:51,319 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-03-24 00:42:51,325 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-03-24 00:42:51,727 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-24 00:42:51,727 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-03-24 00:42:51,732 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-03-24 00:42:52,126 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-24 00:42:52,126 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-03-24 00:42:52,130 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:42:52,130 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:52,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:52,136 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-03-24 00:42:52,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:52,148 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-03-24 00:42:52,158 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:52,161 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-03-24 00:42:52,161 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-03-24 00:42:52,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:52,317 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-03-24 00:42:52,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:52,328 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-03-24 00:42:52,366 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-24 00:42:52,366 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:52,369 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-03-24 00:42:52,369 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-03-24 00:42:52,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:52,714 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-03-24 00:42:52,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:52,728 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-03-24 00:42:52,757 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-24 00:42:52,758 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:52,762 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-03-24 00:42:52,762 [ scc.git] DEBUG package.json | 2 +-
2024-03-24 00:42:52,762 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-03-24 00:42:53,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:53,114 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:42:53,158 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:53,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:53,163 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:42:53,205 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:42:53,212 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efe6f8e50> has no local changes
2024-03-24 00:42:53,213 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:42:53,222 [ scc.git] DEBUG [detached HEAD 4a866aa] merge master -Dorg -Ssuccess-only
2024-03-24 00:42:53,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:42:53,223 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:42:53,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-03-24 00:42:54,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-03-24 00:42:54,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-24 00:42:55,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:55,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-24 00:42:55,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:42:55,899 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-03-24 00:42:55,900 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:42:55,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-24 00:42:55,900 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:55,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:55,906 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:42:55,910 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:42:55,911 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:42:55,916 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:42:55,921 [ scc.git] DEBUG Already up to date.
2024-03-24 00:42:55,921 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-24 00:42:56,322 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-03-24 00:42:56,322 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-24 00:42:56,327 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:42:56,327 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:56,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:56,333 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-24 00:42:56,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:56,342 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-24 00:42:56,350 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:42:56,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:42:56,535 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:42:56,576 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:42:56,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:42:56,581 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:42:56,619 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:42:56,625 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efd6a4fd0> has no local changes
2024-03-24 00:42:56,626 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Generated by OMERO-plugins-push#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:42:56,633 [ scc.git] DEBUG [detached HEAD 3a8effa] merge master -Dorg -Ssuccess-only
2024-03-24 00:42:56,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:42:56,634 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:42:57,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-03-24 00:42:57,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-03-24 00:42:57,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-03-24 00:42:58,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-03-24 00:42:58,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-24 00:42:59,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:42:59,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-24 00:43:00,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:43:00,239 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-24 00:43:00,239 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:43:00,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-24 00:43:00,240 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:00,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:00,245 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:43:00,251 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:43:00,251 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:43:00,257 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:43:00,263 [ scc.git] DEBUG Already up to date.
2024-03-24 00:43:00,264 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-03-24 00:43:00,819 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-03-24 00:43:00,819 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-03-24 00:43:00,823 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:43:00,824 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:00,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:00,830 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-03-24 00:43:00,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:00,840 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-03-24 00:43:00,869 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-03-24 00:43:00,870 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:43:00,873 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-03-24 00:43:00,873 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-03-24 00:43:01,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:01,071 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:43:01,110 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:01,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:01,116 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:43:01,155 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:43:01,161 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efc62c5b0> has no local changes
2024-03-24 00:43:01,161 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:43:01,169 [ scc.git] DEBUG [detached HEAD 0604505] merge master -Dorg -Ssuccess-only
2024-03-24 00:43:01,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:01,170 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:43:01,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-03-24 00:43:02,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-03-24 00:43:02,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-03-24 00:43:02,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-24 00:43:03,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:43:03,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-24 00:43:04,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:43:04,272 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-24 00:43:04,273 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:43:04,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-24 00:43:04,273 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:04,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:04,278 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:43:04,284 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:43:04,284 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:43:04,290 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:43:04,304 [ scc.git] DEBUG Already up to date.
2024-03-24 00:43:04,304 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-24 00:43:04,771 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-03-24 00:43:04,772 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-24 00:43:04,776 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:43:04,776 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:04,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:04,782 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-24 00:43:04,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:04,792 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-24 00:43:04,847 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-03-24 00:43:04,847 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-03-24 00:43:04,847 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-03-24 00:43:04,847 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-03-24 00:43:04,847 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-03-24 00:43:04,847 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-03-24 00:43:04,847 [ scc.git] DEBUG Auto-merging setup.py
2024-03-24 00:43:04,847 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-03-24 00:43:04,847 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-24 00:43:04,848 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-24 00:43:04,854 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-24 00:43:04,860 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-03-24 00:43:05,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:05,016 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-24 00:43:05,023 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-24 00:43:05,029 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#9](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-03-24 00:43:05,034 [ scc.config] DEBUG Found github.token
2024-03-24 00:43:05,035 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-03-24 00:43:05,035 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:43:05,075 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:05,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:05,082 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:43:05,123 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:43:05,130 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efc649670> has no local changes
2024-03-24 00:43:05,130 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:43:05,139 [ scc.git] DEBUG [detached HEAD 855dd0f] merge master -Dorg -Ssuccess-only
2024-03-24 00:43:05,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:05,140 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:43:05,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-03-24 00:43:05,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-03-24 00:43:06,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-03-24 00:43:06,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-24 00:43:07,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:43:07,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-24 00:43:08,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:43:08,272 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-24 00:43:08,272 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:43:08,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-24 00:43:08,272 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:08,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:08,278 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:43:08,282 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:43:08,282 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:43:08,287 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:43:08,292 [ scc.git] DEBUG Already up to date.
2024-03-24 00:43:08,292 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-03-24 00:43:08,740 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-03-24 00:43:08,740 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-03-24 00:43:08,745 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:43:08,745 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:08,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:08,751 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-03-24 00:43:08,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:08,763 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-03-24 00:43:08,793 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-03-24 00:43:08,796 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-03-24 00:43:08,798 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-03-24 00:43:08,798 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-03-24 00:43:08,798 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-03-24 00:43:08,798 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-03-24 00:43:08,798 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-03-24 00:43:08,798 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-03-24 00:43:08,799 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-03-24 00:43:08,799 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-03-24 00:43:08,799 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-03-24 00:43:08,799 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-03-24 00:43:08,799 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-03-24 00:43:08,800 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-03-24 00:43:08,800 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-03-24 00:43:08,800 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-03-24 00:43:08,800 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-03-24 00:43:08,800 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-03-24 00:43:08,800 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-03-24 00:43:09,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:09,017 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:43:09,061 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:09,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:09,067 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:43:09,107 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:43:09,114 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efd6a4eb0> has no local changes
2024-03-24 00:43:09,114 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:43:09,131 [ scc.git] DEBUG [detached HEAD 56f3c46] merge master -Dorg -Ssuccess-only
2024-03-24 00:43:09,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:09,132 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:43:09,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-03-24 00:43:09,446 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:43:09,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-24 00:43:09,446 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:09,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:09,452 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:43:09,457 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:43:09,458 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:43:09,463 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:43:09,469 [ scc.git] DEBUG Already up to date.
2024-03-24 00:43:09,469 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:43:09,469 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:09,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:09,475 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:43:09,516 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:09,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:09,521 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:43:09,566 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:43:09,573 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efc614b50> has no local changes
2024-03-24 00:43:09,573 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:43:09,583 [ scc.git] DEBUG [detached HEAD 9a7039f] merge master -Dorg -Ssuccess-only
2024-03-24 00:43:09,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:09,584 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:43:09,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-03-24 00:43:09,871 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:43:09,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-24 00:43:09,871 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:09,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:09,878 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:43:09,883 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:43:09,884 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:43:09,889 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:43:09,895 [ scc.git] DEBUG Already up to date.
2024-03-24 00:43:09,895 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:43:09,895 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:09,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:09,900 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:43:09,943 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:09,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:09,949 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:43:09,992 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:43:09,998 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efc593550> has no local changes
2024-03-24 00:43:09,998 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:43:10,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:10,006 [ scc.git] DEBUG [detached HEAD 034db01] merge master -Dorg -Ssuccess-only
2024-03-24 00:43:10,006 [ scc.git] INFO Overriding base-branch from master to main
2024-03-24 00:43:10,007 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:43:10,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-03-24 00:43:10,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-03-24 00:43:11,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-03-24 00:43:11,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-03-24 00:43:12,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-24 00:43:12,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:43:13,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-24 00:43:13,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-24 00:43:14,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:43:14,229 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-24 00:43:14,229 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:43:14,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-24 00:43:14,229 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:14,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:14,235 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-03-24 00:43:14,240 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:43:14,240 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-03-24 00:43:14,246 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-03-24 00:43:14,251 [ scc.git] DEBUG Already up to date.
2024-03-24 00:43:14,252 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-03-24 00:43:14,726 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-03-24 00:43:14,726 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-03-24 00:43:14,731 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:43:14,731 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:14,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:14,738 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-24 00:43:14,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:14,749 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-24 00:43:14,854 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-03-24 00:43:14,854 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-03-24 00:43:14,854 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-24 00:43:14,855 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-24 00:43:14,861 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-24 00:43:14,868 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-03-24 00:43:15,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:15,025 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-24 00:43:15,031 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-24 00:43:15,037 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#9](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-03-24 00:43:15,042 [ scc.config] DEBUG Found github.token
2024-03-24 00:43:15,042 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-03-24 00:43:15,042 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:43:15,084 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:15,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:15,090 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:43:15,131 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:43:15,138 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efc593730> has no local changes
2024-03-24 00:43:15,138 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:43:15,146 [ scc.git] DEBUG [detached HEAD be8c9ab] merge master -Dorg -Ssuccess-only
2024-03-24 00:43:15,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:15,147 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:43:15,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-03-24 00:43:15,444 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:43:15,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-24 00:43:15,444 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:15,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:15,450 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:43:15,455 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:43:15,455 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:43:15,461 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:43:15,467 [ scc.git] DEBUG Already up to date.
2024-03-24 00:43:15,468 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:43:15,468 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:15,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:15,472 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:43:15,514 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:15,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:15,519 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:43:15,558 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:43:15,564 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efc5fa280> has no local changes
2024-03-24 00:43:15,564 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:43:15,572 [ scc.git] DEBUG [detached HEAD e2d4e97] merge master -Dorg -Ssuccess-only
2024-03-24 00:43:15,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:15,573 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:43:15,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-03-24 00:43:15,912 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:43:15,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-24 00:43:15,912 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:15,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:15,918 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:43:15,923 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:43:15,923 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:43:15,929 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:43:15,935 [ scc.git] DEBUG Already up to date.
2024-03-24 00:43:15,936 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:43:15,936 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:15,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:15,941 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:43:15,984 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:15,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:15,990 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:43:16,030 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:43:16,036 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efc5935b0> has no local changes
2024-03-24 00:43:16,036 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:43:16,044 [ scc.git] DEBUG [detached HEAD 61eb195] merge master -Dorg -Ssuccess-only
2024-03-24 00:43:16,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:16,045 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:43:16,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-03-24 00:43:16,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-03-24 00:43:17,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-03-24 00:43:17,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-24 00:43:18,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:43:18,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-24 00:43:19,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:43:19,224 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-03-24 00:43:19,224 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:43:19,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-24 00:43:19,225 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:19,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:19,231 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-24 00:43:19,236 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:43:19,236 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-24 00:43:19,242 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-24 00:43:19,248 [ scc.git] DEBUG Already up to date.
2024-03-24 00:43:19,248 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-03-24 00:43:19,713 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-03-24 00:43:19,713 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-03-24 00:43:19,719 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:43:19,719 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:19,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:19,725 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-24 00:43:19,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:19,736 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-24 00:43:19,781 [ scc.git] DEBUG Auto-merging Dockerfile
2024-03-24 00:43:19,782 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-03-24 00:43:19,782 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-24 00:43:19,782 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-24 00:43:19,789 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-24 00:43:19,797 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-03-24 00:43:19,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:19,953 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-24 00:43:19,960 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-24 00:43:19,966 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#9](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-03-24 00:43:19,972 [ scc.config] DEBUG Found github.token
2024-03-24 00:43:19,972 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-03-24 00:43:19,972 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:43:20,016 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:20,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:20,022 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:43:20,064 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:43:20,071 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efc54d4f0> has no local changes
2024-03-24 00:43:20,071 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:43:20,080 [ scc.git] DEBUG [detached HEAD 0e2c5ca] merge master -Dorg -Ssuccess-only
2024-03-24 00:43:20,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:20,080 [ scc.git] INFO Overriding base-branch from master to develop
2024-03-24 00:43:20,080 [ scc.repo] DEBUG ## PRs found:
2024-03-24 00:43:20,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-03-24 00:43:20,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-03-24 00:43:21,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-03-24 00:43:21,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-03-24 00:43:22,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-03-24 00:43:22,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-03-24 00:43:23,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-03-24 00:43:23,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-24 00:43:24,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-24 00:43:24,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-24 00:43:25,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-03-24 00:43:25,013 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-24 00:43:25,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-03-24 00:43:25,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-03-24 00:43:26,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-03-24 00:43:26,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-03-24 00:43:26,936 [ scc.repo] DEBUG ## Branches found:
2024-03-24 00:43:26,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-24 00:43:26,936 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:26,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:26,942 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-03-24 00:43:26,947 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-24 00:43:26,947 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-03-24 00:43:26,952 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-03-24 00:43:26,957 [ scc.git] DEBUG Already up to date.
2024-03-24 00:43:26,957 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-03-24 00:43:27,415 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-03-24 00:43:27,416 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-03-24 00:43:27,420 [ scc.git] DEBUG ## Unique users: []
2024-03-24 00:43:27,420 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:27,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:27,426 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-24 00:43:27,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:27,438 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-24 00:43:27,486 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-03-24 00:43:27,487 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-03-24 00:43:27,487 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-24 00:43:27,487 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-24 00:43:27,494 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-24 00:43:27,499 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-03-24 00:43:27,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:27,659 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-24 00:43:27,667 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-24 00:43:27,674 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#9](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-03-24 00:43:27,679 [ scc.config] DEBUG Found github.token
2024-03-24 00:43:27,679 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-03-24 00:43:27,680 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-24 00:43:27,723 [ scc.git] DEBUG Get sha1 of %s
2024-03-24 00:43:27,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-24 00:43:27,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:43:27,777 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:43:27,784 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9efc55f280> has no local changes
2024-03-24 00:43:27,785 [ 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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:43:27,793 [ scc.git] DEBUG [detached HEAD 38a42dc] merge master -Dorg -Ssuccess-only
2024-03-24 00:43:27,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:27,794 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-24 00:43:27,874 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-03-24 00:43:28,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:28,081 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-03-24 00:43:28,086 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-03-24 00:43:28,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:28,491 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-03-24 00:43:28,502 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-03-24 00:43:28,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:28,893 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-03-24 00:43:28,899 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-03-24 00:43:29,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:29,303 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-03-24 00:43:29,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:29,705 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-03-24 00:43:29,710 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-03-24 00:43:30,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:30,118 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-03-24 00:43:30,123 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-03-24 00:43:30,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:30,522 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-03-24 00:43:30,526 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-03-24 00:43:30,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:30,934 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-03-24 00:43:30,939 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-03-24 00:43:31,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:31,339 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-03-24 00:43:31,346 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-03-24 00:43:31,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:31,758 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-03-24 00:43:31,763 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-03-24 00:43:32,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:32,169 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-03-24 00:43:32,174 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-03-24 00:43:32,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:32,572 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-03-24 00:43:32,576 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-03-24 00:43:33,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:33,038 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-03-24 00:43:33,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:33,438 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-03-24 00:43:33,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:33,837 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-03-24 00:43:33,842 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-03-24 00:43:34,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:34,252 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-03-24 00:43:34,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:34,658 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-03-24 00:43:35,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:35,066 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-03-24 00:43:35,073 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-03-24 00:43:35,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:35,483 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-03-24 00:43:35,488 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-03-24 00:43:35,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:35,888 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-03-24 00:43:35,893 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-03-24 00:43:36,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:36,296 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-03-24 00:43:36,301 [ scc.config] DEBUG Found submodule.scripts.url
2024-03-24 00:43:36,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-24 00:43:36,699 [ scc.config] DEBUG Found submodule.scripts.branch
2024-03-24 00:43:36,699 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-24 00:43:36,783 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9eff7a2430> has local changes
2024-03-24 00:43:36,783 [ 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 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'
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#9 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/9/)'
2024-03-24 00:43:36,800 [ scc.git] DEBUG [detached HEAD 9f0fc2d] merge master -Dorg -Ssuccess-only
2024-03-24 00:43:36,800 [ scc.merge] INFO Repository: ome/omero-plugins
2024-03-24 00:43:36,800 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-03-24 00:43:36,800 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,801 [ scc.merge] INFO
2024-03-24 00:43:36,801 [ scc.merge] INFO
2024-03-24 00:43:36,801 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-03-24 00:43:36,801 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,801 [ scc.merge] INFO
2024-03-24 00:43:36,801 [ scc.merge] INFO
2024-03-24 00:43:36,801 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-03-24 00:43:36,801 [ scc.merge] INFO Excluded PRs:
2024-03-24 00:43:36,801 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-03-24 00:43:36,801 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,801 [ scc.merge] INFO
2024-03-24 00:43:36,801 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,801 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-03-24 00:43:36,801 [ scc.merge] INFO
2024-03-24 00:43:36,801 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-03-24 00:43:36,801 [ scc.merge] INFO Excluded PRs:
2024-03-24 00:43:36,801 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-03-24 00:43:36,801 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-03-24 00:43:36,801 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-03-24 00:43:36,801 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-03-24 00:43:36,801 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,801 [ scc.merge] INFO
2024-03-24 00:43:36,801 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,801 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-03-24 00:43:36,801 [ scc.merge] INFO
2024-03-24 00:43:36,801 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-03-24 00:43:36,801 [ scc.merge] INFO Excluded PRs:
2024-03-24 00:43:36,801 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-03-24 00:43:36,801 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,801 [ scc.merge] INFO
2024-03-24 00:43:36,801 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,801 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-03-24 00:43:36,801 [ scc.merge] INFO
2024-03-24 00:43:36,801 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-24 00:43:36,801 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-03-24 00:43:36,802 [ scc.merge] INFO
2024-03-24 00:43:36,802 [ scc.merge] INFO Repository: ome/omero-figure
2024-03-24 00:43:36,802 [ scc.merge] INFO Excluded PRs:
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-03-24 00:43:36,802 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,802 [ scc.merge] INFO
2024-03-24 00:43:36,802 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-03-24 00:43:36,802 [ scc.merge] INFO
2024-03-24 00:43:36,802 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-03-24 00:43:36,802 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,802 [ scc.merge] INFO
2024-03-24 00:43:36,802 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-03-24 00:43:36,802 [ scc.merge] INFO
2024-03-24 00:43:36,802 [ scc.merge] INFO Repository: ome/omero-gallery
2024-03-24 00:43:36,802 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,802 [ scc.merge] INFO
2024-03-24 00:43:36,802 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-24 00:43:36,802 [ scc.merge] INFO
2024-03-24 00:43:36,802 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-03-24 00:43:36,802 [ scc.merge] INFO Excluded PRs:
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-03-24 00:43:36,802 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,802 [ scc.merge] INFO
2024-03-24 00:43:36,802 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-03-24 00:43:36,802 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-24 00:43:36,802 [ scc.merge] INFO
2024-03-24 00:43:36,802 [ scc.merge] INFO Repository: ome/omero-mapr
2024-03-24 00:43:36,802 [ scc.merge] INFO Excluded PRs:
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-03-24 00:43:36,803 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,803 [ scc.merge] INFO
2024-03-24 00:43:36,803 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-03-24 00:43:36,803 [ scc.merge] INFO
2024-03-24 00:43:36,803 [ scc.merge] INFO Repository: ome/omero-metadata
2024-03-24 00:43:36,803 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,803 [ scc.merge] INFO
2024-03-24 00:43:36,803 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-24 00:43:36,803 [ scc.merge] INFO
2024-03-24 00:43:36,803 [ scc.merge] INFO Repository: ome/omero-parade
2024-03-24 00:43:36,803 [ scc.merge] INFO Excluded PRs:
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-03-24 00:43:36,803 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,803 [ scc.merge] INFO
2024-03-24 00:43:36,803 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-24 00:43:36,803 [ scc.merge] INFO
2024-03-24 00:43:36,803 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-03-24 00:43:36,803 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,803 [ scc.merge] INFO
2024-03-24 00:43:36,803 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-03-24 00:43:36,803 [ scc.merge] INFO
2024-03-24 00:43:36,803 [ scc.merge] INFO Repository: ome/omero-rois
2024-03-24 00:43:36,803 [ scc.merge] INFO Excluded PRs:
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-24 00:43:36,803 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,803 [ scc.merge] INFO
2024-03-24 00:43:36,803 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,803 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-24 00:43:36,803 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Repository: ome/omero-signup
2024-03-24 00:43:36,804 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-24 00:43:36,804 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-03-24 00:43:36,804 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Merged PRs:
2024-03-24 00:43:36,804 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Repository: ome/omero-upload
2024-03-24 00:43:36,804 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-03-24 00:43:36,804 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-03-24 00:43:36,804 [ scc.merge] INFO Excluded PRs:
2024-03-24 00:43:36,804 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-03-24 00:43:36,804 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-24 00:43:36,804 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-03-24 00:43:36,804 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-03-24 00:43:36,804 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-03-24 00:43:36,804 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,804 [ scc.merge] INFO
2024-03-24 00:43:36,804 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-24 00:43:36,805 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-03-24 00:43:36,805 [ scc.merge] INFO
2024-03-24 00:43:36,805 [ scc.merge] INFO Repository: ome/scripts
2024-03-24 00:43:36,805 [ scc.merge] INFO Excluded PRs:
2024-03-24 00:43:36,805 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-03-24 00:43:36,805 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-03-24 00:43:36,805 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-03-24 00:43:36,805 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-03-24 00:43:36,805 [ scc.merge] INFO Already up to date.
2024-03-24 00:43:36,805 [ scc.merge] INFO
2024-03-24 00:43:36,805 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-24 00:43:36,805 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-24 00:43:36,805 [ scc.merge] INFO
2024-03-24 00:43:36,805 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-24 00:43:36,805 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-03-24 00:43:36,811 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-03-24 00:43:36,817 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-03-24 00:43:36,823 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-03-24 00:43:36,828 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-03-24 00:43:36,833 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-24 00:43:36,838 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-24 00:43:36,842 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-24 00:43:36,847 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-24 00:43:36,852 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-24 00:43:36,858 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-24 00:43:36,864 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-24 00:43:36,868 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,874 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,874 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-24 00:43:36,874 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-24 00:43:36,880 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-24 00:43:36,885 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-24 00:43:36,891 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-24 00:43:36,897 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-24 00:43:36,902 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-24 00:43:36,907 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-24 00:43:36,913 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-24 00:43:36,919 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-24 00:43:36,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-24 00:43:36,924 [ scc.git] DEBUG Calling 'git remote'
2024-03-24 00:43:36,929 [ 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 4efd8b2] 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 f5d4a91] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-03-24 00:44:22,991 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-03-24 00:44:31,918 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-03-24 00:44:34,266 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-03-24 00:44:38,771 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-03-24 00:45:25,955 [ 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}
