Skipping 116 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-08-27 17:34:10,506 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-27 17:34:10,506 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-27 17:34:10,506 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-27 17:34:10,506 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:10,513 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-27 17:34:10,513 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-27 17:34:10,513 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-27 17:34:10,513 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-27 17:34:10,513 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-27 17:34:10,513 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-27 17:34:10,513 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-27 17:34:10,513 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-27 17:34:10,513 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-27 17:34:10,513 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-27 17:34:10,513 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-27 17:34:10,513 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-27 17:34:10,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:10,711 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...996699f155d2df664d08ff1b8b01c8f6305074be'
2024-08-27 17:34:10,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:10,724 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 996699f155d2df664d08ff1b8b01c8f6305074be'
2024-08-27 17:34:10,762 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-27 17:34:10,763 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-27 17:34:10,763 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-27 17:34:10,763 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-27 17:34:10,763 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-27 17:34:10,763 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-27 17:34:10,763 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:10,770 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-27 17:34:10,770 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-27 17:34:10,770 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-27 17:34:10,770 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-27 17:34:10,770 [ scc.git] DEBUG src/index.html | 1 +
2024-08-27 17:34:10,770 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-27 17:34:10,771 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-27 17:34:10,771 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-27 17:34:10,771 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-27 17:34:10,771 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-27 17:34:10,771 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-27 17:34:10,771 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-27 17:34:10,771 [ scc.git] DEBUG src/templates/image_display_options.template.html | 6 ++-
2024-08-27 17:34:10,771 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-27 17:34:10,771 [ scc.git] DEBUG 14 files changed, 163 insertions(+), 16 deletions(-)
2024-08-27 17:34:11,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:11,106 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-27 17:34:11,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:11,119 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-27 17:34:11,135 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:11,138 [ scc.git] DEBUG setup.py | 2 +-
2024-08-27 17:34:11,138 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-27 17:34:11,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:11,498 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-08-27 17:34:11,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:11,513 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 583 (Add Hilo Checkbox for LUT Toggling in Channel Slider View) b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-08-27 17:34:11,532 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-27 17:34:11,533 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:11,537 [ scc.git] DEBUG src/js/models/panel_model.js | 10 +++++++++
2024-08-27 17:34:11,537 [ scc.git] DEBUG src/js/models/undo.js | 3 ++-
2024-08-27 17:34:11,537 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 42 +++++++++++++++++++++++++++++++++---
2024-08-27 17:34:11,537 [ scc.git] DEBUG src/templates/checkbox_template.html | 4 ++++
2024-08-27 17:34:11,537 [ scc.git] DEBUG 4 files changed, 55 insertions(+), 4 deletions(-)
2024-08-27 17:34:11,537 [ scc.git] DEBUG create mode 100644 src/templates/checkbox_template.html
2024-08-27 17:34:11,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:11,886 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:34:11,924 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:11,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:11,929 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:34:11,966 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:34:11,974 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b14521b50> has no local changes
2024-08-27 17:34:11,974 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (status: failure)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
Generated by OMERO-plugins-push#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:34:11,984 [ scc.git] DEBUG [detached HEAD ce4cdf61] merge master -Dorg -Ssuccess-only
2024-08-27 17:34:11,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:34:11,985 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:34:12,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-27 17:34:12,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-27 17:34:13,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-27 17:34:13,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-27 17:34:14,364 [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-08-27 17:34:14,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-27 17:34:15,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:34:15,280 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-27 17:34:15,280 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:34:15,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-27 17:34:15,280 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:15,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:15,288 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:34:15,294 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:34:15,294 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:34:15,301 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:34:15,308 [ scc.git] DEBUG Already up to date.
2024-08-27 17:34:15,308 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-27 17:34:15,658 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-27 17:34:15,658 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-27 17:34:15,665 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:34:15,665 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:15,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:15,673 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-27 17:34:15,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:15,687 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-27 17:34:15,722 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-27 17:34:15,722 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:15,725 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-27 17:34:15,725 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-27 17:34:15,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:15,888 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:34:15,937 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:15,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:15,945 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:34:15,991 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:34:16,000 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b14578ee0> has no local changes
2024-08-27 17:34:16,000 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:34:16,012 [ scc.git] DEBUG [detached HEAD 6153e63] merge master -Dorg -Ssuccess-only
2024-08-27 17:34:16,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:34:16,013 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:34:16,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-27 17:34:16,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-27 17:34:16,811 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-27 17:34:17,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-27 17:34:17,886 [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-08-27 17:34:18,380 [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-08-27 17:34:18,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-27 17:34:19,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:34:19,178 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-27 17:34:19,178 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:34:19,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-27 17:34:19,178 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:19,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:19,183 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:34:19,188 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:34:19,189 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:34:19,194 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:34:19,199 [ scc.git] DEBUG Already up to date.
2024-08-27 17:34:19,200 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-27 17:34:19,496 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-27 17:34:19,496 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-27 17:34:19,501 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:34:19,501 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:19,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:19,508 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-27 17:34:19,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:19,522 [ 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-08-27 17:34:19,535 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:19,539 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-27 17:34:19,539 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-27 17:34:19,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:19,693 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:34:19,735 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:19,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:19,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:34:19,784 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:34:19,792 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b14521be0> has no local changes
2024-08-27 17:34:19,793 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:34:19,802 [ scc.git] DEBUG [detached HEAD 6571dd5] merge master -Dorg -Ssuccess-only
2024-08-27 17:34:19,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:34:19,803 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:34:20,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-27 17:34:20,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-08-27 17:34:21,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-08-27 17:34:21,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-27 17:34:22,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-27 17:34:22,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-27 17:34:23,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-27 17:34:23,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:34:23,632 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-27 17:34:24,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-27 17:34:24,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-27 17:34:24,554 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-27 17:34:25,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-27 17:34:25,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-27 17:34:26,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-27 17:34:26,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-27 17:34:27,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:34:27,227 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-27 17:34:27,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-27 17:34:27,667 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-27 17:34:28,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-27 17:34:28,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-27 17:34:29,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-27 17:34:29,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-27 17:34:30,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:34:30,134 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-27 17:34:30,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-27 17:34:31,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-27 17:34:31,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-27 17:34:32,011 [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-08-27 17:34:32,482 [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-08-27 17:34:32,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-27 17:34:33,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-08-27 17:34:33,385 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-27 17:34:33,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-27 17:34:34,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-27 17:34:34,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-27 17:34:35,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-27 17:34:35,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-27 17:34:36,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-27 17:34:36,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:34:36,626 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-27 17:34:37,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-27 17:34:37,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-27 17:34:37,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-27 17:34:38,427 [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-08-27 17:34:38,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-27 17:34:39,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:34:39,347 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-27 17:34:39,348 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:34:39,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-27 17:34:39,348 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:39,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:39,356 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:34:39,363 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:34:39,363 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:34:39,415 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:34:39,423 [ scc.git] DEBUG Already up to date.
2024-08-27 17:34:39,423 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-27 17:34:39,917 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-27 17:34:39,918 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-27 17:34:39,922 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-27 17:34:40,857 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-27 17:34:40,858 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-27 17:34:40,862 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-27 17:34:41,253 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-27 17:34:41,253 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-27 17:34:41,259 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-27 17:34:41,569 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-27 17:34:41,569 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-27 17:34:41,573 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-27 17:34:41,852 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-27 17:34:41,852 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-27 17:34:41,856 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-08-27 17:34:42,210 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-27 17:34:42,211 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-08-27 17:34:42,215 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:34:42,215 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:42,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:42,221 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-27 17:34:42,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:42,234 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-27 17:34:42,328 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-27 17:34:42,329 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:42,333 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-27 17:34:42,334 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-27 17:34:42,334 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-27 17:34:42,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:42,475 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-27 17:34:42,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:42,487 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-27 17:34:42,555 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-27 17:34:42,556 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-27 17:34:42,556 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-27 17:34:42,556 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-27 17:34:42,556 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:42,560 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-27 17:34:42,561 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-27 17:34:42,561 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-27 17:34:42,561 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-27 17:34:42,561 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-27 17:34:42,561 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-27 17:34:42,561 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-27 17:34:42,561 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-27 17:34:42,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:42,879 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-27 17:34:42,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:42,891 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-27 17:34:42,927 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-27 17:34:42,928 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:42,931 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-27 17:34:42,931 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-27 17:34:42,931 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-27 17:34:43,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:43,267 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-27 17:34:43,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:43,284 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-27 17:34:43,307 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:43,317 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-27 17:34:43,317 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-27 17:34:43,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:43,649 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-27 17:34:43,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:43,668 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-27 17:34:43,715 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-27 17:34:43,715 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:44,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:44,038 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-08-27 17:34:44,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:44,051 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (Support ?collapse_left/right and ?full_page=true) 7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-08-27 17:34:44,096 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-27 17:34:44,096 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-27 17:34:44,096 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-27 17:34:44,096 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:44,101 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-08-27 17:34:44,101 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-08-27 17:34:44,101 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-08-27 17:34:44,101 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-08-27 17:34:44,101 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-08-27 17:34:44,101 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-08-27 17:34:44,101 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-08-27 17:34:44,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:44,427 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:34:44,469 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:44,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:44,475 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:34:44,516 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:34:44,524 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b14541be0> has no local changes
2024-08-27 17:34:44,524 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- 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 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
Generated by OMERO-plugins-push#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:34:44,534 [ scc.git] DEBUG [detached HEAD ef12bea] merge master -Dorg -Ssuccess-only
2024-08-27 17:34:44,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:34:44,534 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:34:44,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-27 17:34:45,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/85 HTTP/1.1" 200 None
2024-08-27 17:34:45,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/85/comments HTTP/1.1" 200 None
2024-08-27 17:34:46,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3 HTTP/1.1" 200 None
2024-08-27 17:34:46,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-27 17:34:47,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-27 17:34:47,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-27 17:34:48,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-27 17:34:48,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-27 17:34:49,312 [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-08-27 17:34:49,732 [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-08-27 17:34:50,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-27 17:34:50,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:34:50,738 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-27 17:34:50,739 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:34:50,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-27 17:34:50,739 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:50,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:50,746 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:34:50,752 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:34:50,752 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:34:50,759 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:34:50,766 [ scc.git] DEBUG Already up to date.
2024-08-27 17:34:50,766 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-27 17:34:51,092 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-27 17:34:51,092 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-27 17:34:51,097 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:34:51,097 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:51,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:51,103 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-27 17:34:51,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:51,117 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-27 17:34:51,128 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:34:51,132 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-27 17:34:51,132 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-27 17:34:51,132 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-27 17:34:51,132 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-27 17:34:51,132 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-27 17:34:51,132 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-27 17:34:51,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:51,278 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:34:51,321 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:51,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:51,327 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:34:51,369 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:34:51,377 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b144ea7f0> has no local changes
2024-08-27 17:34:51,377 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:34:51,387 [ scc.git] DEBUG [detached HEAD 6a0ae6c] merge master -Dorg -Ssuccess-only
2024-08-27 17:34:51,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:34:51,387 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:34:51,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-27 17:34:52,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-27 17:34:52,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-27 17:34:53,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-27 17:34:53,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-27 17:34:54,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-27 17:34:54,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:34:54,596 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-27 17:34:55,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-27 17:34:55,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-27 17:34:56,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-27 17:34:56,440 [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-08-27 17:34:56,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-27 17:34:57,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:34:57,393 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-27 17:34:57,393 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:34:57,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-27 17:34:57,393 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:57,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:57,399 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:34:57,405 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:34:57,406 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:34:57,412 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:34:57,419 [ scc.git] DEBUG Already up to date.
2024-08-27 17:34:57,419 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-27 17:34:57,865 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-27 17:34:57,865 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-27 17:34:57,872 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-27 17:34:58,354 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-27 17:34:58,354 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-27 17:34:58,362 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:34:58,362 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:58,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:58,371 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-27 17:34:58,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:58,395 [ 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-08-27 17:34:58,504 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-27 17:34:58,505 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-27 17:34:58,505 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-27 17:34:58,505 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-27 17:34:58,505 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-27 17:34:58,505 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-27 17:34:58,514 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-27 17:34:58,525 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-27 17:34:58,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:58,659 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-27 17:34:58,671 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-27 17:34:58,682 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#165](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-27 17:34:58,689 [ scc.config] DEBUG Found github.token
2024-08-27 17:34:58,690 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-27 17:34:58,690 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-27 17:34:58,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:58,707 [ 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-08-27 17:34:58,754 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-27 17:34:58,755 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-27 17:34:58,755 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-27 17:34:58,755 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-27 17:34:58,755 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-27 17:34:58,763 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-27 17:34:58,773 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-27 17:34:59,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:34:59,090 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-27 17:34:59,099 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-27 17:34:59,106 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#165](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/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-08-27 17:34:59,112 [ scc.config] DEBUG Found github.token
2024-08-27 17:34:59,112 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-27 17:34:59,113 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:34:59,156 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:34:59,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:34:59,163 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:34:59,205 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:34:59,213 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b144ea580> has no local changes
2024-08-27 17:34:59,213 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:34:59,224 [ scc.git] DEBUG [detached HEAD 9975534] merge master -Dorg -Ssuccess-only
2024-08-27 17:34:59,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:34:59,225 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:34:59,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-27 17:35:00,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-27 17:35:00,177 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-27 17:35:00,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-27 17:35:01,278 [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-08-27 17:35:01,803 [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-08-27 17:35:02,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-27 17:35:02,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:35:02,833 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-27 17:35:03,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-27 17:35:03,323 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-27 17:35:03,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-27 17:35:04,392 [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-08-27 17:35:04,849 [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-08-27 17:35:05,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-27 17:35:05,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:35:05,755 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-27 17:35:06,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-27 17:35:06,249 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-27 17:35:06,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-27 17:35:07,389 [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-08-27 17:35:07,894 [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-08-27 17:35:08,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-27 17:35:08,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:35:08,845 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-27 17:35:09,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-27 17:35:09,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-27 17:35:10,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-27 17:35:10,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-27 17:35:11,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-27 17:35:11,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-27 17:35:11,840 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:11,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-27 17:35:11,840 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:11,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:11,846 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:35:11,852 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:11,852 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:35:11,857 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:35:11,863 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:11,863 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-27 17:35:12,184 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-27 17:35:12,184 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-27 17:35:12,189 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-27 17:35:12,466 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-27 17:35:12,466 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-27 17:35:12,470 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-27 17:35:12,762 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-27 17:35:12,763 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-27 17:35:12,767 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:12,767 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:12,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:12,774 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-27 17:35:12,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:12,785 [ 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-08-27 17:35:12,795 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:35:12,798 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-27 17:35:12,798 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-27 17:35:12,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:12,960 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-27 17:35:12,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:12,971 [ 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-08-27 17:35:12,999 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-27 17:35:12,999 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:35:13,002 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-27 17:35:13,002 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-27 17:35:13,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:13,345 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-27 17:35:13,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:13,356 [ 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-08-27 17:35:13,369 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-27 17:35:13,370 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:35:13,373 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-27 17:35:13,373 [ scc.git] DEBUG package.json | 2 +-
2024-08-27 17:35:13,373 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-27 17:35:13,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:13,739 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:13,782 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:13,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:13,788 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:13,831 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:13,839 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b1451fc70> has no local changes
2024-08-27 17:35:13,839 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:13,849 [ scc.git] DEBUG [detached HEAD c1da0e9] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:13,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:13,850 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:35:14,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-27 17:35:14,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-27 17:35:15,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-27 17:35:15,657 [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-08-27 17:35:16,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-27 17:35:16,500 [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-08-27 17:35:16,501 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-27 17:35:16,501 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:16,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-27 17:35:16,501 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:16,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:16,508 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:35:16,513 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:16,513 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:35:16,518 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:35:16,523 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:16,524 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-27 17:35:16,835 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-27 17:35:16,835 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-27 17:35:16,839 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:16,840 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:16,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:16,846 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-27 17:35:16,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:16,858 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-27 17:35:16,868 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:35:17,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:17,015 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:17,057 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:17,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:17,062 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:17,101 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:17,108 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b14535e80> has no local changes
2024-08-27 17:35:17,108 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:17,117 [ scc.git] DEBUG [detached HEAD 3f0e663] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:17,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:17,118 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:35:17,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-27 17:35:17,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-27 17:35:18,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-27 17:35:18,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-27 17:35:19,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-27 17:35:20,034 [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-08-27 17:35:20,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-27 17:35:20,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:35:20,884 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-27 17:35:20,884 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:20,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-27 17:35:20,884 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:20,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:20,890 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:35:20,895 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:20,895 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:35:20,900 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:35:20,907 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:20,907 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-27 17:35:21,335 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-27 17:35:21,336 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-27 17:35:21,340 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:21,340 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:21,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:21,347 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-27 17:35:21,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:21,360 [ 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-08-27 17:35:21,369 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-27 17:35:21,370 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:35:21,373 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-27 17:35:21,373 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-27 17:35:21,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:21,512 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:21,551 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:21,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:21,557 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:21,598 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:21,604 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b1453aa60> has no local changes
2024-08-27 17:35:21,605 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:21,613 [ scc.git] DEBUG [detached HEAD 361a97d] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:21,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:21,614 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:35:22,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-27 17:35:22,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-27 17:35:22,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-27 17:35:23,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-27 17:35:23,904 [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-08-27 17:35:24,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-27 17:35:24,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:35:24,835 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-27 17:35:24,835 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:24,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-27 17:35:24,836 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:24,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:24,842 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:35:24,848 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:24,849 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:35:24,855 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:35:24,861 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:24,862 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-27 17:35:25,219 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-27 17:35:25,220 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-27 17:35:25,224 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:25,224 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:25,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:25,229 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-27 17:35:25,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:25,241 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-27 17:35:25,295 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-27 17:35:25,295 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-27 17:35:25,295 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-27 17:35:25,295 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-27 17:35:25,296 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-27 17:35:25,296 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-27 17:35:25,296 [ scc.git] DEBUG Auto-merging setup.py
2024-08-27 17:35:25,296 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-27 17:35:25,296 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-27 17:35:25,296 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-27 17:35:25,302 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-27 17:35:25,308 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-27 17:35:25,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:25,438 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-27 17:35:25,444 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-27 17:35:25,450 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#165](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2024-08-27 17:35:25,457 [ scc.config] DEBUG Found github.token
2024-08-27 17:35:25,458 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-27 17:35:25,458 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:25,503 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:25,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:25,510 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:25,549 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:25,556 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b144b14c0> has no local changes
2024-08-27 17:35:25,556 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:25,566 [ scc.git] DEBUG [detached HEAD ad515a0] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:25,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:25,567 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:35:25,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-27 17:35:26,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-27 17:35:26,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-27 17:35:27,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-27 17:35:27,784 [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-08-27 17:35:28,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-27 17:35:28,666 [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-08-27 17:35:28,667 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-27 17:35:28,667 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:28,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-27 17:35:28,667 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:28,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:28,673 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:35:28,679 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:28,679 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:35:28,685 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:35:28,690 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:28,691 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-27 17:35:29,047 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-27 17:35:29,048 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-27 17:35:29,052 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:29,053 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:29,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:29,060 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-27 17:35:29,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:29,076 [ 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-08-27 17:35:29,089 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-27 17:35:29,092 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-27 17:35:29,093 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-27 17:35:29,096 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-27 17:35:29,096 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-27 17:35:29,096 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-27 17:35:29,096 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-27 17:35:29,096 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-27 17:35:29,096 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-27 17:35:29,096 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-27 17:35:29,096 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-27 17:35:29,096 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-27 17:35:29,096 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-27 17:35:29,096 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-27 17:35:29,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-27 17:35:29,097 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-27 17:35:29,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:29,235 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:29,273 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:29,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:29,279 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:29,337 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:29,344 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b1450df40> has no local changes
2024-08-27 17:35:29,344 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:29,353 [ scc.git] DEBUG [detached HEAD 11021bd] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:29,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:29,354 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:35:29,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-27 17:35:29,650 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:29,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-27 17:35:29,650 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:29,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:29,656 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:35:29,661 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:29,662 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:35:29,668 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:35:29,674 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:29,674 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:29,674 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:29,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:29,680 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:29,723 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:29,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:29,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:29,771 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:29,779 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b144986d0> has no local changes
2024-08-27 17:35:29,779 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:29,790 [ scc.git] DEBUG [detached HEAD 0489440] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:29,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:29,790 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:35:30,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-27 17:35:30,068 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:30,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-27 17:35:30,068 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:30,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:30,075 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:35:30,080 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:30,080 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:35:30,085 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:35:30,091 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:30,091 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:30,091 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:30,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:30,096 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:30,133 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:30,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:30,139 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:30,175 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:30,181 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b14458940> has no local changes
2024-08-27 17:35:30,181 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:30,189 [ scc.git] DEBUG [detached HEAD b7b519d] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:30,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:30,189 [ scc.git] INFO Overriding base-branch from master to main
2024-08-27 17:35:30,190 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:35:30,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-27 17:35:30,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-27 17:35:31,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-27 17:35:31,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-27 17:35:32,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-27 17:35:32,784 [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-08-27 17:35:33,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-27 17:35:33,691 [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-08-27 17:35:33,692 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-27 17:35:33,692 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:33,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-27 17:35:33,692 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:33,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:33,698 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-27 17:35:33,703 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:33,703 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-27 17:35:33,708 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-27 17:35:33,714 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:33,714 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-27 17:35:34,116 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-27 17:35:34,116 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-27 17:35:34,121 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:34,121 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:34,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:34,129 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-27 17:35:34,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:34,143 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-27 17:35:34,185 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-27 17:35:34,185 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-27 17:35:34,185 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-27 17:35:34,185 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-27 17:35:34,194 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-27 17:35:34,203 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-27 17:35:34,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:34,344 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-27 17:35:34,353 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-27 17:35:34,360 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#165](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-27 17:35:34,366 [ scc.config] DEBUG Found github.token
2024-08-27 17:35:34,366 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-27 17:35:34,366 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:34,417 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:34,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:34,425 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:34,484 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:34,492 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b14489670> has no local changes
2024-08-27 17:35:34,492 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:34,502 [ scc.git] DEBUG [detached HEAD bfb803a] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:34,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:34,503 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:35:34,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-27 17:35:34,750 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:34,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-27 17:35:34,750 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:34,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:34,758 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:35:34,765 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:34,765 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:35:34,772 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:35:34,781 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:34,781 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:34,781 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:34,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:34,789 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:34,838 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:34,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:34,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:34,891 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:34,899 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b144d3e80> has no local changes
2024-08-27 17:35:34,900 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:34,910 [ scc.git] DEBUG [detached HEAD fada20b] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:34,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:34,911 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:35:35,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-27 17:35:35,160 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:35,160 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-27 17:35:35,161 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:35,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:35,169 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:35:35,174 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:35,175 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:35:35,181 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:35:35,187 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:35,187 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:35,187 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:35,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:35,193 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:35,235 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:35,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:35,241 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:35,283 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:35,290 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b1442f640> has no local changes
2024-08-27 17:35:35,290 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:35,300 [ scc.git] DEBUG [detached HEAD da833f3] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:35,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:35,300 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:35:35,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-27 17:35:36,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-27 17:35:36,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-27 17:35:37,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-27 17:35:37,665 [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-08-27 17:35:38,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-27 17:35:38,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:35:38,600 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-27 17:35:38,600 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:38,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-27 17:35:38,600 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:38,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:38,607 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-27 17:35:38,613 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:38,613 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-27 17:35:38,625 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-27 17:35:38,632 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:38,632 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-27 17:35:39,263 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-27 17:35:39,264 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-27 17:35:39,269 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:39,269 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:39,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:39,275 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-27 17:35:39,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:39,288 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-27 17:35:39,326 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-27 17:35:39,327 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-27 17:35:39,327 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-27 17:35:39,327 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-27 17:35:39,333 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-27 17:35:39,341 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-27 17:35:39,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:39,496 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-27 17:35:39,502 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-27 17:35:39,508 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#165](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-27 17:35:39,514 [ scc.config] DEBUG Found github.token
2024-08-27 17:35:39,514 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-27 17:35:39,514 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:39,555 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:39,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:39,561 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:39,602 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:39,609 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b14440d90> has no local changes
2024-08-27 17:35:39,610 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:39,620 [ scc.git] DEBUG [detached HEAD 84dcb14] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:39,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:39,621 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-27 17:35:39,621 [ scc.repo] DEBUG ## PRs found:
2024-08-27 17:35:40,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-27 17:35:40,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-27 17:35:41,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-27 17:35:41,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-27 17:35:41,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-27 17:35:42,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-27 17:35:42,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-27 17:35:43,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-27 17:35:43,791 [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-08-27 17:35:44,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-27 17:35:44,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-27 17:35:44,664 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-27 17:35:45,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-27 17:35:45,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-27 17:35:46,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-27 17:35:46,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-27 17:35:46,577 [ scc.repo] DEBUG ## Branches found:
2024-08-27 17:35:46,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-27 17:35:46,577 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:46,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:46,582 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-27 17:35:46,587 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-27 17:35:46,587 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-27 17:35:46,593 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-27 17:35:46,598 [ scc.git] DEBUG Already up to date.
2024-08-27 17:35:46,598 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-27 17:35:47,257 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-27 17:35:47,257 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-27 17:35:47,262 [ scc.git] DEBUG ## Unique users: []
2024-08-27 17:35:47,262 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:47,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:47,268 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-27 17:35:47,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:47,280 [ 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-08-27 17:35:47,328 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-27 17:35:47,328 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-27 17:35:47,328 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-27 17:35:47,328 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-27 17:35:47,335 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-27 17:35:47,342 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-27 17:35:47,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:47,476 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-27 17:35:47,483 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-27 17:35:47,488 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#165](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-27 17:35:47,492 [ scc.config] DEBUG Found github.token
2024-08-27 17:35:47,493 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-27 17:35:47,493 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-27 17:35:47,532 [ scc.git] DEBUG Get sha1 of %s
2024-08-27 17:35:47,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-27 17:35:47,538 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:47,575 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:47,582 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b1447ee20> has no local changes
2024-08-27 17:35:47,582 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:47,590 [ scc.git] DEBUG [detached HEAD 46d7745] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:47,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:47,591 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-27 17:35:47,664 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-27 17:35:47,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:47,873 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-27 17:35:47,878 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-27 17:35:48,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:48,268 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-27 17:35:48,272 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-27 17:35:48,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:48,681 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-27 17:35:48,685 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-27 17:35:49,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:49,072 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-27 17:35:49,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:49,455 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-27 17:35:49,459 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-27 17:35:49,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:49,842 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-27 17:35:49,850 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-27 17:35:50,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:50,225 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-27 17:35:50,230 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-27 17:35:50,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:50,607 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-27 17:35:50,611 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-27 17:35:50,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:50,994 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-27 17:35:51,000 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-27 17:35:51,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:51,382 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-27 17:35:51,388 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-27 17:35:51,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:51,782 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-27 17:35:51,788 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-27 17:35:52,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:52,164 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-27 17:35:52,169 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-27 17:35:52,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:52,558 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-27 17:35:52,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:52,942 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-27 17:35:53,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:53,320 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-27 17:35:53,326 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-27 17:35:53,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:53,712 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-27 17:35:54,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:54,085 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-27 17:35:54,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:54,472 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-27 17:35:54,477 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-27 17:35:54,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:54,852 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-27 17:35:54,856 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-27 17:35:55,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:55,236 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-27 17:35:55,241 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-27 17:35:55,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:55,627 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-27 17:35:55,633 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-27 17:35:56,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-27 17:35:56,017 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-27 17:35:56,017 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-27 17:35:56,098 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7b15b5ee20> has local changes
2024-08-27 17:35:56,099 [ 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 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
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 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
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 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (status: failure)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
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 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- 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 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
Repository: ome/omero-mapr
Excluded PRs:
- PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/165/)'
2024-08-27 17:35:56,113 [ scc.git] DEBUG [detached HEAD b897fa7] merge master -Dorg -Ssuccess-only
2024-08-27 17:35:56,114 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-27 17:35:56,114 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-27 17:35:56,114 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,114 [ scc.merge] INFO
2024-08-27 17:35:56,114 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,114 [ scc.merge] INFO - PR 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
2024-08-27 17:35:56,114 [ scc.merge] INFO
2024-08-27 17:35:56,114 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-27 17:35:56,114 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,114 [ scc.merge] INFO
2024-08-27 17:35:56,114 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,114 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-27 17:35:56,114 [ scc.merge] INFO
2024-08-27 17:35:56,114 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-27 17:35:56,114 [ scc.merge] INFO Excluded PRs:
2024-08-27 17:35:56,114 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-27 17:35:56,114 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,114 [ scc.merge] INFO
2024-08-27 17:35:56,114 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,114 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-27 17:35:56,114 [ scc.merge] INFO
2024-08-27 17:35:56,114 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-27 17:35:56,114 [ scc.merge] INFO Excluded PRs:
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-27 17:35:56,115 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,115 [ scc.merge] INFO
2024-08-27 17:35:56,115 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-27 17:35:56,115 [ scc.merge] INFO
2024-08-27 17:35:56,115 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-27 17:35:56,115 [ scc.merge] INFO Excluded PRs:
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-27 17:35:56,115 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,115 [ scc.merge] INFO
2024-08-27 17:35:56,115 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-27 17:35:56,115 [ scc.merge] INFO
2024-08-27 17:35:56,115 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-27 17:35:56,115 [ scc.merge] INFO
2024-08-27 17:35:56,115 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-27 17:35:56,115 [ scc.merge] INFO Excluded PRs:
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (status: failure)
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-27 17:35:56,115 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,115 [ scc.merge] INFO
2024-08-27 17:35:56,115 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-27 17:35:56,115 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-08-27 17:35:56,115 [ scc.merge] INFO
2024-08-27 17:35:56,115 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-27 17:35:56,115 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,116 [ scc.merge] INFO
2024-08-27 17:35:56,116 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-27 17:35:56,116 [ scc.merge] INFO
2024-08-27 17:35:56,116 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-27 17:35:56,116 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,116 [ scc.merge] INFO
2024-08-27 17:35:56,116 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-27 17:35:56,116 [ scc.merge] INFO
2024-08-27 17:35:56,116 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-27 17:35:56,116 [ scc.merge] INFO Excluded PRs:
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-27 17:35:56,116 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,116 [ scc.merge] INFO
2024-08-27 17:35:56,116 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-27 17:35:56,116 [ scc.merge] INFO
2024-08-27 17:35:56,116 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-27 17:35:56,116 [ scc.merge] INFO Excluded PRs:
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-27 17:35:56,116 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,116 [ scc.merge] INFO
2024-08-27 17:35:56,116 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,116 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-27 17:35:56,116 [ scc.merge] INFO
2024-08-27 17:35:56,116 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-27 17:35:56,116 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,116 [ scc.merge] INFO
2024-08-27 17:35:56,116 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-27 17:35:56,117 [ scc.merge] INFO
2024-08-27 17:35:56,117 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-27 17:35:56,117 [ scc.merge] INFO Excluded PRs:
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-27 17:35:56,117 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,117 [ scc.merge] INFO
2024-08-27 17:35:56,117 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-27 17:35:56,117 [ scc.merge] INFO
2024-08-27 17:35:56,117 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-27 17:35:56,117 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,117 [ scc.merge] INFO
2024-08-27 17:35:56,117 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-27 17:35:56,117 [ scc.merge] INFO
2024-08-27 17:35:56,117 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-27 17:35:56,117 [ scc.merge] INFO Excluded PRs:
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-27 17:35:56,117 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,117 [ scc.merge] INFO
2024-08-27 17:35:56,117 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-27 17:35:56,117 [ scc.merge] INFO
2024-08-27 17:35:56,117 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-27 17:35:56,117 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,117 [ scc.merge] INFO
2024-08-27 17:35:56,117 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-27 17:35:56,117 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-27 17:35:56,117 [ scc.merge] INFO
2024-08-27 17:35:56,117 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-27 17:35:56,117 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,117 [ scc.merge] INFO
2024-08-27 17:35:56,117 [ scc.merge] INFO Merged PRs:
2024-08-27 17:35:56,118 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-27 17:35:56,118 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-27 17:35:56,118 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-27 17:35:56,118 [ scc.merge] INFO Excluded PRs:
2024-08-27 17:35:56,118 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-27 17:35:56,118 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-27 17:35:56,118 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-27 17:35:56,118 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-27 17:35:56,118 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-27 17:35:56,118 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-27 17:35:56,118 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-27 17:35:56,118 [ scc.merge] INFO
2024-08-27 17:35:56,118 [ scc.merge] INFO Repository: ome/scripts
2024-08-27 17:35:56,118 [ scc.merge] INFO Excluded PRs:
2024-08-27 17:35:56,118 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-27 17:35:56,118 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-27 17:35:56,118 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-27 17:35:56,118 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-27 17:35:56,118 [ scc.merge] INFO Already up to date.
2024-08-27 17:35:56,119 [ scc.merge] INFO
2024-08-27 17:35:56,119 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-27 17:35:56,119 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-27 17:35:56,119 [ scc.merge] INFO
2024-08-27 17:35:56,119 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-27 17:35:56,119 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-27 17:35:56,125 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-27 17:35:56,129 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-27 17:35:56,134 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-27 17:35:56,139 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-27 17:35:56,143 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-27 17:35:56,148 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-27 17:35:56,152 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-27 17:35:56,157 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-27 17:35:56,162 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-27 17:35:56,166 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-27 17:35:56,171 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-27 17:35:56,175 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-27 17:35:56,180 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-27 17:35:56,184 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-27 17:35:56,189 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-27 17:35:56,193 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-27 17:35:56,198 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-27 17:35:56,203 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-27 17:35:56,207 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-27 17:35:56,212 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-27 17:35:56,217 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-27 17:35:56,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-27 17:35:56,221 [ scc.git] DEBUG Calling 'git remote'
2024-08-27 17:35:56,225 [ 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.9.2 to 5.9.3-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 35850a1] 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 173cac0
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
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 cbdd3657
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 a8f380f
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 cda3ec6
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 312afbe
nothing to commit, working tree clean
[detached HEAD 01146e5] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-27 17:36:40,741 [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-08-27 17:36:49,490 [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-08-27 17:36:51,855 [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-08-27 17:36:56,270 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-27 17:37:36,342 [ 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/d0200910/images/svgs/logo.svg){kind=logo}
