Skipping 115 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-03-23 00:42:37,821 [ scc.git] DEBUG src/templates/rois_form_template.html | 93 -
2024-03-23 00:42:37,821 [ scc.git] DEBUG src/templates/scalebar_form.template.html | 143 +
2024-03-23 00:42:37,821 [ scc.git] DEBUG src/templates/scalebar_form_template.html | 143 -
2024-03-23 00:42:37,821 [ scc.git] DEBUG ..._template.html => scalebar_panel.template.html} | 0
2024-03-23 00:42:37,821 [ scc.git] DEBUG ...r_template.html => shape_toolbar.template.html} | 62 +-
2024-03-23 00:42:37,821 [ scc.git] DEBUG src/templates/viewport.template.html | 5 +
2024-03-23 00:42:37,821 [ scc.git] DEBUG ..._template.html => viewport_inner.template.html} | 0
2024-03-23 00:42:37,821 [ scc.git] DEBUG src/templates/viewport_template.html | 9 -
2024-03-23 00:42:37,821 [ scc.git] DEBUG ...anel_template.html => xywh_panel.template.html} | 30 +-
2024-03-23 00:42:37,821 [ scc.git] DEBUG ..._crop_template.html => zoom_crop.template.html} | 10 +-
2024-03-23 00:42:37,821 [ scc.git] DEBUG vite.config.js | 21 +
2024-03-23 00:42:37,821 [ scc.git] DEBUG 136 files changed, 7922 insertions(+), 32991 deletions(-)
2024-03-23 00:42:37,821 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100644 Gruntfile.js
2024-03-23 00:42:37,822 [ scc.git] DEBUG create mode 100755 deploy_build.sh
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100644 docs/demo/index.html
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/backbone-1.0.0.js
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/backbone.mousetrap/README.md
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.css
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.min.css
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.js
2024-03-23 00:42:37,822 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-03-23 00:42:37,823 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-03-23 00:42:37,824 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-03-23 00:42:37,824 [ scc.git] DEBUG create mode 100644 src/.env
2024-03-23 00:42:37,825 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-03-23 00:42:37,825 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-03-23 00:42:37,825 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-03-23 00:42:37,825 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-03-23 00:42:37,825 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-03-23 00:42:37,825 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-03-23 00:42:37,825 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-03-23 00:42:37,825 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-03-23 00:42:37,825 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-03-23 00:42:37,825 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-03-23 00:42:37,825 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-03-23 00:42:37,825 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-23 00:42:37,826 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-03-23 00:42:37,826 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-03-23 00:42:37,826 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-03-23 00:42:37,826 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-03-23 00:42:37,826 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-03-23 00:42:37,826 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-03-23 00:42:37,826 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-03-23 00:42:37,826 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-03-23 00:42:37,826 [ scc.git] DEBUG create mode 100644 src/index.html
2024-03-23 00:42:37,826 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-03-23 00:42:37,826 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-03-23 00:42:37,826 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-03-23 00:42:37,826 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-03-23 00:42:37,826 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-03-23 00:42:37,827 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-03-23 00:42:37,827 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-03-23 00:42:37,827 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-03-23 00:42:37,827 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-03-23 00:42:37,827 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-23 00:42:37,827 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-03-23 00:42:37,827 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-03-23 00:42:37,827 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-03-23 00:42:37,827 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-03-23 00:42:37,827 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-03-23 00:42:37,827 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-03-23 00:42:37,827 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-03-23 00:42:37,827 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-03-23 00:42:37,828 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-03-23 00:42:37,828 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-03-23 00:42:37,829 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-03-23 00:42:37,829 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-03-23 00:42:37,829 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-03-23 00:42:37,829 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-03-23 00:42:37,829 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-03-23 00:42:37,829 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-03-23 00:42:37,829 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-03-23 00:42:37,829 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-03-23 00:42:37,829 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-03-23 00:42:37,829 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-03-23 00:42:37,829 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-03-23 00:42:37,829 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-03-23 00:42:37,829 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-03-23 00:42:37,830 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-03-23 00:42:37,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:42:37,986 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-23 00:42:37,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:42:38,002 [ 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-23 00:42:38,021 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:42:38,024 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-03-23 00:42:38,024 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-03-23 00:42:38,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:42:38,382 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:42:38,440 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:42:38,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:42:38,445 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:42:38,487 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:42:38,495 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e203d2bb0> has no local changes
2024-03-23 00:42:38,495 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:42:38,506 [ scc.git] DEBUG [detached HEAD 0cbeaf98] merge master -Dorg -Ssuccess-only
2024-03-23 00:42:38,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:42:38,506 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:42:38,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-03-23 00:42:39,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-03-23 00:42:39,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-03-23 00:42:40,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-23 00:42:40,712 [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-23 00:42:41,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-23 00:42:41,648 [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-23 00:42:41,648 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-03-23 00:42:41,648 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:42:41,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-23 00:42:41,648 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:42:41,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:42:41,654 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:42:41,660 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:42:41,660 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:42:41,667 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:42:41,674 [ scc.git] DEBUG Already up to date.
2024-03-23 00:42:41,674 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-03-23 00:42:42,135 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-03-23 00:42:42,135 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-03-23 00:42:42,140 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:42:42,140 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:42:42,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:42:42,145 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-23 00:42:42,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:42:42,155 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-23 00:42:42,188 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-03-23 00:42:42,189 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:42:42,192 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-03-23 00:42:42,192 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-03-23 00:42:42,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:42:42,340 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:42:42,386 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:42:42,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:42:42,391 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:42:42,433 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:42:42,439 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e20c13a60> has no local changes
2024-03-23 00:42:42,439 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:42:42,448 [ scc.git] DEBUG [detached HEAD 85452b2] merge master -Dorg -Ssuccess-only
2024-03-23 00:42:42,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:42:42,449 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:42:42,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-03-23 00:42:43,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-03-23 00:42:43,262 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-23 00:42:43,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-23 00:42:44,321 [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-23 00:42:44,785 [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-23 00:42:45,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-23 00:42:45,783 [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-23 00:42:45,784 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-23 00:42:45,784 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:42:45,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-23 00:42:45,784 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:42:45,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:42:45,791 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:42:45,796 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:42:45,797 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:42:45,802 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:42:45,807 [ scc.git] DEBUG Already up to date.
2024-03-23 00:42:45,807 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-03-23 00:42:46,195 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-03-23 00:42:46,195 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-03-23 00:42:46,200 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:42:46,200 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:42:46,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:42:46,206 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-03-23 00:42:46,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:42:46,217 [ 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-23 00:42:46,228 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:42:46,233 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-03-23 00:42:46,233 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-03-23 00:42:46,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:42:46,394 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:42:46,437 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:42:46,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:42:46,442 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:42:46,485 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:42:46,493 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e20c2a190> has no local changes
2024-03-23 00:42:46,494 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:42:46,503 [ scc.git] DEBUG [detached HEAD dbf98b2] merge master -Dorg -Ssuccess-only
2024-03-23 00:42:46,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:42:46,504 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:42:46,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-03-23 00:42:47,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-03-23 00:42:47,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061 HTTP/1.1" 200 None
2024-03-23 00:42:48,309 [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-23 00:42:48,769 [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-23 00:42:49,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061 HTTP/1.1" 200 None
2024-03-23 00:42:49,668 [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-23 00:42:49,668 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-03-23 00:42:50,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-03-23 00:42:50,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-03-23 00:42:51,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-23 00:42:51,546 [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-23 00:42:52,010 [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-23 00:42:52,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-23 00:42:52,843 [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-23 00:42:52,844 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-03-23 00:42:53,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-03-23 00:42:53,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-03-23 00:42:54,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-23 00:42:54,719 [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-23 00:42:55,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-23 00:42:55,561 [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-23 00:42:55,562 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-03-23 00:42:56,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-03-23 00:42:56,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-03-23 00:42:56,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-23 00:42:57,443 [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-23 00:42:57,908 [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-23 00:42:58,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-23 00:42:58,762 [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-23 00:42:58,762 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-23 00:42:58,763 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:42:58,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-23 00:42:58,763 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:42:58,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:42:58,768 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:42:58,773 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:42:58,773 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:42:58,778 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:42:58,785 [ scc.git] DEBUG Already up to date.
2024-03-23 00:42:58,785 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-03-23 00:42:59,265 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-23 00:42:59,265 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-03-23 00:42:59,270 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-03-23 00:42:59,673 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-23 00:42:59,673 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-03-23 00:42:59,679 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-03-23 00:43:00,463 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-23 00:43:00,463 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-03-23 00:43:00,468 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-03-23 00:43:01,234 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-23 00:43:01,235 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-03-23 00:43:01,237 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:01,238 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:01,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:01,243 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-03-23 00:43:01,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:01,255 [ 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-23 00:43:01,278 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:43:01,282 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-03-23 00:43:01,282 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-03-23 00:43:01,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:01,417 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-23 00:43:01,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:01,428 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-23 00:43:01,440 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:43:01,443 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-03-23 00:43:01,443 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-03-23 00:43:01,443 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-03-23 00:43:01,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:01,824 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-23 00:43:01,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:01,837 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-23 00:43:01,853 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:43:01,858 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-03-23 00:43:01,858 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-03-23 00:43:01,859 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-03-23 00:43:01,859 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-03-23 00:43:01,859 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-03-23 00:43:01,859 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-03-23 00:43:01,859 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-03-23 00:43:02,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:02,326 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f22ba44a88528bde6fa49c5bab1736ee00e9061'
2024-03-23 00:43:02,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:02,337 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 9f22ba44a88528bde6fa49c5bab1736ee00e9061'
2024-03-23 00:43:02,354 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-03-23 00:43:02,355 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:43:02,359 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 7 +-
2024-03-23 00:43:02,359 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-03-23 00:43:02,359 [ scc.git] DEBUG src/app/header.html | 5 ++
2024-03-23 00:43:02,359 [ scc.git] DEBUG src/app/header.js | 45 +++++++++-
2024-03-23 00:43:02,359 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-03-23 00:43:02,359 [ scc.git] DEBUG src/utils/figure.js | 203 ++++++++++++++++++++++++++++++++++++++++++
2024-03-23 00:43:02,359 [ scc.git] DEBUG 6 files changed, 269 insertions(+), 3 deletions(-)
2024-03-23 00:43:02,359 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-03-23 00:43:02,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:02,722 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:02,765 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:02,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:02,771 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:02,817 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:02,825 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e203c15b0> has no local changes
2024-03-23 00:43:02,825 [ 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'
Generated by OMERO-plugins-push#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:02,835 [ scc.git] DEBUG [detached HEAD fb4c3e0] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:02,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:02,835 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:03,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-03-23 00:43:03,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-03-23 00:43:04,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-03-23 00:43:04,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-23 00:43:05,287 [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-23 00:43:05,754 [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-23 00:43:06,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-23 00:43:06,608 [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-23 00:43:06,610 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-03-23 00:43:06,610 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:06,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-23 00:43:06,610 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:06,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:06,618 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:06,623 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:06,624 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:06,629 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:06,636 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:06,636 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-03-23 00:43:07,079 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-03-23 00:43:07,079 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-03-23 00:43:07,085 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:07,085 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:07,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:07,092 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-23 00:43:07,100 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:07,107 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-23 00:43:07,119 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:43:07,122 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-03-23 00:43:07,122 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-03-23 00:43:07,122 [ scc.git] DEBUG requirements.txt | 2 +-
2024-03-23 00:43:07,122 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-03-23 00:43:07,122 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-03-23 00:43:07,122 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-03-23 00:43:07,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:07,280 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:07,324 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:07,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:07,332 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:07,375 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:07,383 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e2039ba90> has no local changes
2024-03-23 00:43:07,383 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:07,392 [ scc.git] DEBUG [detached HEAD 4e3b7b8] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:07,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:07,393 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:08,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-03-23 00:43:09,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-03-23 00:43:09,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-03-23 00:43:10,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-23 00:43:10,752 [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-23 00:43:11,196 [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-23 00:43:11,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-23 00:43:12,052 [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-23 00:43:12,053 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-23 00:43:12,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-03-23 00:43:12,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-03-23 00:43:13,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-23 00:43:13,910 [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-23 00:43:14,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-23 00:43:14,749 [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-23 00:43:14,750 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-23 00:43:14,750 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:14,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-23 00:43:14,750 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:14,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:14,757 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:14,762 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:14,762 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:14,767 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:14,773 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:14,774 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-03-23 00:43:15,368 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-23 00:43:15,368 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-03-23 00:43:15,374 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-03-23 00:43:15,869 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-23 00:43:15,869 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-03-23 00:43:15,874 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:15,875 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:15,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:15,881 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-23 00:43:15,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:15,894 [ 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-23 00:43:15,938 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-03-23 00:43:15,938 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-03-23 00:43:15,938 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-23 00:43:15,939 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-23 00:43:15,939 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-23 00:43:15,940 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-23 00:43:15,946 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-23 00:43:15,955 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-23 00:43:16,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:16,117 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-23 00:43:16,126 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-23 00:43:16,133 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#8](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-03-23 00:43:16,139 [ scc.config] DEBUG Found github.token
2024-03-23 00:43:16,140 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-03-23 00:43:16,140 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-23 00:43:16,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:16,154 [ 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-23 00:43:16,182 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-23 00:43:16,182 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-23 00:43:16,182 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-03-23 00:43:16,183 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-23 00:43:16,184 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-23 00:43:16,190 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-23 00:43:16,197 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-23 00:43:16,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:16,523 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-23 00:43:16,531 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-23 00:43:16,538 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#8](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/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-23 00:43:16,549 [ scc.config] DEBUG Found github.token
2024-03-23 00:43:16,549 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-03-23 00:43:16,549 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:16,590 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:16,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:16,597 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:16,637 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:16,644 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e203e9580> has no local changes
2024-03-23 00:43:16,644 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:16,654 [ scc.git] DEBUG [detached HEAD e2c6171] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:16,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:16,655 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:17,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-03-23 00:43:17,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-03-23 00:43:17,506 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-23 00:43:18,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-23 00:43:18,552 [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-23 00:43:19,024 [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-23 00:43:19,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-23 00:43:19,979 [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-23 00:43:19,980 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-23 00:43:20,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-03-23 00:43:20,441 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-23 00:43:20,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-23 00:43:21,424 [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-23 00:43:21,892 [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-23 00:43:22,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-23 00:43:22,827 [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-23 00:43:22,828 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-23 00:43:23,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-03-23 00:43:23,270 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-23 00:43:23,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-23 00:43:24,264 [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-23 00:43:24,741 [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-23 00:43:25,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-23 00:43:25,641 [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-23 00:43:25,641 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-23 00:43:26,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-03-23 00:43:26,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-03-23 00:43:26,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-03-23 00:43:27,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-03-23 00:43:27,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-03-23 00:43:28,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-03-23 00:43:28,392 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:28,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-23 00:43:28,392 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:28,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:28,398 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:28,403 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:28,403 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:28,409 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:28,415 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:28,415 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-03-23 00:43:28,840 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-23 00:43:28,841 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-03-23 00:43:28,846 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-03-23 00:43:29,225 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-23 00:43:29,225 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-03-23 00:43:29,229 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-03-23 00:43:29,612 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-23 00:43:29,612 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-03-23 00:43:29,617 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:29,617 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:29,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:29,623 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-03-23 00:43:29,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:29,636 [ 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-23 00:43:29,645 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:43:29,648 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-03-23 00:43:29,648 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-03-23 00:43:29,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:29,801 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-03-23 00:43:29,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:29,815 [ 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-23 00:43:29,827 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-23 00:43:29,827 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:43:29,831 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-03-23 00:43:29,831 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-03-23 00:43:30,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:30,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-03-23 00:43:30,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:30,221 [ 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-23 00:43:30,233 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-23 00:43:30,234 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:43:30,237 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-03-23 00:43:30,237 [ scc.git] DEBUG package.json | 2 +-
2024-03-23 00:43:30,237 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-03-23 00:43:30,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:30,610 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:30,649 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:30,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:30,655 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:30,695 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:30,702 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e20c05ee0> has no local changes
2024-03-23 00:43:30,702 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:30,711 [ scc.git] DEBUG [detached HEAD 12643a0] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:30,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:30,711 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:31,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-03-23 00:43:31,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-03-23 00:43:32,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-23 00:43:32,512 [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-23 00:43:33,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-23 00:43:33,416 [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-23 00:43:33,416 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-03-23 00:43:33,416 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:33,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-23 00:43:33,417 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:33,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:33,424 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:33,430 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:33,430 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:33,436 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:33,443 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:33,444 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-23 00:43:33,916 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-03-23 00:43:33,916 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-23 00:43:33,922 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:33,922 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:33,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:33,930 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-23 00:43:33,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:33,946 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-23 00:43:33,959 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:43:34,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:34,109 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:34,154 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:34,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:34,160 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:34,203 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:34,212 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e203c8f70> has no local changes
2024-03-23 00:43:34,212 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:34,222 [ scc.git] DEBUG [detached HEAD be59e81] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:34,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:34,223 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:34,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-03-23 00:43:35,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-03-23 00:43:35,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-03-23 00:43:35,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-03-23 00:43:36,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-23 00:43:36,942 [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-23 00:43:37,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-23 00:43:37,890 [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-23 00:43:37,890 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-23 00:43:37,891 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:37,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-23 00:43:37,891 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:37,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:37,897 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:37,902 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:37,903 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:37,908 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:37,914 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:37,914 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-03-23 00:43:38,379 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-03-23 00:43:38,379 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-03-23 00:43:38,383 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:38,383 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:38,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:38,388 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-03-23 00:43:38,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:38,397 [ 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-23 00:43:38,405 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-03-23 00:43:38,405 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:43:38,407 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-03-23 00:43:38,407 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-03-23 00:43:38,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:38,560 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:38,602 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:38,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:38,607 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:38,648 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:38,654 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e203585b0> has no local changes
2024-03-23 00:43:38,655 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:38,662 [ scc.git] DEBUG [detached HEAD 75b604d] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:38,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:38,662 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:39,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-03-23 00:43:39,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-03-23 00:43:39,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-03-23 00:43:40,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-23 00:43:40,905 [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-23 00:43:41,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-23 00:43:41,853 [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-23 00:43:41,854 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-23 00:43:41,854 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:41,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-23 00:43:41,854 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:41,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:41,861 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:41,866 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:41,866 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:41,871 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:41,876 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:41,877 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-23 00:43:42,287 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-03-23 00:43:42,287 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-23 00:43:42,293 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:42,293 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:42,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:42,300 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-23 00:43:42,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:42,312 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-23 00:43:42,397 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-03-23 00:43:42,397 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-03-23 00:43:42,397 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-03-23 00:43:42,397 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-03-23 00:43:42,397 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-03-23 00:43:42,397 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-03-23 00:43:42,397 [ scc.git] DEBUG Auto-merging setup.py
2024-03-23 00:43:42,397 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-03-23 00:43:42,397 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-23 00:43:42,398 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-23 00:43:42,408 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-23 00:43:42,415 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-03-23 00:43:42,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:42,574 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-23 00:43:42,581 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-23 00:43:42,587 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#8](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2024-03-23 00:43:42,592 [ scc.config] DEBUG Found github.token
2024-03-23 00:43:42,592 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-03-23 00:43:42,592 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:42,636 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:42,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:42,643 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:42,685 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:42,692 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e203adac0> has no local changes
2024-03-23 00:43:42,692 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:42,700 [ scc.git] DEBUG [detached HEAD 88fb010] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:42,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:42,701 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:43,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-03-23 00:43:43,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-03-23 00:43:43,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-03-23 00:43:44,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-23 00:43:44,915 [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-23 00:43:45,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-23 00:43:45,830 [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-23 00:43:45,831 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-23 00:43:45,831 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:45,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-23 00:43:45,831 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:45,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:45,836 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:45,840 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:45,841 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:45,846 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:45,851 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:45,852 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-03-23 00:43:46,363 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-03-23 00:43:46,364 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-03-23 00:43:46,369 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:46,369 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:46,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:46,376 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-03-23 00:43:46,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:46,388 [ 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-23 00:43:46,401 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-23 00:43:46,404 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-03-23 00:43:46,404 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-03-23 00:43:46,404 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-03-23 00:43:46,404 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-03-23 00:43:46,404 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-03-23 00:43:46,404 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-03-23 00:43:46,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-03-23 00:43:46,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-03-23 00:43:46,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-03-23 00:43:46,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-03-23 00:43:46,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-03-23 00:43:46,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-03-23 00:43:46,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-03-23 00:43:46,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-03-23 00:43:46,406 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-03-23 00:43:46,406 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-03-23 00:43:46,407 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-03-23 00:43:46,407 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-03-23 00:43:46,407 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-03-23 00:43:46,407 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-03-23 00:43:46,407 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-03-23 00:43:46,407 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-03-23 00:43:46,407 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-03-23 00:43:46,407 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-03-23 00:43:46,407 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-03-23 00:43:46,407 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-03-23 00:43:46,408 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-03-23 00:43:46,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:46,559 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:46,599 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:46,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:46,605 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:46,662 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:46,669 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e203c8e80> has no local changes
2024-03-23 00:43:46,669 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:46,679 [ scc.git] DEBUG [detached HEAD 397a748] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:46,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:46,680 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:46,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-03-23 00:43:46,979 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:46,979 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-23 00:43:46,980 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:46,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:46,986 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:46,992 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:46,992 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:46,998 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:47,004 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:47,004 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:47,004 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:47,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:47,009 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:47,050 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:47,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:47,058 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:47,101 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:47,107 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e20335e50> has no local changes
2024-03-23 00:43:47,107 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:47,115 [ scc.git] DEBUG [detached HEAD 644797f] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:47,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:47,115 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:47,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-03-23 00:43:47,413 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:47,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-23 00:43:47,413 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:47,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:47,418 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:47,425 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:47,425 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:47,432 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:47,440 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:47,440 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:47,440 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:47,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:47,447 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:47,488 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:47,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:47,493 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:47,539 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:47,545 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e202bd550> has no local changes
2024-03-23 00:43:47,545 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:47,552 [ scc.git] DEBUG [detached HEAD 1a8e71c] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:47,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:47,552 [ scc.git] INFO Overriding base-branch from master to main
2024-03-23 00:43:47,552 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:47,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-03-23 00:43:48,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-03-23 00:43:48,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-03-23 00:43:49,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-03-23 00:43:49,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-23 00:43:50,264 [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-23 00:43:50,707 [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-23 00:43:51,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-23 00:43:51,632 [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-23 00:43:51,633 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-23 00:43:51,633 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:51,633 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-23 00:43:51,633 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:51,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:51,640 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-03-23 00:43:51,647 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:51,647 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-03-23 00:43:51,654 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-03-23 00:43:51,661 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:51,661 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-03-23 00:43:52,185 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-03-23 00:43:52,185 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-03-23 00:43:52,190 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:52,190 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:52,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:52,195 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-23 00:43:52,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:52,203 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-23 00:43:52,303 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-03-23 00:43:52,303 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-03-23 00:43:52,303 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-23 00:43:52,304 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-23 00:43:52,309 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-23 00:43:52,315 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-03-23 00:43:52,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:52,471 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-23 00:43:52,478 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-23 00:43:52,483 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#8](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-03-23 00:43:52,488 [ scc.config] DEBUG Found github.token
2024-03-23 00:43:52,489 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-03-23 00:43:52,489 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:52,530 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:52,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:52,536 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:52,580 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:52,589 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e202bd6a0> has no local changes
2024-03-23 00:43:52,589 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:52,599 [ scc.git] DEBUG [detached HEAD 4fc57d6] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:52,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:52,600 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:52,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-03-23 00:43:52,901 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:52,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-23 00:43:52,901 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:52,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:52,906 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:52,910 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:52,910 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:52,915 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:52,920 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:52,921 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:52,921 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:52,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:52,926 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:52,974 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:52,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:52,980 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:53,016 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:53,021 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e203334c0> has no local changes
2024-03-23 00:43:53,022 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:53,028 [ scc.git] DEBUG [detached HEAD 763ea84] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:53,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:53,029 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:53,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-03-23 00:43:53,315 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:53,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-23 00:43:53,316 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:53,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:53,323 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:53,328 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:53,328 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:53,334 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:53,340 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:53,340 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:53,340 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:53,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:53,348 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:53,398 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:53,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:53,405 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:53,448 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:53,456 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e202bd5b0> has no local changes
2024-03-23 00:43:53,456 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:53,468 [ scc.git] DEBUG [detached HEAD 79316f3] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:53,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:53,469 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:53,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-03-23 00:43:54,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-03-23 00:43:54,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-03-23 00:43:55,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-23 00:43:55,664 [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-23 00:43:56,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-23 00:43:56,555 [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-23 00:43:56,556 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-03-23 00:43:56,556 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:43:56,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-23 00:43:56,556 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:56,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:56,561 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-23 00:43:56,565 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:43:56,565 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-23 00:43:56,570 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-23 00:43:56,574 [ scc.git] DEBUG Already up to date.
2024-03-23 00:43:56,574 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-03-23 00:43:57,248 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-03-23 00:43:57,248 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-03-23 00:43:57,253 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:43:57,253 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:57,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:57,260 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-23 00:43:57,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:57,273 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-23 00:43:57,296 [ scc.git] DEBUG Auto-merging Dockerfile
2024-03-23 00:43:57,296 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-03-23 00:43:57,296 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-23 00:43:57,296 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-23 00:43:57,303 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-23 00:43:57,310 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-03-23 00:43:57,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:43:57,466 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-23 00:43:57,473 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-23 00:43:57,479 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#8](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-03-23 00:43:57,485 [ scc.config] DEBUG Found github.token
2024-03-23 00:43:57,485 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-03-23 00:43:57,485 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:43:57,525 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:43:57,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:43:57,531 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:43:57,571 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:43:57,579 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e202784f0> has no local changes
2024-03-23 00:43:57,579 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:43:57,589 [ scc.git] DEBUG [detached HEAD ca93490] merge master -Dorg -Ssuccess-only
2024-03-23 00:43:57,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:43:57,589 [ scc.git] INFO Overriding base-branch from master to develop
2024-03-23 00:43:57,589 [ scc.repo] DEBUG ## PRs found:
2024-03-23 00:43:58,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-03-23 00:43:58,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-03-23 00:43:58,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-03-23 00:43:59,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-03-23 00:43:59,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-03-23 00:44:00,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-03-23 00:44:00,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-03-23 00:44:01,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-23 00:44:01,709 [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-23 00:44:02,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-23 00:44:02,545 [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-23 00:44:02,546 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-23 00:44:03,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-03-23 00:44:03,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-03-23 00:44:03,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-03-23 00:44:04,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-03-23 00:44:04,427 [ scc.repo] DEBUG ## Branches found:
2024-03-23 00:44:04,427 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-23 00:44:04,427 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:44:04,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:44:04,438 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-03-23 00:44:04,444 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-23 00:44:04,444 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-03-23 00:44:04,452 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-03-23 00:44:04,459 [ scc.git] DEBUG Already up to date.
2024-03-23 00:44:04,460 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-03-23 00:44:04,952 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-03-23 00:44:04,953 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-03-23 00:44:04,958 [ scc.git] DEBUG ## Unique users: []
2024-03-23 00:44:04,958 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:44:04,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:44:04,965 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-23 00:44:04,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:44:04,976 [ 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-23 00:44:05,016 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-03-23 00:44:05,016 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-03-23 00:44:05,016 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-23 00:44:05,017 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-23 00:44:05,024 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-23 00:44:05,030 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-03-23 00:44:05,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:05,174 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-23 00:44:05,182 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-23 00:44:05,187 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#8](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-03-23 00:44:05,191 [ scc.config] DEBUG Found github.token
2024-03-23 00:44:05,191 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-03-23 00:44:05,191 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-23 00:44:05,236 [ scc.git] DEBUG Get sha1 of %s
2024-03-23 00:44:05,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-23 00:44:05,241 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:44:05,286 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:44:05,294 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e2028a280> has no local changes
2024-03-23 00:44:05,294 [ 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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:44:05,303 [ scc.git] DEBUG [detached HEAD e19f962] merge master -Dorg -Ssuccess-only
2024-03-23 00:44:05,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:05,304 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-23 00:44:05,385 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-03-23 00:44:05,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:05,586 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-03-23 00:44:05,591 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-03-23 00:44:05,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:05,981 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-03-23 00:44:05,985 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-03-23 00:44:06,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:06,388 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-03-23 00:44:06,392 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-03-23 00:44:06,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:06,793 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-03-23 00:44:07,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:07,195 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-03-23 00:44:07,199 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-03-23 00:44:07,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:07,598 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-03-23 00:44:07,603 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-03-23 00:44:08,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:08,017 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-03-23 00:44:08,022 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-03-23 00:44:08,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:08,416 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-03-23 00:44:08,421 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-03-23 00:44:08,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:08,829 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-03-23 00:44:08,834 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-03-23 00:44:09,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:09,227 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-03-23 00:44:09,231 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-03-23 00:44:09,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:09,637 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-03-23 00:44:09,641 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-03-23 00:44:10,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:10,046 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-03-23 00:44:10,051 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-03-23 00:44:10,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:10,455 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-03-23 00:44:10,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:10,843 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-03-23 00:44:11,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:11,250 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-03-23 00:44:11,254 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-03-23 00:44:11,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:11,658 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-03-23 00:44:12,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:12,062 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-03-23 00:44:12,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:12,467 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-03-23 00:44:12,472 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-03-23 00:44:12,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:12,876 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-03-23 00:44:12,880 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-03-23 00:44:13,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:13,284 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-03-23 00:44:13,289 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-03-23 00:44:13,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:13,696 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-03-23 00:44:13,702 [ scc.config] DEBUG Found submodule.scripts.url
2024-03-23 00:44:14,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-23 00:44:14,101 [ scc.config] DEBUG Found submodule.scripts.branch
2024-03-23 00:44:14,101 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-23 00:44:14,182 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6e21cca430> has local changes
2024-03-23 00:44:14,182 [ 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'
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#8 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/8/)'
2024-03-23 00:44:14,197 [ scc.git] DEBUG [detached HEAD 37b6289] merge master -Dorg -Ssuccess-only
2024-03-23 00:44:14,198 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-03-23 00:44:14,198 [ scc.merge] INFO Repository: ome/omero-plugins
2024-03-23 00:44:14,198 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,198 [ scc.merge] INFO
2024-03-23 00:44:14,198 [ scc.merge] INFO
2024-03-23 00:44:14,198 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-03-23 00:44:14,198 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,198 [ scc.merge] INFO
2024-03-23 00:44:14,198 [ scc.merge] INFO
2024-03-23 00:44:14,198 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-03-23 00:44:14,198 [ scc.merge] INFO Excluded PRs:
2024-03-23 00:44:14,198 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-03-23 00:44:14,198 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,198 [ scc.merge] INFO
2024-03-23 00:44:14,198 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,198 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-03-23 00:44:14,198 [ scc.merge] INFO
2024-03-23 00:44:14,198 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-03-23 00:44:14,198 [ scc.merge] INFO Excluded PRs:
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-03-23 00:44:14,199 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,199 [ scc.merge] INFO
2024-03-23 00:44:14,199 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-03-23 00:44:14,199 [ scc.merge] INFO
2024-03-23 00:44:14,199 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-03-23 00:44:14,199 [ scc.merge] INFO Excluded PRs:
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-03-23 00:44:14,199 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,199 [ scc.merge] INFO
2024-03-23 00:44:14,199 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-03-23 00:44:14,199 [ scc.merge] INFO
2024-03-23 00:44:14,199 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-03-23 00:44:14,199 [ scc.merge] INFO
2024-03-23 00:44:14,199 [ scc.merge] INFO Repository: ome/omero-figure
2024-03-23 00:44:14,199 [ scc.merge] INFO Excluded PRs:
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-03-23 00:44:14,199 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,199 [ scc.merge] INFO
2024-03-23 00:44:14,199 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-03-23 00:44:14,199 [ scc.merge] INFO
2024-03-23 00:44:14,199 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-03-23 00:44:14,199 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,199 [ scc.merge] INFO
2024-03-23 00:44:14,199 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,199 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-03-23 00:44:14,199 [ scc.merge] INFO
2024-03-23 00:44:14,199 [ scc.merge] INFO Repository: ome/omero-gallery
2024-03-23 00:44:14,199 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,200 [ scc.merge] INFO
2024-03-23 00:44:14,200 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-23 00:44:14,200 [ scc.merge] INFO
2024-03-23 00:44:14,200 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-03-23 00:44:14,200 [ scc.merge] INFO Excluded PRs:
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-03-23 00:44:14,200 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,200 [ scc.merge] INFO
2024-03-23 00:44:14,200 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-03-23 00:44:14,200 [ scc.merge] INFO
2024-03-23 00:44:14,200 [ scc.merge] INFO Repository: ome/omero-mapr
2024-03-23 00:44:14,200 [ scc.merge] INFO Excluded PRs:
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-03-23 00:44:14,200 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,200 [ scc.merge] INFO
2024-03-23 00:44:14,200 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-03-23 00:44:14,200 [ scc.merge] INFO
2024-03-23 00:44:14,200 [ scc.merge] INFO Repository: ome/omero-metadata
2024-03-23 00:44:14,200 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,200 [ scc.merge] INFO
2024-03-23 00:44:14,200 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-23 00:44:14,200 [ scc.merge] INFO
2024-03-23 00:44:14,200 [ scc.merge] INFO Repository: ome/omero-parade
2024-03-23 00:44:14,200 [ scc.merge] INFO Excluded PRs:
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-03-23 00:44:14,200 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-03-23 00:44:14,201 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,201 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-23 00:44:14,201 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-23 00:44:14,201 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-03-23 00:44:14,201 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,201 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO Repository: ome/omero-rois
2024-03-23 00:44:14,201 [ scc.merge] INFO Excluded PRs:
2024-03-23 00:44:14,201 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-23 00:44:14,201 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,201 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO Repository: ome/omero-signup
2024-03-23 00:44:14,201 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-23 00:44:14,201 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-03-23 00:44:14,201 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO Merged PRs:
2024-03-23 00:44:14,201 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO Repository: ome/omero-upload
2024-03-23 00:44:14,201 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO
2024-03-23 00:44:14,201 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-03-23 00:44:14,201 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-03-23 00:44:14,202 [ scc.merge] INFO Excluded PRs:
2024-03-23 00:44:14,202 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-03-23 00:44:14,202 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-23 00:44:14,202 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-03-23 00:44:14,202 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-03-23 00:44:14,202 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-03-23 00:44:14,202 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-23 00:44:14,202 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] INFO Repository: ome/scripts
2024-03-23 00:44:14,202 [ scc.merge] INFO Excluded PRs:
2024-03-23 00:44:14,202 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-03-23 00:44:14,202 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-03-23 00:44:14,202 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-03-23 00:44:14,202 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-03-23 00:44:14,202 [ scc.merge] INFO Already up to date.
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-23 00:44:14,202 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-23 00:44:14,202 [ scc.merge] INFO
2024-03-23 00:44:14,202 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-23 00:44:14,203 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-03-23 00:44:14,208 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-03-23 00:44:14,213 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-03-23 00:44:14,218 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-03-23 00:44:14,222 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-03-23 00:44:14,227 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-23 00:44:14,232 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-23 00:44:14,236 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-23 00:44:14,240 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-23 00:44:14,245 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-23 00:44:14,249 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-23 00:44:14,253 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-23 00:44:14,258 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-23 00:44:14,263 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-23 00:44:14,268 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-23 00:44:14,273 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-23 00:44:14,278 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-23 00:44:14,283 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-23 00:44:14,287 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-23 00:44:14,291 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-23 00:44:14,296 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-23 00:44:14,301 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-23 00:44:14,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-23 00:44:14,305 [ scc.git] DEBUG Calling 'git remote'
2024-03-23 00:44:14,310 [ 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 2d1be24] 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 ab0459a] 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-23 00:44:59,872 [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-23 00:45:08,922 [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-23 00:45:11,368 [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-23 00:45:15,870 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-03-23 00:46:06,413 [ 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}
