Skipping 113 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-08-07 00:42:31,922 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:42:31,928 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:42:31,928 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:42:31,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:42:31,940 [ scc.git] DEBUG Already up to date.
2024-08-07 00:42:31,940 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-07 00:42:32,251 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-07 00:42:32,252 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-07 00:42:32,256 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-07 00:42:32,788 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-07 00:42:32,788 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-07 00:42:32,793 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-07 00:42:33,720 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-07 00:42:33,720 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-07 00:42:33,724 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-07 00:42:34,025 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-07 00:42:34,025 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-07 00:42:34,030 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-07 00:42:34,542 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-07 00:42:34,542 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-07 00:42:34,547 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:42:34,547 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:42:34,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:34,552 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-07 00:42:34,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:34,564 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-07 00:42:34,642 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-07 00:42:34,643 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:42:34,649 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-07 00:42:34,649 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-07 00:42:34,649 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-07 00:42:34,649 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-07 00:42:34,649 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-07 00:42:34,649 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-07 00:42:34,649 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-07 00:42:34,649 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-07 00:42:34,649 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-07 00:42:34,652 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-07 00:42:34,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:42:34,788 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-07 00:42:34,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:34,802 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-07 00:42:34,968 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-07 00:42:34,968 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-07 00:42:34,968 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-07 00:42:34,968 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-07 00:42:34,969 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:42:34,975 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-07 00:42:34,975 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-07 00:42:34,975 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-07 00:42:34,975 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-07 00:42:34,975 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-07 00:42:34,975 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-07 00:42:34,975 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-07 00:42:34,975 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-07 00:42:34,975 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-07 00:42:34,975 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-07 00:42:34,975 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-07 00:42:34,975 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-07 00:42:35,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:42:35,170 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-07 00:42:35,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:35,182 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-07 00:42:35,368 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-07 00:42:35,368 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-07 00:42:35,368 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-07 00:42:35,368 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-07 00:42:35,368 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-07 00:42:35,368 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-07 00:42:35,368 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:42:35,376 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-07 00:42:35,376 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-07 00:42:35,376 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-07 00:42:35,376 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-07 00:42:35,376 [ scc.git] DEBUG src/index.html | 1 +
2024-08-07 00:42:35,376 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-07 00:42:35,376 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-07 00:42:35,377 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-07 00:42:35,377 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-07 00:42:35,377 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-07 00:42:35,377 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-07 00:42:35,377 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-07 00:42:35,377 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-07 00:42:35,377 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-07 00:42:35,377 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-07 00:42:35,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:42:35,550 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-07 00:42:35,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:35,563 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-07 00:42:35,584 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:42:35,587 [ scc.git] DEBUG setup.py | 2 +-
2024-08-07 00:42:35,587 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-07 00:42:35,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:42:35,929 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-08-07 00:42:35,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:35,943 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-08-07 00:42:36,024 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-07 00:42:36,024 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-07 00:42:36,024 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:42:36,029 [ scc.git] DEBUG .gitignore | 2 +-
2024-08-07 00:42:36,029 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-07 00:42:36,029 [ scc.git] DEBUG src/index.html | 3 +++
2024-08-07 00:42:36,029 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-08-07 00:42:36,029 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-08-07 00:42:36,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:42:36,307 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:42:36,349 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:42:36,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:36,354 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:42:36,396 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:42:36,404 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f681918c490> has no local changes
2024-08-07 00:42:36,404 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:42:36,416 [ scc.git] DEBUG [detached HEAD 8d700aa3] merge master -Dorg -Ssuccess-only
2024-08-07 00:42:36,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:42:36,416 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:42:36,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-07 00:42:37,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-07 00:42:37,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-07 00:42:38,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-07 00:42:38,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:42:39,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-07 00:42:39,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:42:39,562 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-07 00:42:39,563 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:42:39,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-07 00:42:39,563 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:42:39,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:39,568 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:42:39,573 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:42:39,573 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:42:39,579 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:42:39,585 [ scc.git] DEBUG Already up to date.
2024-08-07 00:42:39,585 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-07 00:42:39,891 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-07 00:42:39,891 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-07 00:42:39,895 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:42:39,896 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:42:39,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:39,901 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-07 00:42:39,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:39,910 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-07 00:42:39,929 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-07 00:42:39,929 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:42:39,932 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-07 00:42:39,932 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-07 00:42:40,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:42:40,061 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:42:40,099 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:42:40,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:40,104 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:42:40,151 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:42:40,157 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f68191697c0> has no local changes
2024-08-07 00:42:40,157 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:42:40,165 [ scc.git] DEBUG [detached HEAD 518cf14] merge master -Dorg -Ssuccess-only
2024-08-07 00:42:40,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:42:40,166 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:42:40,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-07 00:42:40,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-07 00:42:40,950 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-07 00:42:41,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-07 00:42:42,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:42:42,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-07 00:42:43,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-07 00:42:43,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:42:43,480 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-07 00:42:43,480 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:42:43,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-07 00:42:43,480 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:42:43,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:43,486 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:42:43,491 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:42:43,492 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:42:43,497 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:42:43,503 [ scc.git] DEBUG Already up to date.
2024-08-07 00:42:43,504 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-07 00:42:43,794 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-07 00:42:43,794 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-07 00:42:43,799 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:42:43,799 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:42:43,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:43,804 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-07 00:42:43,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:43,814 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-07 00:42:43,824 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:42:43,828 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-07 00:42:43,828 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-07 00:42:43,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:42:43,995 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:42:44,035 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:42:44,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:42:44,041 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:42:44,079 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:42:44,086 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f68191c5af0> has no local changes
2024-08-07 00:42:44,086 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:42:44,094 [ scc.git] DEBUG [detached HEAD 40961da] merge master -Dorg -Ssuccess-only
2024-08-07 00:42:44,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:42:44,095 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:42:44,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-07 00:42:45,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-07 00:42:45,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-07 00:42:45,475 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-07 00:42:46,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-07 00:42:46,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:42:47,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-07 00:42:47,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-07 00:42:48,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:42:48,043 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-07 00:42:48,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-07 00:42:48,494 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-07 00:42:49,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-07 00:42:49,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:42:49,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-07 00:42:50,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-07 00:42:50,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:42:50,912 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-07 00:42:51,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-07 00:42:51,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-07 00:42:52,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-07 00:42:52,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:42:53,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-07 00:42:53,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-07 00:42:54,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:42:54,116 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-07 00:42:54,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-07 00:42:55,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-07 00:42:55,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-07 00:42:55,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:42:56,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-07 00:42:57,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-07 00:42:57,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:42:57,431 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-07 00:42:57,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-07 00:42:58,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-07 00:42:58,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-07 00:42:59,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:42:59,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-07 00:43:00,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:00,184 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-07 00:43:00,185 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:00,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-07 00:43:00,186 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:00,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:00,194 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:00,201 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:00,202 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:00,263 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:00,272 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:00,273 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-07 00:43:00,769 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-07 00:43:00,769 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-07 00:43:00,777 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-07 00:43:01,768 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-07 00:43:01,768 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-07 00:43:01,775 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-07 00:43:02,139 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-07 00:43:02,139 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-07 00:43:02,144 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-07 00:43:02,429 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-07 00:43:02,429 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-07 00:43:02,435 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-07 00:43:02,737 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-07 00:43:02,737 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-07 00:43:02,744 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:02,744 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:02,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:02,749 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-07 00:43:02,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:02,759 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-07 00:43:02,798 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-07 00:43:02,798 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:02,802 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-07 00:43:02,802 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-07 00:43:02,802 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-07 00:43:02,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:02,952 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-07 00:43:02,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:02,976 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-07 00:43:03,054 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-07 00:43:03,055 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-07 00:43:03,055 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-07 00:43:03,055 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-07 00:43:03,055 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:03,059 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-07 00:43:03,059 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-07 00:43:03,059 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-07 00:43:03,059 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-07 00:43:03,059 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-07 00:43:03,059 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-07 00:43:03,059 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-07 00:43:03,060 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-07 00:43:03,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:03,334 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-07 00:43:03,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:03,346 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-07 00:43:03,380 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-07 00:43:03,381 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:03,385 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-07 00:43:03,385 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-07 00:43:03,385 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-07 00:43:03,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:03,721 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-07 00:43:03,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:03,746 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-07 00:43:03,766 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:03,777 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-07 00:43:03,777 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-07 00:43:04,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:04,109 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-07 00:43:04,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:04,137 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-07 00:43:04,191 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-07 00:43:04,192 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:04,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:04,513 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:04,554 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:04,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:04,561 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:04,605 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:04,613 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f68191c5d90> has no local changes
2024-08-07 00:43:04,613 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Generated by OMERO-plugins-push#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:04,623 [ scc.git] DEBUG [detached HEAD 75c3aaa] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:04,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:04,624 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:05,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-07 00:43:05,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-07 00:43:05,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-07 00:43:06,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-07 00:43:06,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:07,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-07 00:43:08,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-07 00:43:08,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:08,461 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-07 00:43:08,461 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:08,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-07 00:43:08,462 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:08,462 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:08,467 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:08,472 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:08,472 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:08,477 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:08,483 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:08,483 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-07 00:43:08,785 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-07 00:43:08,785 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-07 00:43:08,789 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:08,789 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:08,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:08,795 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-07 00:43:08,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:08,807 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-07 00:43:08,818 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:08,820 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-07 00:43:08,820 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-07 00:43:08,821 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-07 00:43:08,821 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-07 00:43:08,821 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-07 00:43:08,823 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-07 00:43:08,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:08,960 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:08,997 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:08,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:09,003 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:09,039 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:09,045 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f681813ff70> has no local changes
2024-08-07 00:43:09,045 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:09,053 [ scc.git] DEBUG [detached HEAD d563d21] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:09,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:09,053 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:09,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-07 00:43:09,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-07 00:43:10,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-07 00:43:10,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-07 00:43:11,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:11,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-07 00:43:12,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:12,341 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-07 00:43:12,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-07 00:43:13,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-07 00:43:13,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-07 00:43:14,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:14,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-07 00:43:15,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:15,005 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-07 00:43:15,005 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:15,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-07 00:43:15,005 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:15,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:15,011 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:15,016 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:15,016 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:15,021 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:15,027 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:15,027 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-07 00:43:15,480 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-07 00:43:15,481 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-07 00:43:15,485 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-07 00:43:15,975 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-07 00:43:15,975 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-07 00:43:15,980 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:15,980 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:15,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:15,985 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-07 00:43:15,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:15,996 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-07 00:43:16,082 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-07 00:43:16,082 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-07 00:43:16,082 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-07 00:43:16,082 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-07 00:43:16,082 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-07 00:43:16,083 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-07 00:43:16,089 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-07 00:43:16,095 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-07 00:43:16,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:16,221 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-07 00:43:16,228 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-07 00:43:16,234 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#145](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-08-07 00:43:16,239 [ scc.config] DEBUG Found github.token
2024-08-07 00:43:16,239 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-07 00:43:16,239 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-07 00:43:16,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:16,250 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-07 00:43:16,268 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-07 00:43:16,268 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-07 00:43:16,268 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-07 00:43:16,268 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-07 00:43:16,269 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-07 00:43:16,274 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-07 00:43:16,282 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-07 00:43:16,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:16,612 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-07 00:43:16,618 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-07 00:43:16,624 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#145](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-08-07 00:43:16,628 [ scc.config] DEBUG Found github.token
2024-08-07 00:43:16,628 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-07 00:43:16,629 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:16,668 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:16,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:16,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:16,713 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:16,720 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f681915ed90> has no local changes
2024-08-07 00:43:16,721 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:16,730 [ scc.git] DEBUG [detached HEAD f7be023] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:16,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:16,730 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:17,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-07 00:43:17,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-07 00:43:17,860 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-07 00:43:18,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-07 00:43:19,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:19,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-07 00:43:20,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-07 00:43:20,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:20,443 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-07 00:43:20,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-07 00:43:20,890 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-07 00:43:21,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-07 00:43:21,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:22,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-07 00:43:22,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-07 00:43:23,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:23,268 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-07 00:43:23,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-07 00:43:23,715 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-07 00:43:24,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-07 00:43:24,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:25,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-07 00:43:25,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-07 00:43:26,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:26,160 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-07 00:43:26,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-07 00:43:27,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-07 00:43:27,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-07 00:43:27,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-07 00:43:28,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-07 00:43:28,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-07 00:43:28,944 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:28,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-07 00:43:28,944 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:28,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:28,950 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:28,955 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:28,955 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:28,960 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:28,966 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:28,966 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-07 00:43:29,309 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-07 00:43:29,310 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-07 00:43:29,314 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-07 00:43:29,618 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-07 00:43:29,619 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-07 00:43:29,623 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-07 00:43:29,904 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-07 00:43:29,905 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-07 00:43:29,909 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:29,909 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:29,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:29,917 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-07 00:43:29,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:29,928 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-07 00:43:29,938 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:29,941 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-07 00:43:29,941 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-07 00:43:30,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:30,078 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-07 00:43:30,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:30,088 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-07 00:43:30,130 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-07 00:43:30,130 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:30,134 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-07 00:43:30,134 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-07 00:43:30,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:30,463 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-07 00:43:30,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:30,475 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-07 00:43:30,487 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-07 00:43:30,487 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:30,490 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-07 00:43:30,490 [ scc.git] DEBUG package.json | 2 +-
2024-08-07 00:43:30,490 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-07 00:43:30,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:30,845 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:30,886 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:30,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:30,892 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:30,930 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:30,937 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f68180fa5b0> has no local changes
2024-08-07 00:43:30,937 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:30,947 [ scc.git] DEBUG [detached HEAD 28b2830] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:30,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:30,947 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:31,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-07 00:43:31,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-07 00:43:32,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-07 00:43:32,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:33,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-07 00:43:33,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:33,643 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-07 00:43:33,643 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:33,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-07 00:43:33,643 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:33,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:33,648 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:33,653 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:33,654 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:33,659 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:33,666 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:33,666 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-07 00:43:34,011 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-07 00:43:34,012 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-07 00:43:34,018 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:34,018 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:34,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:34,025 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-07 00:43:34,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:34,036 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-07 00:43:34,046 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:34,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:34,196 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:34,236 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:34,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:34,243 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:34,292 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:34,299 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f681811ceb0> has no local changes
2024-08-07 00:43:34,300 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:34,309 [ scc.git] DEBUG [detached HEAD 0dcf7f2] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:34,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:34,310 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:34,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-07 00:43:35,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-07 00:43:35,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-07 00:43:36,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-07 00:43:36,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-07 00:43:37,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:37,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-07 00:43:37,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:37,980 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-07 00:43:37,980 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:37,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-07 00:43:37,980 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:37,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:37,986 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:37,991 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:37,992 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:37,997 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:38,002 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:38,002 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-07 00:43:38,373 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-07 00:43:38,373 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-07 00:43:38,378 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:38,378 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:38,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:38,383 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-07 00:43:38,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:38,395 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-07 00:43:38,405 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-07 00:43:38,406 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:38,408 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-07 00:43:38,408 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-07 00:43:38,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:38,543 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:38,584 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:38,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:38,589 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:38,631 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:38,637 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6818090bb0> has no local changes
2024-08-07 00:43:38,638 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:38,647 [ scc.git] DEBUG [detached HEAD df154b3] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:38,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:38,648 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:39,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-07 00:43:39,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-07 00:43:39,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-07 00:43:40,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-07 00:43:40,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:41,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-07 00:43:41,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:41,906 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-07 00:43:41,906 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:41,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-07 00:43:41,906 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:41,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:41,911 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:41,917 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:41,917 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:41,922 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:41,928 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:41,928 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-07 00:43:42,272 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-07 00:43:42,272 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-07 00:43:42,277 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:42,278 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:42,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:42,285 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-07 00:43:42,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:42,298 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-07 00:43:42,377 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-07 00:43:42,377 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-07 00:43:42,377 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-07 00:43:42,377 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-07 00:43:42,377 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-07 00:43:42,377 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-07 00:43:42,377 [ scc.git] DEBUG Auto-merging setup.py
2024-08-07 00:43:42,377 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-07 00:43:42,377 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-07 00:43:42,377 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-07 00:43:42,384 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-07 00:43:42,391 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-07 00:43:42,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:42,528 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-07 00:43:42,534 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-07 00:43:42,540 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#145](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-08-07 00:43:42,545 [ scc.config] DEBUG Found github.token
2024-08-07 00:43:42,545 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-07 00:43:42,545 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:42,587 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:42,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:42,593 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:42,633 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:42,639 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f68180fa7f0> has no local changes
2024-08-07 00:43:42,639 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:42,648 [ scc.git] DEBUG [detached HEAD 5828dc3] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:42,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:42,648 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:43,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-07 00:43:43,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-07 00:43:43,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-07 00:43:44,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-07 00:43:44,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:45,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-07 00:43:45,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:45,790 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-07 00:43:45,790 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:45,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-07 00:43:45,790 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:45,790 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:45,797 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:45,802 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:45,802 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:45,809 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:45,815 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:45,816 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-07 00:43:46,269 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-07 00:43:46,269 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-07 00:43:46,283 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:46,284 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:46,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:46,292 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-07 00:43:46,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:46,306 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-08-07 00:43:46,321 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-07 00:43:46,325 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-07 00:43:46,325 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-07 00:43:46,327 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-07 00:43:46,327 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-07 00:43:46,327 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-07 00:43:46,328 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-07 00:43:46,328 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-07 00:43:46,328 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-07 00:43:46,328 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-07 00:43:46,328 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-07 00:43:46,329 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-07 00:43:46,330 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-07 00:43:46,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:46,460 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:46,504 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:46,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:46,510 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:46,552 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:46,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f68180cfca0> has no local changes
2024-08-07 00:43:46,559 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:46,570 [ scc.git] DEBUG [detached HEAD 81245b5] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:46,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:46,571 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:46,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-07 00:43:46,871 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:46,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-07 00:43:46,871 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:46,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:46,877 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:46,881 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:46,881 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:46,886 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:46,891 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:46,891 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:46,891 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:46,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:46,896 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:46,933 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:46,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:46,938 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:46,974 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:46,980 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f68180672b0> has no local changes
2024-08-07 00:43:46,980 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:46,987 [ scc.git] DEBUG [detached HEAD 80b7a34] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:46,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:46,988 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:47,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-07 00:43:47,279 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:47,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-07 00:43:47,279 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:47,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:47,284 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:47,289 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:47,290 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:47,294 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:47,299 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:47,299 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:47,300 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:47,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:47,304 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:47,342 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:47,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:47,347 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:47,385 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:47,390 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f681808ed00> has no local changes
2024-08-07 00:43:47,391 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:47,398 [ scc.git] DEBUG [detached HEAD dcd6219] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:47,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:47,399 [ scc.git] INFO Overriding base-branch from master to main
2024-08-07 00:43:47,399 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:47,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-07 00:43:48,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-07 00:43:48,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-07 00:43:49,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-07 00:43:49,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-07 00:43:50,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:50,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-07 00:43:50,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:50,970 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-07 00:43:50,970 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:50,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-07 00:43:50,971 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:50,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:50,976 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-07 00:43:50,982 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:50,982 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-07 00:43:50,988 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-07 00:43:50,994 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:50,994 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-07 00:43:51,350 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-07 00:43:51,351 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-07 00:43:51,355 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:51,355 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:51,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:51,361 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-07 00:43:51,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:51,373 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-07 00:43:51,396 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-07 00:43:51,396 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-07 00:43:51,396 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-07 00:43:51,397 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-07 00:43:51,403 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-07 00:43:51,410 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-07 00:43:51,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:51,543 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-07 00:43:51,548 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-07 00:43:51,554 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#145](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-07 00:43:51,558 [ scc.config] DEBUG Found github.token
2024-08-07 00:43:51,558 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-07 00:43:51,558 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:51,596 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:51,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:51,602 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:51,653 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:51,660 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f68180c2d90> has no local changes
2024-08-07 00:43:51,660 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:51,669 [ scc.git] DEBUG [detached HEAD 0f5efe1] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:51,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:51,670 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:51,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-07 00:43:51,940 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:51,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-07 00:43:51,940 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:51,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:51,946 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:51,950 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:51,951 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:51,955 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:51,961 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:51,961 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:51,961 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:51,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:51,966 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:52,008 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:52,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:52,015 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:52,059 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:52,067 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f681806e190> has no local changes
2024-08-07 00:43:52,067 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:52,077 [ scc.git] DEBUG [detached HEAD aa031fc] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:52,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:52,078 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:52,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-07 00:43:52,350 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:52,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-07 00:43:52,350 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:52,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:52,356 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:52,362 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:52,362 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:52,368 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:52,374 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:52,375 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:52,375 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:52,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:52,381 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:52,426 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:52,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:52,432 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:52,478 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:52,485 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f681808a4f0> has no local changes
2024-08-07 00:43:52,485 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:52,494 [ scc.git] DEBUG [detached HEAD cadf424] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:52,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:52,495 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:52,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-07 00:43:53,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-07 00:43:53,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-07 00:43:54,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-07 00:43:54,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:43:55,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-07 00:43:55,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:43:55,524 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-07 00:43:55,524 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:43:55,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-07 00:43:55,524 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:55,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:55,531 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-07 00:43:55,538 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:43:55,538 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-07 00:43:55,544 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-07 00:43:55,551 [ scc.git] DEBUG Already up to date.
2024-08-07 00:43:55,552 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-07 00:43:55,916 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-07 00:43:55,916 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-07 00:43:55,921 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:43:55,921 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:55,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:55,927 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-07 00:43:55,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:55,939 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-07 00:43:55,985 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-07 00:43:55,985 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-07 00:43:55,986 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-07 00:43:55,986 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-07 00:43:55,992 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-07 00:43:55,999 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-07 00:43:56,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:43:56,177 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-07 00:43:56,183 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-07 00:43:56,188 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#145](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-07 00:43:56,193 [ scc.config] DEBUG Found github.token
2024-08-07 00:43:56,194 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-07 00:43:56,194 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:43:56,230 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:43:56,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:43:56,236 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:43:56,275 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:43:56,282 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6818059f40> has no local changes
2024-08-07 00:43:56,282 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:43:56,292 [ scc.git] DEBUG [detached HEAD c113f4f] merge master -Dorg -Ssuccess-only
2024-08-07 00:43:56,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:43:56,292 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-07 00:43:56,292 [ scc.repo] DEBUG ## PRs found:
2024-08-07 00:43:56,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-07 00:43:57,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-07 00:43:57,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-07 00:43:58,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-07 00:43:58,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-07 00:43:59,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-07 00:43:59,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-07 00:43:59,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-07 00:44:00,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-07 00:44:00,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-07 00:44:01,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-07 00:44:01,206 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-07 00:44:01,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-07 00:44:02,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-07 00:44:02,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-07 00:44:03,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-07 00:44:03,129 [ scc.repo] DEBUG ## Branches found:
2024-08-07 00:44:03,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-07 00:44:03,129 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:44:03,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:44:03,134 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-07 00:44:03,140 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-07 00:44:03,140 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-07 00:44:03,146 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-07 00:44:03,152 [ scc.git] DEBUG Already up to date.
2024-08-07 00:44:03,152 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-07 00:44:03,584 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-07 00:44:03,584 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-07 00:44:03,588 [ scc.git] DEBUG ## Unique users: []
2024-08-07 00:44:03,589 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:44:03,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:44:03,594 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-07 00:44:03,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:44:03,607 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-07 00:44:03,658 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-07 00:44:03,658 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-07 00:44:03,659 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-07 00:44:03,660 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-07 00:44:03,666 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-07 00:44:03,671 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-07 00:44:03,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:03,805 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-07 00:44:03,813 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-07 00:44:03,819 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#145](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-07 00:44:03,825 [ scc.config] DEBUG Found github.token
2024-08-07 00:44:03,825 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-07 00:44:03,825 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-07 00:44:03,874 [ scc.git] DEBUG Get sha1 of %s
2024-08-07 00:44:03,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-07 00:44:03,881 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:44:03,920 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:44:03,926 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f681802e970> has no local changes
2024-08-07 00:44:03,926 [ 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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:44:03,936 [ scc.git] DEBUG [detached HEAD 0080a19] merge master -Dorg -Ssuccess-only
2024-08-07 00:44:03,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:03,936 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-07 00:44:04,013 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-07 00:44:04,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:04,202 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-07 00:44:04,207 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-07 00:44:04,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:04,595 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-07 00:44:04,599 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-07 00:44:04,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:04,982 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-07 00:44:04,987 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-07 00:44:05,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:05,380 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-07 00:44:05,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:05,754 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-07 00:44:05,758 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-07 00:44:06,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:06,156 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-07 00:44:06,161 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-07 00:44:06,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:06,552 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-07 00:44:06,557 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-07 00:44:06,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:06,935 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-07 00:44:06,939 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-07 00:44:07,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:07,363 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-07 00:44:07,369 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-07 00:44:07,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:07,746 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-07 00:44:07,751 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-07 00:44:08,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:08,131 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-07 00:44:08,137 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-07 00:44:08,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:08,513 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-07 00:44:08,518 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-07 00:44:08,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:08,908 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-07 00:44:09,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:09,289 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-07 00:44:09,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:09,675 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-07 00:44:09,680 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-07 00:44:10,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:10,060 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-07 00:44:10,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:10,453 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-07 00:44:10,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:10,830 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-07 00:44:10,834 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-07 00:44:11,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:11,224 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-07 00:44:11,228 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-07 00:44:11,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:11,652 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-07 00:44:11,657 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-07 00:44:12,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:12,039 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-07 00:44:12,043 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-07 00:44:12,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-07 00:44:12,424 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-07 00:44:12,424 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-07 00:44:12,499 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f681a262790> has local changes
2024-08-07 00:44:12,499 [ 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.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- 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 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (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 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
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#145 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/145/)'
2024-08-07 00:44:12,513 [ scc.git] DEBUG [detached HEAD f464f3d] merge master -Dorg -Ssuccess-only
2024-08-07 00:44:12,513 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-07 00:44:12,513 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-07 00:44:12,513 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,513 [ scc.merge] INFO
2024-08-07 00:44:12,513 [ scc.merge] INFO
2024-08-07 00:44:12,513 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-07 00:44:12,513 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,513 [ scc.merge] INFO
2024-08-07 00:44:12,514 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-07 00:44:12,514 [ scc.merge] INFO
2024-08-07 00:44:12,514 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-07 00:44:12,514 [ scc.merge] INFO Excluded PRs:
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-07 00:44:12,514 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,514 [ scc.merge] INFO
2024-08-07 00:44:12,514 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-07 00:44:12,514 [ scc.merge] INFO
2024-08-07 00:44:12,514 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-07 00:44:12,514 [ scc.merge] INFO Excluded PRs:
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-07 00:44:12,514 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,514 [ scc.merge] INFO
2024-08-07 00:44:12,514 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-07 00:44:12,514 [ scc.merge] INFO
2024-08-07 00:44:12,514 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-07 00:44:12,514 [ scc.merge] INFO Excluded PRs:
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-07 00:44:12,514 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,514 [ scc.merge] INFO
2024-08-07 00:44:12,514 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-07 00:44:12,514 [ scc.merge] INFO
2024-08-07 00:44:12,514 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-07 00:44:12,514 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-07 00:44:12,514 [ scc.merge] INFO
2024-08-07 00:44:12,514 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-07 00:44:12,515 [ scc.merge] INFO Excluded PRs:
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-07 00:44:12,515 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,515 [ scc.merge] INFO
2024-08-07 00:44:12,515 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-07 00:44:12,515 [ scc.merge] INFO
2024-08-07 00:44:12,515 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-07 00:44:12,515 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,515 [ scc.merge] INFO
2024-08-07 00:44:12,515 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-07 00:44:12,515 [ scc.merge] INFO
2024-08-07 00:44:12,515 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-07 00:44:12,515 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,515 [ scc.merge] INFO
2024-08-07 00:44:12,515 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-07 00:44:12,515 [ scc.merge] INFO
2024-08-07 00:44:12,515 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-07 00:44:12,515 [ scc.merge] INFO Excluded PRs:
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-07 00:44:12,515 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,515 [ scc.merge] INFO
2024-08-07 00:44:12,515 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-07 00:44:12,515 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-07 00:44:12,516 [ scc.merge] INFO
2024-08-07 00:44:12,516 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-07 00:44:12,516 [ scc.merge] INFO Excluded PRs:
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-07 00:44:12,516 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,516 [ scc.merge] INFO
2024-08-07 00:44:12,516 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-07 00:44:12,516 [ scc.merge] INFO
2024-08-07 00:44:12,516 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-07 00:44:12,516 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,516 [ scc.merge] INFO
2024-08-07 00:44:12,516 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-07 00:44:12,516 [ scc.merge] INFO
2024-08-07 00:44:12,516 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-07 00:44:12,516 [ scc.merge] INFO Excluded PRs:
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-07 00:44:12,516 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,516 [ scc.merge] INFO
2024-08-07 00:44:12,516 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-07 00:44:12,516 [ scc.merge] INFO
2024-08-07 00:44:12,516 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-07 00:44:12,516 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,516 [ scc.merge] INFO
2024-08-07 00:44:12,516 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-07 00:44:12,516 [ scc.merge] INFO
2024-08-07 00:44:12,516 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-07 00:44:12,516 [ scc.merge] INFO Excluded PRs:
2024-08-07 00:44:12,516 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-07 00:44:12,516 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,517 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-07 00:44:12,517 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-07 00:44:12,517 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-07 00:44:12,517 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO Merged PRs:
2024-08-07 00:44:12,517 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-07 00:44:12,517 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-07 00:44:12,517 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-07 00:44:12,517 [ scc.merge] INFO Excluded PRs:
2024-08-07 00:44:12,517 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-07 00:44:12,517 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-07 00:44:12,517 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-07 00:44:12,517 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-07 00:44:12,517 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,517 [ scc.merge] INFO
2024-08-07 00:44:12,518 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-07 00:44:12,518 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,518 [ scc.merge] INFO
2024-08-07 00:44:12,518 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-07 00:44:12,518 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-07 00:44:12,518 [ scc.merge] INFO
2024-08-07 00:44:12,518 [ scc.merge] INFO Repository: ome/scripts
2024-08-07 00:44:12,518 [ scc.merge] INFO Excluded PRs:
2024-08-07 00:44:12,518 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-07 00:44:12,518 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-07 00:44:12,518 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-07 00:44:12,518 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-07 00:44:12,518 [ scc.merge] INFO Already up to date.
2024-08-07 00:44:12,518 [ scc.merge] INFO
2024-08-07 00:44:12,518 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-07 00:44:12,518 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-07 00:44:12,518 [ scc.merge] INFO
2024-08-07 00:44:12,518 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-07 00:44:12,518 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-07 00:44:12,523 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-07 00:44:12,528 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-07 00:44:12,533 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-07 00:44:12,537 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-07 00:44:12,542 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-07 00:44:12,547 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-07 00:44:12,551 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-07 00:44:12,556 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-07 00:44:12,561 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-07 00:44:12,565 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-07 00:44:12,570 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-07 00:44:12,575 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-07 00:44:12,579 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-07 00:44:12,584 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-07 00:44:12,588 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-07 00:44:12,593 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-07 00:44:12,597 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-07 00:44:12,602 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-07 00:44:12,606 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,611 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,611 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-07 00:44:12,611 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-07 00:44:12,616 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-07 00:44:12,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-07 00:44:12,620 [ scc.git] DEBUG Calling 'git remote'
2024-08-07 00:44:12,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.2 to 5.9.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD ae3a0c5] 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 312afbe
nothing to commit, working tree clean
[detached HEAD fcdcdf4] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-07 00:44:57,489 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-08-07 00:45:06,026 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-08-07 00:45:08,272 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-07 00:45:12,665 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-07 00:45:53,515 [ 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/f6f303f9/images/svgs/logo.svg){kind=logo}
