Skipping 107 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-07-17 00:43:18,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-17 00:43:19,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-17 00:43:19,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-17 00:43:20,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-17 00:43:20,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:43:20,615 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-07-17 00:43:20,615 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:43:20,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-17 00:43:20,615 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:20,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:20,622 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:43:20,628 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:43:20,629 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:43:20,636 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:43:20,644 [ scc.git] DEBUG Already up to date.
2024-07-17 00:43:20,644 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-17 00:43:21,079 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-17 00:43:21,079 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-17 00:43:21,084 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-17 00:43:21,664 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-17 00:43:21,664 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-17 00:43:21,669 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-17 00:43:22,606 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-17 00:43:22,606 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-17 00:43:22,612 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-17 00:43:22,999 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-17 00:43:23,000 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-17 00:43:23,008 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-07-17 00:43:23,813 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-17 00:43:23,813 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-07-17 00:43:23,818 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:43:23,818 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:23,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:23,823 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-17 00:43:23,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:23,835 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-17 00:43:23,970 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-17 00:43:23,971 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:23,977 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-17 00:43:23,977 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-17 00:43:23,977 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-17 00:43:23,977 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-17 00:43:23,977 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-17 00:43:23,977 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-17 00:43:23,977 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-17 00:43:23,977 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-17 00:43:23,980 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-17 00:43:23,980 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-17 00:43:24,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:24,144 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-17 00:43:24,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:24,157 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-17 00:43:24,306 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-17 00:43:24,306 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-17 00:43:24,306 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-17 00:43:24,306 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-17 00:43:24,307 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:24,313 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-17 00:43:24,313 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-17 00:43:24,313 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-17 00:43:24,313 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-17 00:43:24,313 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-17 00:43:24,313 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-17 00:43:24,314 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-17 00:43:24,314 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-17 00:43:24,314 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-17 00:43:24,314 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-17 00:43:24,314 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-17 00:43:24,314 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-17 00:43:24,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:24,560 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-17 00:43:24,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:24,576 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-17 00:43:24,763 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-07-17 00:43:24,763 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-17 00:43:24,763 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-17 00:43:24,763 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-07-17 00:43:24,763 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-17 00:43:24,763 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-17 00:43:24,764 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:24,771 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-07-17 00:43:24,771 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-07-17 00:43:24,771 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-07-17 00:43:24,771 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-07-17 00:43:24,771 [ scc.git] DEBUG src/index.html | 1 +
2024-07-17 00:43:24,771 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-07-17 00:43:24,771 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-07-17 00:43:24,771 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-07-17 00:43:24,771 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-07-17 00:43:24,771 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-07-17 00:43:24,771 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-07-17 00:43:24,772 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-07-17 00:43:24,772 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-07-17 00:43:24,772 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-07-17 00:43:24,772 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-07-17 00:43:25,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:25,031 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-17 00:43:25,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:25,045 [ 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-07-17 00:43:25,087 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:25,090 [ scc.git] DEBUG setup.py | 2 +-
2024-07-17 00:43:25,090 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-17 00:43:25,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:25,447 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-07-17 00:43:25,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:25,461 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-07-17 00:43:25,487 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-17 00:43:25,488 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-17 00:43:25,488 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:25,493 [ scc.git] DEBUG .gitignore | 2 +-
2024-07-17 00:43:25,493 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-07-17 00:43:25,493 [ scc.git] DEBUG src/index.html | 3 +++
2024-07-17 00:43:25,493 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-07-17 00:43:25,493 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-07-17 00:43:25,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:25,859 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:43:25,901 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:25,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:25,907 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:43:25,947 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:43:25,955 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc5c8640> has no local changes
2024-07-17 00:43:25,956 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- 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 576 Rdornier 'Color picker - popup update'
Generated by OMERO-plugins-push#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:43:25,967 [ scc.git] DEBUG [detached HEAD 5f49eb29] merge master -Dorg -Ssuccess-only
2024-07-17 00:43:25,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:43:25,968 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:43:26,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-17 00:43:26,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-17 00:43:27,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-17 00:43:27,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-17 00:43:28,276 [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-07-17 00:43:28,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-17 00:43:29,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:43:29,257 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-17 00:43:29,257 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:43:29,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-17 00:43:29,257 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:29,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:29,263 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:43:29,267 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:43:29,267 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:43:29,272 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:43:29,277 [ scc.git] DEBUG Already up to date.
2024-07-17 00:43:29,277 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-17 00:43:29,681 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-17 00:43:29,681 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-17 00:43:29,686 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:43:29,686 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:29,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:29,692 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-17 00:43:29,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:29,704 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-17 00:43:29,721 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-17 00:43:29,721 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:29,724 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-17 00:43:29,724 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-17 00:43:29,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:29,886 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:43:29,928 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:29,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:29,934 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:43:29,974 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:43:29,980 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbf66af40> has no local changes
2024-07-17 00:43:29,980 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:43:29,989 [ scc.git] DEBUG [detached HEAD 2212b06] merge master -Dorg -Ssuccess-only
2024-07-17 00:43:29,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:43:29,990 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:43:30,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-17 00:43:30,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-17 00:43:30,874 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-17 00:43:31,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-17 00:43:31,978 [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-07-17 00:43:32,466 [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-07-17 00:43:33,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-17 00:43:33,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:43:33,453 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-17 00:43:33,453 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:43:33,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-17 00:43:33,453 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:33,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:33,458 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:43:33,463 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:43:33,463 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:43:33,469 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:43:33,474 [ scc.git] DEBUG Already up to date.
2024-07-17 00:43:33,475 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-17 00:43:33,887 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-17 00:43:33,887 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-17 00:43:33,892 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:43:33,893 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:33,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:33,901 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-17 00:43:33,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:33,915 [ 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-07-17 00:43:33,926 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:33,930 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-17 00:43:33,930 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-17 00:43:34,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:34,112 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:43:34,183 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:34,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:34,189 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:43:34,239 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:43:34,251 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc5d5fa0> has no local changes
2024-07-17 00:43:34,251 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:43:34,263 [ scc.git] DEBUG [detached HEAD 50a3269] merge master -Dorg -Ssuccess-only
2024-07-17 00:43:34,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:43:34,264 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:43:34,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-17 00:43:35,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-17 00:43:35,122 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-17 00:43:35,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-17 00:43:36,207 [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-07-17 00:43:36,770 [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-07-17 00:43:37,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-17 00:43:37,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:43:37,782 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-17 00:43:38,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-17 00:43:38,256 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-17 00:43:38,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-17 00:43:39,304 [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-07-17 00:43:39,790 [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-07-17 00:43:40,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-17 00:43:40,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:43:40,855 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-17 00:43:41,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-17 00:43:41,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-17 00:43:42,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-17 00:43:42,830 [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-07-17 00:43:43,280 [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-07-17 00:43:43,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-17 00:43:44,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:43:44,282 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-17 00:43:44,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-17 00:43:45,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-17 00:43:45,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-17 00:43:46,280 [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-07-17 00:43:46,795 [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-07-17 00:43:47,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-17 00:43:47,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:43:47,759 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-17 00:43:48,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-17 00:43:48,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-17 00:43:49,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-17 00:43:49,748 [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-07-17 00:43:50,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-17 00:43:50,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:43:50,636 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-17 00:43:50,637 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:43:50,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-17 00:43:50,637 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:50,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:50,645 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:43:50,651 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:43:50,651 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:43:50,687 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:43:50,694 [ scc.git] DEBUG Already up to date.
2024-07-17 00:43:50,694 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-17 00:43:51,234 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-17 00:43:51,234 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-17 00:43:51,239 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-17 00:43:52,127 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-17 00:43:52,127 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-17 00:43:52,132 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-17 00:43:52,529 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-17 00:43:52,530 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-17 00:43:52,535 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-17 00:43:52,911 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-17 00:43:52,911 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-17 00:43:52,920 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-17 00:43:53,310 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-17 00:43:53,310 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-17 00:43:53,314 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:43:53,314 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:53,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:53,320 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-17 00:43:53,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:53,332 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-17 00:43:53,364 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-17 00:43:53,365 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:53,369 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-17 00:43:53,369 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-17 00:43:53,369 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-17 00:43:53,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:53,543 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-17 00:43:53,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:53,556 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-17 00:43:53,608 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-17 00:43:53,609 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-17 00:43:53,609 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-17 00:43:53,609 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-17 00:43:53,609 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:53,613 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-17 00:43:53,614 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-17 00:43:53,614 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-17 00:43:53,614 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-17 00:43:53,614 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-17 00:43:53,614 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-17 00:43:53,614 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-17 00:43:53,614 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-17 00:43:53,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:53,956 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-17 00:43:53,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:53,971 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-17 00:43:53,994 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-17 00:43:53,995 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:53,998 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-17 00:43:53,998 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-17 00:43:53,999 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-17 00:43:54,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:54,381 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-17 00:43:54,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:54,409 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-17 00:43:54,424 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:54,434 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-17 00:43:54,434 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-17 00:43:54,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:54,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-17 00:43:54,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:54,819 [ 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-07-17 00:43:54,871 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-17 00:43:54,872 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:55,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:55,191 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:43:55,234 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:55,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:55,241 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:43:55,285 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:43:55,296 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbf65b730> has no local changes
2024-07-17 00:43:55,296 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 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'
Generated by OMERO-plugins-push#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:43:55,306 [ scc.git] DEBUG [detached HEAD 237e18f] merge master -Dorg -Ssuccess-only
2024-07-17 00:43:55,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:43:55,307 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:43:55,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-17 00:43:56,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-17 00:43:56,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-17 00:43:57,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-17 00:43:57,788 [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-07-17 00:43:58,238 [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-07-17 00:43:58,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-17 00:43:59,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:43:59,166 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-17 00:43:59,166 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:43:59,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-17 00:43:59,166 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:59,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:59,172 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:43:59,178 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:43:59,178 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:43:59,184 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:43:59,190 [ scc.git] DEBUG Already up to date.
2024-07-17 00:43:59,190 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-17 00:43:59,568 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-17 00:43:59,568 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-17 00:43:59,574 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:43:59,574 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:59,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:59,582 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-17 00:43:59,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:59,600 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-17 00:43:59,615 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:43:59,622 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-17 00:43:59,623 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-17 00:43:59,623 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-17 00:43:59,623 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-17 00:43:59,623 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-17 00:43:59,623 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-17 00:43:59,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:43:59,779 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:43:59,819 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:43:59,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:43:59,825 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:43:59,865 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:43:59,872 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc58d610> has no local changes
2024-07-17 00:43:59,872 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:43:59,881 [ scc.git] DEBUG [detached HEAD 53181c9] merge master -Dorg -Ssuccess-only
2024-07-17 00:43:59,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:43:59,882 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:00,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-17 00:44:00,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-17 00:44:01,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-17 00:44:01,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-17 00:44:02,336 [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-07-17 00:44:02,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-17 00:44:03,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:44:03,257 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-17 00:44:03,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-17 00:44:04,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-17 00:44:04,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-17 00:44:05,171 [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-07-17 00:44:05,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-17 00:44:06,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:44:06,120 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-17 00:44:06,120 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:06,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-17 00:44:06,120 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:06,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:06,125 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:44:06,130 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:06,131 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:44:06,136 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:44:06,141 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:06,141 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-17 00:44:06,639 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-17 00:44:06,639 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-17 00:44:06,644 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-17 00:44:07,193 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-17 00:44:07,193 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-17 00:44:07,201 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:07,202 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:07,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:07,217 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-17 00:44:07,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:07,238 [ 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-07-17 00:44:07,304 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-17 00:44:07,304 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-17 00:44:07,304 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-17 00:44:07,304 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-17 00:44:07,305 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-17 00:44:07,306 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-17 00:44:07,314 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-17 00:44:07,323 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-17 00:44:07,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:07,472 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-17 00:44:07,484 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-17 00:44:07,501 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#125](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-07-17 00:44:07,508 [ scc.config] DEBUG Found github.token
2024-07-17 00:44:07,509 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-17 00:44:07,509 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-17 00:44:07,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:07,522 [ 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-07-17 00:44:07,547 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-17 00:44:07,547 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-17 00:44:07,547 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-17 00:44:07,547 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-17 00:44:07,548 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-17 00:44:07,555 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-17 00:44:07,563 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-17 00:44:07,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:07,875 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-17 00:44:07,887 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-17 00:44:07,898 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#125](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/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-07-17 00:44:07,908 [ scc.config] DEBUG Found github.token
2024-07-17 00:44:07,909 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-17 00:44:07,909 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:07,987 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:07,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:08,000 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:08,051 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:08,061 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc58d8b0> has no local changes
2024-07-17 00:44:08,061 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:08,073 [ scc.git] DEBUG [detached HEAD 96baf0a] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:08,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:08,074 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:08,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-17 00:44:08,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-17 00:44:08,914 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-17 00:44:09,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-17 00:44:09,969 [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-07-17 00:44:10,441 [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-07-17 00:44:10,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-17 00:44:11,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:44:11,407 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-17 00:44:11,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-17 00:44:11,894 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-17 00:44:12,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-17 00:44:12,988 [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-07-17 00:44:13,531 [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-07-17 00:44:14,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-17 00:44:14,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:44:14,483 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-17 00:44:14,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-17 00:44:14,951 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-17 00:44:15,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-17 00:44:15,981 [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-07-17 00:44:16,475 [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-07-17 00:44:16,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-17 00:44:17,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:44:17,362 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-17 00:44:17,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-17 00:44:18,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-17 00:44:18,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-17 00:44:19,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-17 00:44:19,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-17 00:44:20,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-17 00:44:20,420 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:20,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-17 00:44:20,420 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:20,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:20,427 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:44:20,432 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:20,433 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:44:20,438 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:44:20,444 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:20,444 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-17 00:44:20,802 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-17 00:44:20,802 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-17 00:44:20,808 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-17 00:44:21,178 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-17 00:44:21,178 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-17 00:44:21,183 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-17 00:44:21,533 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-17 00:44:21,534 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-17 00:44:21,539 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:21,540 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:21,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:21,546 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-17 00:44:21,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:21,558 [ 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-07-17 00:44:21,568 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:44:21,571 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-17 00:44:21,571 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-17 00:44:21,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:21,744 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-17 00:44:21,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:21,758 [ 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-07-17 00:44:21,782 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-17 00:44:21,782 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:44:21,786 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-17 00:44:21,786 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-17 00:44:22,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:22,158 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-17 00:44:22,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:22,171 [ 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-07-17 00:44:22,183 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-17 00:44:22,183 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:44:22,187 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-17 00:44:22,187 [ scc.git] DEBUG package.json | 2 +-
2024-07-17 00:44:22,187 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-17 00:44:22,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:22,598 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:22,642 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:22,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:22,649 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:22,702 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:22,710 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc58d670> has no local changes
2024-07-17 00:44:22,711 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:22,721 [ scc.git] DEBUG [detached HEAD cd05109] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:22,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:22,722 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:23,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-17 00:44:23,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-17 00:44:24,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-17 00:44:24,580 [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-07-17 00:44:25,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-17 00:44:25,557 [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-07-17 00:44:25,558 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-17 00:44:25,558 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:25,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-17 00:44:25,558 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:25,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:25,565 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:44:25,570 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:25,571 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:44:25,576 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:44:25,581 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:25,581 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-17 00:44:25,948 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-17 00:44:25,949 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-17 00:44:25,953 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:25,953 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:25,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:25,958 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-17 00:44:25,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:25,969 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-17 00:44:25,977 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:44:26,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:26,138 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:26,185 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:26,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:26,191 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:26,229 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:26,236 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbf64cee0> has no local changes
2024-07-17 00:44:26,236 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:26,245 [ scc.git] DEBUG [detached HEAD d363676] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:26,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:26,246 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:26,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-17 00:44:27,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-17 00:44:27,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-17 00:44:28,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-17 00:44:28,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-17 00:44:29,121 [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-07-17 00:44:29,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-17 00:44:30,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:44:30,077 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-17 00:44:30,077 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:30,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-17 00:44:30,077 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:30,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:30,084 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:44:30,091 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:30,091 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:44:30,098 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:44:30,105 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:30,106 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-17 00:44:30,526 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-17 00:44:30,526 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-17 00:44:30,530 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:30,531 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:30,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:30,537 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-17 00:44:30,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:30,549 [ 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-07-17 00:44:30,560 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-17 00:44:30,560 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:44:30,562 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-17 00:44:30,562 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-17 00:44:30,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:30,749 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:30,788 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:30,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:30,794 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:30,833 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:30,840 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc59eb80> has no local changes
2024-07-17 00:44:30,840 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:30,849 [ scc.git] DEBUG [detached HEAD bdba11a] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:30,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:30,849 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:31,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-17 00:44:31,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-17 00:44:32,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-17 00:44:32,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-17 00:44:33,168 [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-07-17 00:44:33,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-17 00:44:34,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:44:34,034 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-17 00:44:34,034 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:34,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-17 00:44:34,034 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:34,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:34,041 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:44:34,046 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:34,046 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:44:34,052 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:44:34,058 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:34,058 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-17 00:44:34,485 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-17 00:44:34,485 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-17 00:44:34,489 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:34,490 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:34,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:34,495 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-17 00:44:34,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:34,506 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-17 00:44:34,536 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-17 00:44:34,536 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-17 00:44:34,536 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-17 00:44:34,536 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-17 00:44:34,536 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-17 00:44:34,536 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-17 00:44:34,536 [ scc.git] DEBUG Auto-merging setup.py
2024-07-17 00:44:34,536 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-17 00:44:34,536 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-17 00:44:34,536 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-17 00:44:34,542 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-17 00:44:34,549 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-17 00:44:34,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:34,717 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-17 00:44:34,724 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-17 00:44:34,730 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#125](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-07-17 00:44:34,735 [ scc.config] DEBUG Found github.token
2024-07-17 00:44:34,735 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-17 00:44:34,735 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:34,776 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:34,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:34,782 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:34,823 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:34,831 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc5e9f10> has no local changes
2024-07-17 00:44:34,832 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:34,852 [ scc.git] DEBUG [detached HEAD f315a8d] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:34,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:34,853 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:35,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-17 00:44:35,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-17 00:44:36,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-17 00:44:36,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-17 00:44:37,169 [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-07-17 00:44:37,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-17 00:44:38,102 [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-07-17 00:44:38,103 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-17 00:44:38,103 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:38,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-17 00:44:38,103 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:38,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:38,109 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:44:38,114 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:38,114 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:44:38,119 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:44:38,124 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:38,124 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-17 00:44:38,552 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-17 00:44:38,553 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-17 00:44:38,557 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:38,557 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:38,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:38,562 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-17 00:44:38,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:38,574 [ 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-07-17 00:44:38,587 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:44:38,590 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-17 00:44:38,590 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-17 00:44:38,590 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-17 00:44:38,590 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-17 00:44:38,590 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-17 00:44:38,590 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-17 00:44:38,591 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-17 00:44:38,591 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-17 00:44:38,594 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-17 00:44:38,594 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-17 00:44:38,594 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-17 00:44:38,594 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-17 00:44:38,594 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-17 00:44:38,594 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-17 00:44:38,594 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-17 00:44:38,595 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-17 00:44:38,595 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-17 00:44:38,595 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-17 00:44:38,595 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-17 00:44:38,595 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-17 00:44:38,595 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-17 00:44:38,595 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-17 00:44:38,595 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-17 00:44:38,595 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-17 00:44:38,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:38,761 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:38,802 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:38,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:38,808 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:38,850 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:38,858 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc5b3700> has no local changes
2024-07-17 00:44:38,858 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:38,868 [ scc.git] DEBUG [detached HEAD 9ff1750] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:38,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:38,869 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:39,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-17 00:44:39,196 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:39,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-17 00:44:39,196 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:39,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:39,203 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:44:39,209 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:39,209 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:44:39,216 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:44:39,224 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:39,224 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:39,224 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:39,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:39,230 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:39,269 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:39,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:39,274 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:39,311 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:39,317 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc59be50> has no local changes
2024-07-17 00:44:39,318 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:39,326 [ scc.git] DEBUG [detached HEAD 7a20a20] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:39,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:39,326 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:39,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-17 00:44:39,634 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:39,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-17 00:44:39,634 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:39,635 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:39,640 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:44:39,645 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:39,645 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:44:39,650 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:44:39,655 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:39,655 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:39,655 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:39,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:39,660 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:39,698 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:39,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:39,703 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:39,739 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:39,745 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc5664f0> has no local changes
2024-07-17 00:44:39,745 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:39,753 [ scc.git] DEBUG [detached HEAD aab2a9c] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:39,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:39,753 [ scc.git] INFO Overriding base-branch from master to main
2024-07-17 00:44:39,753 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:40,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-17 00:44:40,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-17 00:44:41,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-17 00:44:41,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-17 00:44:42,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-17 00:44:42,605 [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-07-17 00:44:43,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-17 00:44:43,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-17 00:44:43,972 [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-07-17 00:44:43,973 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-17 00:44:43,973 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:43,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-17 00:44:43,973 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:43,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:43,980 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-17 00:44:43,985 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:43,985 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-17 00:44:43,991 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-17 00:44:43,997 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:43,997 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-17 00:44:44,409 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-17 00:44:44,409 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-17 00:44:44,413 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:44,413 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:44,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:44,418 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-17 00:44:44,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:44,428 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-17 00:44:44,458 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-17 00:44:44,458 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-17 00:44:44,458 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-17 00:44:44,458 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-17 00:44:44,464 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-17 00:44:44,470 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-17 00:44:44,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:44,642 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-17 00:44:44,648 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-17 00:44:44,653 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#125](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-17 00:44:44,657 [ scc.config] DEBUG Found github.token
2024-07-17 00:44:44,657 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-17 00:44:44,658 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:44,694 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:44,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:44,700 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:44,736 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:44,742 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc5174f0> has no local changes
2024-07-17 00:44:44,742 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:44,750 [ scc.git] DEBUG [detached HEAD 866d6e5] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:44,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:44,751 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:45,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-17 00:44:45,084 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:45,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-17 00:44:45,084 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:45,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:45,089 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:44:45,094 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:45,094 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:44:45,099 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:44:45,104 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:45,105 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:45,105 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:45,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:45,109 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:45,146 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:45,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:45,151 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:45,187 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:45,193 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc54fb20> has no local changes
2024-07-17 00:44:45,193 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:45,201 [ scc.git] DEBUG [detached HEAD ae0f7e1] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:45,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:45,202 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:45,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-17 00:44:45,519 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:45,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-17 00:44:45,519 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:45,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:45,524 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:44:45,529 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:45,529 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:44:45,534 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:44:45,539 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:45,539 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:45,539 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:45,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:45,544 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:45,581 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:45,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:45,586 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:45,624 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:45,631 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc540700> has no local changes
2024-07-17 00:44:45,631 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:45,640 [ scc.git] DEBUG [detached HEAD 4b5b1b7] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:45,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:45,640 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:46,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-17 00:44:46,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-17 00:44:46,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-17 00:44:47,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-17 00:44:47,910 [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-07-17 00:44:48,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-17 00:44:48,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:44:48,789 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-17 00:44:48,789 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:48,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-17 00:44:48,789 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:48,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:48,796 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:44:48,803 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:48,803 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:44:48,811 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:44:48,819 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:48,819 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-17 00:44:49,265 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-17 00:44:49,266 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-17 00:44:49,270 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:49,270 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:49,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:49,277 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-17 00:44:49,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:49,289 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-17 00:44:49,318 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-17 00:44:49,318 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-17 00:44:49,318 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-17 00:44:49,319 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-17 00:44:49,326 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-17 00:44:49,334 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-17 00:44:49,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:49,512 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-17 00:44:49,518 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-17 00:44:49,524 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#125](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-17 00:44:49,529 [ scc.config] DEBUG Found github.token
2024-07-17 00:44:49,529 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-17 00:44:49,530 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:49,566 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:49,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:49,572 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:49,608 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:49,615 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc4d2df0> has no local changes
2024-07-17 00:44:49,615 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:49,623 [ scc.git] DEBUG [detached HEAD 5104ed1] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:49,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:49,624 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-17 00:44:49,624 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:44:50,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-17 00:44:50,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-17 00:44:51,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-17 00:44:51,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-17 00:44:52,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-17 00:44:52,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-17 00:44:53,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-17 00:44:53,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-17 00:44:53,997 [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-07-17 00:44:54,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-17 00:44:54,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-17 00:44:54,911 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-17 00:44:55,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-17 00:44:55,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-17 00:44:56,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-17 00:44:56,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-17 00:44:56,932 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:44:56,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-17 00:44:56,932 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:56,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:56,940 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-17 00:44:56,945 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:44:56,946 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-17 00:44:56,952 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-17 00:44:56,959 [ scc.git] DEBUG Already up to date.
2024-07-17 00:44:56,959 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-17 00:44:57,401 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-17 00:44:57,401 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-17 00:44:57,406 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:44:57,406 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:57,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:57,413 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-17 00:44:57,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:57,427 [ 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-07-17 00:44:57,489 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-17 00:44:57,490 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-17 00:44:57,490 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-17 00:44:57,490 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-17 00:44:57,496 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-17 00:44:57,503 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-17 00:44:57,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:57,669 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-17 00:44:57,676 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-17 00:44:57,682 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#125](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-17 00:44:57,687 [ scc.config] DEBUG Found github.token
2024-07-17 00:44:57,687 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-17 00:44:57,687 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:44:57,725 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:44:57,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:44:57,730 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:57,769 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:44:57,775 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bbc53dee0> has no local changes
2024-07-17 00:44:57,776 [ 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#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:44:57,783 [ scc.git] DEBUG [detached HEAD 2855828] merge master -Dorg -Ssuccess-only
2024-07-17 00:44:57,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:44:57,784 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:44:57,855 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-17 00:44:58,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:58,097 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-17 00:44:58,101 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-17 00:44:58,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:58,507 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-17 00:44:58,511 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-17 00:44:58,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:58,926 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-17 00:44:58,930 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-17 00:44:59,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:59,341 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-17 00:44:59,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:44:59,750 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-17 00:44:59,757 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-17 00:45:00,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:00,173 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-17 00:45:00,178 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-17 00:45:00,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:00,591 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-17 00:45:00,599 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-17 00:45:01,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:01,045 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-17 00:45:01,051 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-17 00:45:01,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:01,452 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-17 00:45:01,458 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-17 00:45:02,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:02,080 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-17 00:45:02,086 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-17 00:45:02,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:02,485 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-17 00:45:02,491 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-17 00:45:02,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:02,896 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-17 00:45:02,900 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-17 00:45:03,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:03,336 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-17 00:45:03,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:03,755 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-17 00:45:04,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:04,163 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-17 00:45:04,168 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-17 00:45:04,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:04,608 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-17 00:45:05,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:05,017 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-17 00:45:05,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:05,429 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-17 00:45:05,435 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-17 00:45:05,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:05,854 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-17 00:45:05,860 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-17 00:45:06,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:06,268 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-17 00:45:06,274 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-17 00:45:06,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:06,675 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-17 00:45:06,680 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-17 00:45:07,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:45:07,073 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-17 00:45:07,073 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:45:07,154 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bc073aaf0> has local changes
2024-07-17 00:45:07,155 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- 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 576 Rdornier 'Color picker - popup update'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 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'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#125 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/125/)'
2024-07-17 00:45:07,170 [ scc.git] DEBUG [detached HEAD 7120cf6] merge master -Dorg -Ssuccess-only
2024-07-17 00:45:07,171 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-17 00:45:07,171 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-17 00:45:07,171 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,171 [ scc.merge] INFO
2024-07-17 00:45:07,171 [ scc.merge] INFO
2024-07-17 00:45:07,171 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-17 00:45:07,171 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,171 [ scc.merge] INFO
2024-07-17 00:45:07,171 [ scc.merge] INFO
2024-07-17 00:45:07,171 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-17 00:45:07,171 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:45:07,171 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-17 00:45:07,171 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,171 [ scc.merge] INFO
2024-07-17 00:45:07,171 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,171 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-17 00:45:07,171 [ scc.merge] INFO
2024-07-17 00:45:07,171 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-17 00:45:07,171 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:45:07,171 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-17 00:45:07,171 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-17 00:45:07,171 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-17 00:45:07,171 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-17 00:45:07,171 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,171 [ scc.merge] INFO
2024-07-17 00:45:07,171 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,171 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-17 00:45:07,171 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-17 00:45:07,171 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-17 00:45:07,171 [ scc.merge] INFO
2024-07-17 00:45:07,172 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-17 00:45:07,172 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-17 00:45:07,172 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,172 [ scc.merge] INFO
2024-07-17 00:45:07,172 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-17 00:45:07,172 [ scc.merge] INFO
2024-07-17 00:45:07,172 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-17 00:45:07,172 [ scc.merge] INFO
2024-07-17 00:45:07,172 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-17 00:45:07,172 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-17 00:45:07,172 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,172 [ scc.merge] INFO
2024-07-17 00:45:07,172 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-07-17 00:45:07,172 [ scc.merge] INFO
2024-07-17 00:45:07,172 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-17 00:45:07,172 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,172 [ scc.merge] INFO
2024-07-17 00:45:07,172 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-17 00:45:07,172 [ scc.merge] INFO
2024-07-17 00:45:07,172 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-17 00:45:07,172 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,172 [ scc.merge] INFO
2024-07-17 00:45:07,172 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,172 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-17 00:45:07,172 [ scc.merge] INFO
2024-07-17 00:45:07,172 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-17 00:45:07,173 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:45:07,173 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-17 00:45:07,173 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-17 00:45:07,173 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,173 [ scc.merge] INFO
2024-07-17 00:45:07,173 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,173 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-17 00:45:07,173 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-17 00:45:07,173 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-17 00:45:07,173 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-17 00:45:07,173 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-17 00:45:07,173 [ scc.merge] INFO
2024-07-17 00:45:07,173 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-17 00:45:07,173 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:45:07,173 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-17 00:45:07,173 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,173 [ scc.merge] INFO
2024-07-17 00:45:07,173 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,173 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-17 00:45:07,173 [ scc.merge] INFO
2024-07-17 00:45:07,173 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-17 00:45:07,173 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,173 [ scc.merge] INFO
2024-07-17 00:45:07,173 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-17 00:45:07,174 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-17 00:45:07,174 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-17 00:45:07,174 [ scc.merge] INFO
2024-07-17 00:45:07,174 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-17 00:45:07,174 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:45:07,174 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-17 00:45:07,174 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-17 00:45:07,174 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-17 00:45:07,174 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,174 [ scc.merge] INFO
2024-07-17 00:45:07,174 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,174 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-17 00:45:07,174 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-17 00:45:07,174 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-17 00:45:07,174 [ scc.merge] INFO
2024-07-17 00:45:07,174 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-17 00:45:07,174 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,174 [ scc.merge] INFO
2024-07-17 00:45:07,174 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,174 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-17 00:45:07,174 [ scc.merge] INFO
2024-07-17 00:45:07,174 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-17 00:45:07,174 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:45:07,174 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-17 00:45:07,174 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,174 [ scc.merge] INFO
2024-07-17 00:45:07,174 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,174 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-17 00:45:07,174 [ scc.merge] INFO
2024-07-17 00:45:07,174 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-17 00:45:07,175 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-17 00:45:07,175 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-17 00:45:07,175 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO Merged PRs:
2024-07-17 00:45:07,175 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-17 00:45:07,175 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-17 00:45:07,175 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-17 00:45:07,175 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:45:07,175 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-17 00:45:07,175 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-17 00:45:07,175 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-17 00:45:07,175 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-17 00:45:07,175 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-17 00:45:07,175 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,175 [ scc.merge] INFO
2024-07-17 00:45:07,175 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-17 00:45:07,175 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-17 00:45:07,176 [ scc.merge] INFO
2024-07-17 00:45:07,176 [ scc.merge] INFO Repository: ome/scripts
2024-07-17 00:45:07,176 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:45:07,176 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-17 00:45:07,176 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-17 00:45:07,176 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-17 00:45:07,176 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-17 00:45:07,176 [ scc.merge] INFO Already up to date.
2024-07-17 00:45:07,176 [ scc.merge] INFO
2024-07-17 00:45:07,176 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-17 00:45:07,176 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-17 00:45:07,176 [ scc.merge] INFO
2024-07-17 00:45:07,176 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-17 00:45:07,176 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-17 00:45:07,182 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-17 00:45:07,187 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-17 00:45:07,192 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-17 00:45:07,197 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-17 00:45:07,202 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-17 00:45:07,206 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-17 00:45:07,211 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-17 00:45:07,217 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-17 00:45:07,224 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-17 00:45:07,231 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-17 00:45:07,237 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-17 00:45:07,243 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-17 00:45:07,249 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-17 00:45:07,257 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-17 00:45:07,264 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-17 00:45:07,274 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-17 00:45:07,280 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-17 00:45:07,287 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-17 00:45:07,292 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-17 00:45:07,299 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-17 00:45:07,304 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-17 00:45:07,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-17 00:45:07,314 [ scc.git] DEBUG Calling 'git remote'
2024-07-17 00:45:07,321 [ 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.1 to 5.9.2-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 9f487bc] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 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 fefe87cf
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 c20d273
nothing to commit, working tree clean
[detached HEAD cffe2f7] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-07-17 00:45:53,709 [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-07-17 00:46:03,077 [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-07-17 00:46:05,542 [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-07-17 00:46:10,194 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-17 00:46:59,373 [ 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/d8ca237c/images/svgs/logo.svg){kind=logo}
