Skipping 136 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-26 10:26:17,896 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-26 10:26:17,896 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-26 10:26:17,896 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-26 10:26:17,896 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-26 10:26:17,896 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-26 10:26:17,896 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-26 10:26:17,896 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-26 10:26:17,896 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-26 10:26:17,896 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-26 10:26:17,896 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-26 10:26:17,897 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-26 10:26:17,897 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-26 10:26:17,897 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-26 10:26:17,897 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-26 10:26:17,897 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-26 10:26:17,897 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-26 10:26:17,897 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-26 10:26:18,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:18,059 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05cb9d985242252c32324050a4895e2c03203f54'
2024-04-26 10:26:18,082 [ scc.git] ERROR stderr (git diff --name-only HEAD...05cb9d985242252c32324050a4895e2c03203f54): warning: HEAD...05cb9d985242252c32324050a4895e2c03203f54: multiple merge bases, using 852b5109c4c0503d2740da64714512e83c619db0
2024-04-26 10:26:18,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:18,086 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 05cb9d985242252c32324050a4895e2c03203f54'
2024-04-26 10:26:18,122 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-04-26 10:26:18,122 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-04-26 10:26:18,123 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:18,127 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-04-26 10:26:18,127 [ scc.git] DEBUG src/js/models/panel_model.js | 76 +++++++++++++++++++++++++++++++++++
2024-04-26 10:26:18,127 [ scc.git] DEBUG src/js/views/figure_view.js | 7 +++-
2024-04-26 10:26:18,127 [ scc.git] DEBUG src/js/views/right_panel_view.js | 63 ++++++++++++++++++++++++++++-
2024-04-26 10:26:18,127 [ scc.git] DEBUG src/js/views/util.js | 54 +++++++++++++++++++++++++
2024-04-26 10:26:18,127 [ scc.git] DEBUG src/templates/rois_form.template.html | 9 +++++
2024-04-26 10:26:18,127 [ scc.git] DEBUG 6 files changed, 214 insertions(+), 3 deletions(-)
2024-04-26 10:26:18,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:18,471 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7d25b9fb49959ba7f143c70927573efb62c9667e'
2024-04-26 10:26:18,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:18,483 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 553 (Figure_To_Pdf: use max plane size to select the appropriate zoom level) 7d25b9fb49959ba7f143c70927573efb62c9667e'
2024-04-26 10:26:18,517 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:18,521 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-26 10:26:18,521 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-26 10:26:18,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:18,874 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-26 10:26:18,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:18,886 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-26 10:26:18,947 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:18,949 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-04-26 10:26:18,949 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-26 10:26:19,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:19,286 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...82f12dc78b15d251eadaf4ff5cb06371ee8eaa84'
2024-04-26 10:26:19,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:19,296 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 82f12dc78b15d251eadaf4ff5cb06371ee8eaa84'
2024-04-26 10:26:19,310 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:19,314 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-04-26 10:26:19,314 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-04-26 10:26:19,314 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-04-26 10:26:19,314 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 479 ++++++++++++++++++++++-
2024-04-26 10:26:19,314 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-04-26 10:26:19,314 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-04-26 10:26:19,314 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-04-26 10:26:19,314 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-04-26 10:26:19,315 [ scc.git] DEBUG 8 files changed, 501 insertions(+), 7 deletions(-)
2024-04-26 10:26:19,315 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-04-26 10:26:19,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:19,699 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:26:19,735 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:19,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:19,739 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:26:19,774 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:26:19,781 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed16cabe0> has no local changes
2024-04-26 10:26:19,781 [ 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 549 will-moore 'Inset feature'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
Generated by OMERO-plugins-push#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:26:19,791 [ scc.git] DEBUG [detached HEAD 3c6f450b] merge master -Dorg -Ssuccess-only
2024-04-26 10:26:19,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:26:19,791 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:26:20,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-26 10:26:20,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-26 10:26:21,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-26 10:26:21,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-26 10:26:22,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:26:22,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-26 10:26:23,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:26:23,069 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-26 10:26:23,069 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:26:23,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-26 10:26:23,069 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:23,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:23,074 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:26:23,079 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:26:23,079 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:26:23,084 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:26:23,089 [ scc.git] DEBUG Already up to date.
2024-04-26 10:26:23,090 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-26 10:26:23,495 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-26 10:26:23,495 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-26 10:26:23,498 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:26:23,499 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:23,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:23,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-26 10:26:23,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:23,512 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-26 10:26:23,534 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-26 10:26:23,535 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:23,537 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-26 10:26:23,537 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-26 10:26:23,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:23,697 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:26:23,731 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:23,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:23,736 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:26:23,770 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:26:23,775 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed16ab550> has no local changes
2024-04-26 10:26:23,775 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:26:23,782 [ scc.git] DEBUG [detached HEAD 90ae3ed] merge master -Dorg -Ssuccess-only
2024-04-26 10:26:23,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:26:23,783 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:26:24,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-26 10:26:24,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-26 10:26:24,659 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-26 10:26:25,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-26 10:26:25,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:26:26,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 10:26:26,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-26 10:26:27,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:26:27,212 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-26 10:26:27,212 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:26:27,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-26 10:26:27,212 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:27,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:27,217 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:26:27,221 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:26:27,222 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:26:27,226 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:26:27,231 [ scc.git] DEBUG Already up to date.
2024-04-26 10:26:27,231 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-26 10:26:27,629 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-26 10:26:27,629 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-26 10:26:27,632 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:26:27,632 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:27,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:27,637 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-26 10:26:27,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:27,646 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-26 10:26:27,655 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:27,658 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-26 10:26:27,658 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-26 10:26:27,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:27,826 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:26:27,861 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:27,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:27,865 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:26:27,899 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:26:27,905 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed169e9d0> has no local changes
2024-04-26 10:26:27,906 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:26:27,914 [ scc.git] DEBUG [detached HEAD 9fb3656] merge master -Dorg -Ssuccess-only
2024-04-26 10:26:27,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:26:27,914 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:26:28,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-26 10:26:28,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474 HTTP/1.1" 200 None
2024-04-26 10:26:29,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1 HTTP/1.1" 200 None
2024-04-26 10:26:29,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:26:30,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 10:26:30,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/fb31a249bfe16120da3403c6e450afad9f8db7e1 HTTP/1.1" 200 None
2024-04-26 10:26:31,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/fb31a249bfe16120da3403c6e450afad9f8db7e1?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:26:31,096 [ scc.repo] DEBUG - PR 474 will-moore 'Img data error handling'
2024-04-26 10:26:31,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-04-26 10:26:32,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-04-26 10:26:32,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-26 10:26:33,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:26:33,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 10:26:33,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-26 10:26:34,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:26:34,385 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-26 10:26:34,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-26 10:26:35,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-26 10:26:35,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-26 10:26:36,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:26:36,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 10:26:37,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-26 10:26:37,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:26:37,771 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-26 10:26:38,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-26 10:26:38,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-26 10:26:39,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:26:39,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 10:26:40,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-26 10:26:40,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:26:40,651 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-26 10:26:41,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-26 10:26:41,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-26 10:26:42,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-26 10:26:42,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:26:43,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 10:26:43,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-26 10:26:43,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:26:43,935 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-26 10:26:44,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-26 10:26:44,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-26 10:26:45,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-26 10:26:45,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:26:46,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-26 10:26:46,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:26:46,677 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-26 10:26:46,677 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:26:46,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-26 10:26:46,677 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:46,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:46,683 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:26:46,687 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:26:46,687 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:26:46,692 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:26:46,697 [ scc.git] DEBUG Already up to date.
2024-04-26 10:26:46,697 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-26 10:26:47,157 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 10:26:47,157 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-26 10:26:47,160 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-26 10:26:48,767 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 10:26:48,767 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-26 10:26:48,771 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-26 10:26:49,292 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 10:26:49,292 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-26 10:26:49,297 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-26 10:26:50,548 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 10:26:50,548 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-26 10:26:50,552 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-04-26 10:26:50,960 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 10:26:50,960 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-04-26 10:26:50,963 [ scc.git] DEBUG Calling 'git fetch origin pull/474/head'
2024-04-26 10:26:51,723 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-26 10:26:51,724 [ scc.git] DEBUG * branch refs/pull/474/head -> FETCH_HEAD
2024-04-26 10:26:51,728 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:26:51,728 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:51,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:51,733 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-26 10:26:51,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:51,742 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-26 10:26:51,754 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:51,757 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-26 10:26:51,757 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-26 10:26:51,757 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-26 10:26:51,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:51,909 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-26 10:26:51,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:51,919 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-26 10:26:52,045 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:52,049 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-26 10:26:52,050 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-26 10:26:52,050 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-26 10:26:52,050 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-26 10:26:52,050 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-26 10:26:52,050 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-26 10:26:52,050 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-26 10:26:52,050 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-26 10:26:52,050 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-26 10:26:52,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:52,325 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-26 10:26:52,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:52,335 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-26 10:26:52,362 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:52,364 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-26 10:26:52,364 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-26 10:26:52,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:52,739 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-26 10:26:52,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:52,749 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-26 10:26:52,833 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-26 10:26:52,834 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:52,839 [ scc.git] DEBUG css/app.css | 30 +++++++
2024-04-26 10:26:52,839 [ scc.git] DEBUG src/controls/dimension-slider.js | 6 +-
2024-04-26 10:26:52,839 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-26 10:26:52,839 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-26 10:26:52,839 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 4 +-
2024-04-26 10:26:52,839 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 165 +++++++++++++++++++++++++------------
2024-04-26 10:26:52,839 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 61 +++++++++++++-
2024-04-26 10:26:52,839 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-26 10:26:52,839 [ scc.git] DEBUG 8 files changed, 228 insertions(+), 63 deletions(-)
2024-04-26 10:26:53,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:53,144 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-26 10:26:53,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:53,155 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-26 10:26:53,232 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-04-26 10:26:53,232 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:53,235 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-04-26 10:26:53,235 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-04-26 10:26:53,235 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-04-26 10:26:53,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:53,549 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb31a249bfe16120da3403c6e450afad9f8db7e1'
2024-04-26 10:26:53,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:53,559 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 474 (Img data error handling) fb31a249bfe16120da3403c6e450afad9f8db7e1'
2024-04-26 10:26:53,663 [ scc.git] DEBUG Auto-merging css/app.css
2024-04-26 10:26:53,663 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-04-26 10:26:53,663 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-04-26 10:26:53,663 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:53,667 [ scc.git] DEBUG css/app.css | 4 ++++
2024-04-26 10:26:53,667 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 11 ++++++-----
2024-04-26 10:26:53,667 [ scc.git] DEBUG src/model/image_info.js | 41 +++++++++++++++++++++++++++++++++++++++++
2024-04-26 10:26:53,667 [ scc.git] DEBUG 3 files changed, 51 insertions(+), 5 deletions(-)
2024-04-26 10:26:53,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:53,995 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:26:54,031 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:54,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:54,035 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:26:54,069 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:26:54,076 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed16845b0> has no local changes
2024-04-26 10:26:54,076 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
Generated by OMERO-plugins-push#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:26:54,084 [ scc.git] DEBUG [detached HEAD 2bfd8b2] merge master -Dorg -Ssuccess-only
2024-04-26 10:26:54,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:26:54,084 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:26:54,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-26 10:26:54,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-26 10:26:55,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-26 10:26:55,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-26 10:26:56,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:26:56,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 10:26:57,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-26 10:26:57,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:26:57,874 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-26 10:26:57,874 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:26:57,874 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-26 10:26:57,874 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:57,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:57,880 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:26:57,884 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:26:57,884 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:26:57,889 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:26:57,894 [ scc.git] DEBUG Already up to date.
2024-04-26 10:26:57,894 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-26 10:26:58,270 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-26 10:26:58,270 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-26 10:26:58,274 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:26:58,274 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:58,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:58,279 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-26 10:26:58,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:58,288 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-26 10:26:58,297 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:26:58,300 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-26 10:26:58,300 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-26 10:26:58,300 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-26 10:26:58,300 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-26 10:26:58,300 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-26 10:26:58,300 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-26 10:26:58,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:26:58,451 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:26:58,486 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:26:58,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:26:58,490 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:26:58,525 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:26:58,530 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed16824f0> has no local changes
2024-04-26 10:26:58,530 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:26:58,538 [ scc.git] DEBUG [detached HEAD f122130] merge master -Dorg -Ssuccess-only
2024-04-26 10:26:58,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:26:58,538 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:26:58,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-26 10:26:59,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-26 10:26:59,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-26 10:27:00,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-26 10:27:00,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:01,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-26 10:27:01,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:01,835 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-26 10:27:02,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-26 10:27:02,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-26 10:27:03,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-26 10:27:03,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:04,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-26 10:27:04,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:04,645 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-26 10:27:04,645 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:04,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-26 10:27:04,645 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:04,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:04,651 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:27:04,655 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:04,655 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:27:04,660 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:27:04,664 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:04,665 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-26 10:27:05,521 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-26 10:27:05,521 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-26 10:27:05,525 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-26 10:27:06,132 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-26 10:27:06,132 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-26 10:27:06,136 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:06,136 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:06,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:06,141 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-26 10:27:06,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:06,151 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-26 10:27:06,204 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-26 10:27:06,204 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-26 10:27:06,204 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-26 10:27:06,204 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-26 10:27:06,204 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 10:27:06,204 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 10:27:06,209 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-26 10:27:06,215 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-26 10:27:06,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:06,370 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-26 10:27:06,375 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-26 10:27:06,380 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#43](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-26 10:27:06,384 [ scc.config] DEBUG Found github.token
2024-04-26 10:27:06,385 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-26 10:27:06,385 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-26 10:27:06,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:06,395 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-26 10:27:06,422 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-26 10:27:06,422 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-26 10:27:06,422 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-26 10:27:06,422 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 10:27:06,422 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 10:27:06,427 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-26 10:27:06,433 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-26 10:27:06,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:06,779 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-26 10:27:06,785 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-26 10:27:06,790 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#43](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-04-26 10:27:06,794 [ scc.config] DEBUG Found github.token
2024-04-26 10:27:06,794 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-26 10:27:06,794 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:06,829 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:06,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:06,833 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:06,868 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:06,874 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed1684550> has no local changes
2024-04-26 10:27:06,875 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:06,883 [ scc.git] DEBUG [detached HEAD fa1d6d0] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:06,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:06,883 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:07,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-26 10:27:07,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-26 10:27:07,785 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-26 10:27:08,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-26 10:27:08,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:09,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 10:27:09,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-26 10:27:10,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:10,353 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-26 10:27:10,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-26 10:27:10,805 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-26 10:27:11,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-26 10:27:11,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:12,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 10:27:12,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-26 10:27:13,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:13,197 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-26 10:27:13,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-26 10:27:13,702 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-26 10:27:14,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-26 10:27:14,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:15,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 10:27:15,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-26 10:27:16,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:16,185 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-26 10:27:16,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-26 10:27:17,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-26 10:27:17,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-26 10:27:18,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-26 10:27:18,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-26 10:27:19,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-26 10:27:19,104 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:19,104 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-26 10:27:19,105 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:19,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:19,110 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:27:19,114 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:19,114 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:27:19,119 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:27:19,124 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:19,124 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-26 10:27:19,518 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-26 10:27:19,518 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-26 10:27:19,523 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-26 10:27:19,897 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-26 10:27:19,897 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-26 10:27:19,901 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-26 10:27:20,274 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-26 10:27:20,274 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-26 10:27:20,279 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:20,279 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:20,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:20,284 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-26 10:27:20,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:20,293 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-26 10:27:20,302 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:27:20,304 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-26 10:27:20,304 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-26 10:27:20,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:20,450 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-26 10:27:20,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:20,460 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-26 10:27:20,542 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-26 10:27:20,543 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:27:20,546 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-26 10:27:20,546 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-26 10:27:20,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:20,856 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-26 10:27:20,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:20,866 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-26 10:27:20,934 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-26 10:27:20,934 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:27:20,937 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-26 10:27:20,937 [ scc.git] DEBUG package.json | 2 +-
2024-04-26 10:27:20,937 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-26 10:27:21,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:21,268 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:21,304 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:21,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:21,308 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:21,342 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:21,348 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed16b2fd0> has no local changes
2024-04-26 10:27:21,348 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:21,355 [ scc.git] DEBUG [detached HEAD 0936081] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:21,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:21,355 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:21,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-26 10:27:22,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-26 10:27:22,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-26 10:27:23,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:23,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-26 10:27:24,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:24,038 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-26 10:27:24,038 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:24,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-26 10:27:24,038 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:24,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:24,043 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:27:24,048 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:24,048 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:27:24,052 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:27:24,057 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:24,057 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-26 10:27:24,449 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-26 10:27:24,449 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-26 10:27:24,453 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:24,453 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:24,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:24,458 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-26 10:27:24,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:24,467 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-26 10:27:24,475 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:27:24,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:24,635 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:24,670 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:24,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:24,674 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:24,709 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:24,714 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed061b340> has no local changes
2024-04-26 10:27:24,715 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:24,722 [ scc.git] DEBUG [detached HEAD eabc248] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:24,723 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:24,723 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:25,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-26 10:27:25,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-26 10:27:26,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-26 10:27:26,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-26 10:27:27,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-26 10:27:27,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:28,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-26 10:27:28,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:28,477 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-26 10:27:28,477 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:28,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-26 10:27:28,477 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:28,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:28,483 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:27:28,487 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:28,487 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:27:28,492 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:27:28,497 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:28,497 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-26 10:27:28,908 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-26 10:27:28,908 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-26 10:27:28,912 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:28,912 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:28,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:28,917 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-26 10:27:28,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:28,926 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-26 10:27:28,935 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-26 10:27:28,936 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:27:28,938 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-26 10:27:28,938 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-26 10:27:29,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:29,104 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:29,140 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:29,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:29,144 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:29,180 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:29,185 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed06395b0> has no local changes
2024-04-26 10:27:29,185 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:29,192 [ scc.git] DEBUG [detached HEAD c8acba2] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:29,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:29,192 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:29,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-26 10:27:30,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-26 10:27:30,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-26 10:27:31,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-26 10:27:31,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:32,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-26 10:27:32,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:32,437 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-26 10:27:32,437 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:32,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-26 10:27:32,437 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:32,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:32,442 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:27:32,447 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:32,447 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:27:32,451 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:27:32,456 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:32,457 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-26 10:27:32,914 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-26 10:27:32,914 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-26 10:27:32,918 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:32,918 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:32,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:32,923 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-26 10:27:32,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:32,932 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-26 10:27:32,973 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-26 10:27:32,973 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-26 10:27:32,973 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-26 10:27:32,973 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-26 10:27:32,973 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-26 10:27:32,973 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-26 10:27:32,973 [ scc.git] DEBUG Auto-merging setup.py
2024-04-26 10:27:32,973 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-26 10:27:32,973 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 10:27:32,974 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 10:27:32,978 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-26 10:27:32,984 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-26 10:27:33,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:33,137 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-26 10:27:33,142 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-26 10:27:33,147 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#43](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2024-04-26 10:27:33,151 [ scc.config] DEBUG Found github.token
2024-04-26 10:27:33,151 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-26 10:27:33,151 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:33,188 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:33,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:33,194 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:33,228 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:33,234 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed169ee80> has no local changes
2024-04-26 10:27:33,234 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:33,242 [ scc.git] DEBUG [detached HEAD 04582e2] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:33,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:33,242 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:33,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-26 10:27:34,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-26 10:27:34,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-26 10:27:35,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-26 10:27:35,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:35,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-26 10:27:36,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:36,441 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-26 10:27:36,441 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:36,441 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-26 10:27:36,441 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:36,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:36,446 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:27:36,451 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:36,451 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:27:36,456 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:27:36,460 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:36,461 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-26 10:27:37,027 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-26 10:27:37,027 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-26 10:27:37,030 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:37,031 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:37,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:37,035 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-26 10:27:37,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:37,046 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-04-26 10:27:37,117 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 10:27:37,119 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-26 10:27:37,119 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-26 10:27:37,119 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-26 10:27:37,119 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-26 10:27:37,119 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-26 10:27:37,119 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-26 10:27:37,121 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-26 10:27:37,121 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-26 10:27:37,121 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-26 10:27:37,121 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-26 10:27:37,122 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-26 10:27:37,122 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-26 10:27:37,122 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-26 10:27:37,123 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-26 10:27:37,123 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-26 10:27:37,123 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-26 10:27:37,123 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-26 10:27:37,123 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-26 10:27:37,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:37,281 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:37,315 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:37,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:37,320 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:37,354 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:37,359 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed16b2df0> has no local changes
2024-04-26 10:27:37,360 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:37,368 [ scc.git] DEBUG [detached HEAD 2ed9f72] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:37,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:37,368 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:37,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-26 10:27:37,715 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:37,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-26 10:27:37,715 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:37,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:37,720 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:27:37,724 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:37,724 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:27:37,729 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:27:37,734 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:37,734 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:37,734 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:37,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:37,739 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:37,774 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:37,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:37,778 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:37,812 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:37,817 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed0670fa0> has no local changes
2024-04-26 10:27:37,818 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:37,825 [ scc.git] DEBUG [detached HEAD 1ff56ca] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:37,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:37,826 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:38,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-26 10:27:38,149 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:38,149 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-26 10:27:38,149 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:38,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:38,154 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:27:38,158 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:38,158 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:27:38,163 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:27:38,168 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:38,168 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:38,168 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:38,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:38,172 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:38,207 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:38,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:38,211 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:38,245 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:38,250 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed0602f70> has no local changes
2024-04-26 10:27:38,250 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:38,257 [ scc.git] DEBUG [detached HEAD 63befe3] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:38,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:38,258 [ scc.git] INFO Overriding base-branch from master to main
2024-04-26 10:27:38,258 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:38,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-26 10:27:39,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-26 10:27:39,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-26 10:27:40,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-26 10:27:40,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-26 10:27:41,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:41,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-26 10:27:42,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-26 10:27:42,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:42,415 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-26 10:27:42,415 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:42,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-26 10:27:42,415 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:42,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:42,420 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-26 10:27:42,424 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:42,425 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-26 10:27:42,429 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-26 10:27:42,434 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:42,434 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-26 10:27:43,092 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-26 10:27:43,092 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-26 10:27:43,096 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:43,096 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:43,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:43,101 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-26 10:27:43,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:43,110 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-26 10:27:43,201 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-26 10:27:43,201 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-26 10:27:43,201 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 10:27:43,201 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 10:27:43,206 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-26 10:27:43,211 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-26 10:27:43,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:43,358 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-26 10:27:43,363 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-26 10:27:43,367 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#43](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-26 10:27:43,372 [ scc.config] DEBUG Found github.token
2024-04-26 10:27:43,372 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-26 10:27:43,372 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:43,406 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:43,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:43,411 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:43,444 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:43,449 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed05f4430> has no local changes
2024-04-26 10:27:43,450 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:43,457 [ scc.git] DEBUG [detached HEAD 93ca4a9] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:43,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:43,457 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:43,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-26 10:27:43,801 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:43,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-26 10:27:43,801 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:43,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:43,806 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:27:43,810 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:43,810 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:27:43,815 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:27:43,819 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:43,820 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:43,820 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:43,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:43,824 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:43,858 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:43,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:43,863 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:43,896 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:43,901 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed0631e50> has no local changes
2024-04-26 10:27:43,901 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:43,908 [ scc.git] DEBUG [detached HEAD 61e9f66] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:43,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:43,909 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:44,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-26 10:27:44,235 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:44,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-26 10:27:44,235 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:44,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:44,240 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:27:44,244 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:44,244 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:27:44,249 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:27:44,254 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:44,254 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:44,254 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:44,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:44,258 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:44,294 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:44,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:44,298 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:44,332 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:44,338 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed053b940> has no local changes
2024-04-26 10:27:44,338 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:44,345 [ scc.git] DEBUG [detached HEAD 986bc54] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:44,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:44,346 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:44,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-26 10:27:45,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-26 10:27:45,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-26 10:27:46,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-26 10:27:46,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:47,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-26 10:27:47,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:47,482 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-26 10:27:47,482 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:47,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-26 10:27:47,482 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:47,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:47,487 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 10:27:47,491 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:47,492 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 10:27:47,496 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 10:27:47,501 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:47,502 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-26 10:27:47,975 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-26 10:27:47,975 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-26 10:27:47,979 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:47,979 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:47,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:47,983 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-26 10:27:47,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:47,993 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-26 10:27:48,022 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-26 10:27:48,022 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-26 10:27:48,022 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 10:27:48,023 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 10:27:48,027 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-26 10:27:48,033 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-26 10:27:48,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:48,196 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-26 10:27:48,201 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-26 10:27:48,206 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#43](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-26 10:27:48,210 [ scc.config] DEBUG Found github.token
2024-04-26 10:27:48,210 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-26 10:27:48,210 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:48,244 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:48,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:48,249 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:48,283 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:48,288 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed057a310> has no local changes
2024-04-26 10:27:48,288 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:48,296 [ scc.git] DEBUG [detached HEAD 332f873] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:48,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:48,296 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-26 10:27:48,296 [ scc.repo] DEBUG ## PRs found:
2024-04-26 10:27:48,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-26 10:27:49,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-26 10:27:49,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-26 10:27:50,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-26 10:27:50,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-26 10:27:51,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-26 10:27:51,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-26 10:27:52,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-26 10:27:52,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-26 10:27:53,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-26 10:27:53,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-26 10:27:53,600 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-26 10:27:54,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-26 10:27:54,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-26 10:27:55,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-26 10:27:55,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-26 10:27:55,647 [ scc.repo] DEBUG ## Branches found:
2024-04-26 10:27:55,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-26 10:27:55,647 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:55,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:55,652 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-26 10:27:55,657 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 10:27:55,657 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-26 10:27:55,662 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-26 10:27:55,666 [ scc.git] DEBUG Already up to date.
2024-04-26 10:27:55,667 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-26 10:27:56,084 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-26 10:27:56,084 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-26 10:27:56,088 [ scc.git] DEBUG ## Unique users: []
2024-04-26 10:27:56,088 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:56,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:56,093 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-26 10:27:56,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:56,103 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-26 10:27:56,150 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-26 10:27:56,151 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-26 10:27:56,151 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 10:27:56,151 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 10:27:56,155 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-26 10:27:56,161 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-26 10:27:56,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:56,300 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-26 10:27:56,306 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-26 10:27:56,311 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#43](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-26 10:27:56,315 [ scc.config] DEBUG Found github.token
2024-04-26 10:27:56,315 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-26 10:27:56,315 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 10:27:56,350 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 10:27:56,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 10:27:56,354 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:56,388 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:27:56,393 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed053bbb0> has no local changes
2024-04-26 10:27:56,393 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:27:56,401 [ scc.git] DEBUG [detached HEAD fd22a96] merge master -Dorg -Ssuccess-only
2024-04-26 10:27:56,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:27:56,401 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 10:27:56,468 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-26 10:27:56,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:56,718 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-26 10:27:56,722 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-26 10:27:57,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:57,126 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-26 10:27:57,130 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-26 10:27:57,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:57,538 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-26 10:27:57,542 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-26 10:27:57,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:57,943 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-26 10:27:58,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:58,342 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-26 10:27:58,346 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-26 10:27:58,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:58,742 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-26 10:27:58,746 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-26 10:27:59,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:59,155 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-26 10:27:59,159 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-26 10:27:59,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:59,561 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-26 10:27:59,565 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-26 10:27:59,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:27:59,970 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-26 10:27:59,974 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-26 10:28:00,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:00,386 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-26 10:28:00,391 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-26 10:28:00,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:00,801 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-26 10:28:00,805 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-26 10:28:01,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:01,219 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-26 10:28:01,223 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-26 10:28:01,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:01,660 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-26 10:28:02,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:02,073 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-26 10:28:02,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:02,480 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-26 10:28:02,484 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-26 10:28:02,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:02,904 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-26 10:28:03,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:03,312 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-26 10:28:03,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:03,706 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-26 10:28:03,710 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-26 10:28:04,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:04,111 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-26 10:28:04,115 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-26 10:28:04,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:04,518 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-26 10:28:04,522 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-26 10:28:04,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:04,934 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-26 10:28:04,938 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-26 10:28:05,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 10:28:05,335 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-26 10:28:05,336 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 10:28:05,408 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feed2839ac0> has local changes
2024-04-26 10:28:05,409 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
- PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 549 will-moore 'Inset feature'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/43/)'
2024-04-26 10:28:05,421 [ scc.git] DEBUG [detached HEAD 1254345] merge master -Dorg -Ssuccess-only
2024-04-26 10:28:05,422 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-26 10:28:05,422 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-26 10:28:05,422 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,422 [ scc.merge] INFO
2024-04-26 10:28:05,422 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,422 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-04-26 10:28:05,422 [ scc.merge] INFO - PR 363 dependabot[bot] 'Bump omero-figure from `ded0caa` to `87d179a`'
2024-04-26 10:28:05,422 [ scc.merge] INFO
2024-04-26 10:28:05,422 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-26 10:28:05,422 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,422 [ scc.merge] INFO
2024-04-26 10:28:05,422 [ scc.merge] INFO
2024-04-26 10:28:05,422 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-26 10:28:05,422 [ scc.merge] INFO Excluded PRs:
2024-04-26 10:28:05,422 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-26 10:28:05,422 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,422 [ scc.merge] INFO
2024-04-26 10:28:05,422 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,422 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-26 10:28:05,422 [ scc.merge] INFO
2024-04-26 10:28:05,422 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-26 10:28:05,422 [ scc.merge] INFO Excluded PRs:
2024-04-26 10:28:05,422 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-26 10:28:05,422 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-26 10:28:05,423 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,423 [ scc.merge] INFO
2024-04-26 10:28:05,423 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-26 10:28:05,423 [ scc.merge] INFO
2024-04-26 10:28:05,423 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-26 10:28:05,423 [ scc.merge] INFO Excluded PRs:
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-26 10:28:05,423 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,423 [ scc.merge] INFO
2024-04-26 10:28:05,423 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-26 10:28:05,423 [ scc.merge] INFO
2024-04-26 10:28:05,423 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-26 10:28:05,423 [ scc.merge] INFO
2024-04-26 10:28:05,423 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-26 10:28:05,423 [ scc.merge] INFO Excluded PRs:
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-26 10:28:05,423 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,423 [ scc.merge] INFO
2024-04-26 10:28:05,423 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-04-26 10:28:05,423 [ scc.merge] INFO
2024-04-26 10:28:05,423 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-26 10:28:05,423 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,423 [ scc.merge] INFO
2024-04-26 10:28:05,423 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,423 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-26 10:28:05,424 [ scc.merge] INFO
2024-04-26 10:28:05,424 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-26 10:28:05,424 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,424 [ scc.merge] INFO
2024-04-26 10:28:05,424 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-26 10:28:05,424 [ scc.merge] INFO
2024-04-26 10:28:05,424 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-26 10:28:05,424 [ scc.merge] INFO Excluded PRs:
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-26 10:28:05,424 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,424 [ scc.merge] INFO
2024-04-26 10:28:05,424 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 474 will-moore 'Img data error handling'
2024-04-26 10:28:05,424 [ scc.merge] INFO
2024-04-26 10:28:05,424 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-26 10:28:05,424 [ scc.merge] INFO Excluded PRs:
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-26 10:28:05,424 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,424 [ scc.merge] INFO
2024-04-26 10:28:05,424 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-26 10:28:05,424 [ scc.merge] INFO
2024-04-26 10:28:05,424 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-26 10:28:05,424 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,424 [ scc.merge] INFO
2024-04-26 10:28:05,424 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-26 10:28:05,424 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-26 10:28:05,424 [ scc.merge] INFO
2024-04-26 10:28:05,424 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-26 10:28:05,425 [ scc.merge] INFO Excluded PRs:
2024-04-26 10:28:05,425 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-26 10:28:05,425 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-26 10:28:05,425 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-26 10:28:05,425 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,425 [ scc.merge] INFO
2024-04-26 10:28:05,425 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,425 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-26 10:28:05,425 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-26 10:28:05,425 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-26 10:28:05,425 [ scc.merge] INFO
2024-04-26 10:28:05,425 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-26 10:28:05,425 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,425 [ scc.merge] INFO
2024-04-26 10:28:05,425 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,425 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-26 10:28:05,425 [ scc.merge] INFO
2024-04-26 10:28:05,425 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-26 10:28:05,425 [ scc.merge] INFO Excluded PRs:
2024-04-26 10:28:05,425 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-26 10:28:05,425 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,425 [ scc.merge] INFO
2024-04-26 10:28:05,425 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,425 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-26 10:28:05,425 [ scc.merge] INFO
2024-04-26 10:28:05,425 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-26 10:28:05,425 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,425 [ scc.merge] INFO
2024-04-26 10:28:05,425 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 10:28:05,425 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-26 10:28:05,425 [ scc.merge] INFO
2024-04-26 10:28:05,425 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-26 10:28:05,425 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,425 [ scc.merge] INFO
2024-04-26 10:28:05,425 [ scc.merge] INFO Merged PRs:
2024-04-26 10:28:05,425 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-26 10:28:05,425 [ scc.merge] INFO
2024-04-26 10:28:05,425 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-26 10:28:05,426 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-26 10:28:05,426 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-26 10:28:05,426 [ scc.merge] INFO Excluded PRs:
2024-04-26 10:28:05,426 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-26 10:28:05,426 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 10:28:05,426 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-26 10:28:05,426 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-26 10:28:05,426 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-26 10:28:05,426 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 10:28:05,426 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,426 [ scc.merge] INFO Repository: ome/scripts
2024-04-26 10:28:05,426 [ scc.merge] INFO Excluded PRs:
2024-04-26 10:28:05,426 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-26 10:28:05,426 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-26 10:28:05,426 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-26 10:28:05,426 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-26 10:28:05,426 [ scc.merge] INFO Already up to date.
2024-04-26 10:28:05,426 [ scc.merge] INFO
2024-04-26 10:28:05,427 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 10:28:05,427 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-26 10:28:05,427 [ scc.merge] INFO
2024-04-26 10:28:05,427 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-26 10:28:05,427 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-26 10:28:05,431 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-26 10:28:05,436 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-26 10:28:05,440 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-26 10:28:05,445 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-26 10:28:05,449 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-26 10:28:05,454 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-26 10:28:05,459 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-26 10:28:05,464 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-26 10:28:05,468 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-26 10:28:05,473 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-26 10:28:05,478 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-26 10:28:05,482 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-26 10:28:05,487 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-26 10:28:05,491 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-26 10:28:05,495 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-26 10:28:05,500 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-26 10:28:05,504 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,508 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-26 10:28:05,509 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-26 10:28:05,513 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-26 10:28:05,517 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-26 10:28:05,522 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-26 10:28:05,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-26 10:28:05,526 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 10:28:05,530 [ 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 66b69b9] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 87d179a0
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 9d8d147
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD 1439f63] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-04-26 10:28:51,805 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-04-26 10:29:00,777 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-04-26 10:29:03,482 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-26 10:29:08,120 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-26 10:29:54,749 [ 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}
