Skipping 109 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-07-21 00:43:02,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-21 00:43:02,347 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:02,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:02,353 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:43:02,359 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:43:02,359 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:43:02,366 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:43:02,372 [ scc.git] DEBUG Already up to date.
2024-07-21 00:43:02,372 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-21 00:43:02,777 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-21 00:43:02,777 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-21 00:43:02,782 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-21 00:43:03,409 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-21 00:43:03,409 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-21 00:43:03,414 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-21 00:43:04,436 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-21 00:43:04,436 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-21 00:43:04,441 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-21 00:43:04,817 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-21 00:43:04,817 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-21 00:43:04,822 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-07-21 00:43:05,411 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-21 00:43:05,411 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-07-21 00:43:05,416 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:43:05,417 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:05,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:05,422 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-21 00:43:05,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:05,436 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-21 00:43:05,541 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-21 00:43:05,542 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:05,548 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-21 00:43:05,548 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-21 00:43:05,548 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-21 00:43:05,548 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-21 00:43:05,549 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-21 00:43:05,549 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-21 00:43:05,549 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-21 00:43:05,549 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-21 00:43:05,549 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-21 00:43:05,549 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-21 00:43:05,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:05,715 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-21 00:43:05,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:05,729 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-21 00:43:05,976 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-21 00:43:05,976 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-21 00:43:05,976 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-21 00:43:05,976 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-21 00:43:05,976 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:05,982 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-21 00:43:05,983 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-21 00:43:05,983 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-21 00:43:05,983 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-21 00:43:05,983 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-21 00:43:05,983 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-21 00:43:05,983 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-21 00:43:05,983 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-21 00:43:05,983 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-21 00:43:05,983 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-21 00:43:05,983 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-21 00:43:05,983 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-21 00:43:06,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:06,149 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-21 00:43:06,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:06,164 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-21 00:43:06,528 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-07-21 00:43:06,529 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-21 00:43:06,529 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-21 00:43:06,529 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-07-21 00:43:06,529 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-21 00:43:06,529 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-21 00:43:06,529 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:06,537 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-07-21 00:43:06,537 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-07-21 00:43:06,537 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-07-21 00:43:06,537 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-07-21 00:43:06,537 [ scc.git] DEBUG src/index.html | 1 +
2024-07-21 00:43:06,537 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-07-21 00:43:06,537 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-07-21 00:43:06,537 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-07-21 00:43:06,537 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-07-21 00:43:06,537 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-07-21 00:43:06,537 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-07-21 00:43:06,537 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-07-21 00:43:06,537 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-07-21 00:43:06,537 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-07-21 00:43:06,537 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-07-21 00:43:06,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:06,705 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-21 00:43:06,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:06,719 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-21 00:43:06,750 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:06,753 [ scc.git] DEBUG setup.py | 2 +-
2024-07-21 00:43:06,753 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-21 00:43:07,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:07,113 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-07-21 00:43:07,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:07,128 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-07-21 00:43:07,211 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-21 00:43:07,212 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-21 00:43:07,212 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:07,218 [ scc.git] DEBUG .gitignore | 2 +-
2024-07-21 00:43:07,218 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-07-21 00:43:07,218 [ scc.git] DEBUG src/index.html | 3 +++
2024-07-21 00:43:07,218 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-07-21 00:43:07,218 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-07-21 00:43:07,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:07,553 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:43:07,596 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:07,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:07,602 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:43:07,643 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:43:07,654 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d6b96490> has no local changes
2024-07-21 00:43:07,654 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:43:07,667 [ scc.git] DEBUG [detached HEAD 930022ac] merge master -Dorg -Ssuccess-only
2024-07-21 00:43:07,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:43:07,668 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:43:08,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-21 00:43:08,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-21 00:43:09,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-21 00:43:09,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-21 00:43:10,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:10,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-21 00:43:11,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:11,110 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-21 00:43:11,110 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:43:11,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-21 00:43:11,110 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:11,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:11,116 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:43:11,121 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:43:11,121 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:43:11,126 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:43:11,136 [ scc.git] DEBUG Already up to date.
2024-07-21 00:43:11,136 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-21 00:43:11,485 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-21 00:43:11,485 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-21 00:43:11,491 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:43:11,491 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:11,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:11,497 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-21 00:43:11,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:11,512 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-21 00:43:11,553 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-21 00:43:11,554 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:11,558 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-21 00:43:11,558 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-21 00:43:11,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:11,728 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:43:11,771 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:11,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:11,777 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:43:11,825 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:43:11,832 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d6baea60> has no local changes
2024-07-21 00:43:11,833 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:43:11,843 [ scc.git] DEBUG [detached HEAD e91164c] merge master -Dorg -Ssuccess-only
2024-07-21 00:43:11,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:43:11,844 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:43:12,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-21 00:43:12,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-21 00:43:12,709 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-21 00:43:13,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-21 00:43:13,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:14,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-21 00:43:14,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-21 00:43:15,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:15,288 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-21 00:43:15,288 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:43:15,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-21 00:43:15,289 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:15,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:15,296 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:43:15,301 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:43:15,302 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:43:15,308 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:43:15,315 [ scc.git] DEBUG Already up to date.
2024-07-21 00:43:15,315 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-21 00:43:15,675 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-21 00:43:15,676 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-21 00:43:15,680 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:43:15,681 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:15,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:15,686 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-21 00:43:15,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:15,696 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-21 00:43:15,706 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:15,710 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-21 00:43:15,710 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-21 00:43:15,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:15,869 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:43:15,912 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:15,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:15,918 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:43:15,955 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:43:15,963 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d6bb7af0> has no local changes
2024-07-21 00:43:15,963 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:43:15,972 [ scc.git] DEBUG [detached HEAD d92746e] merge master -Dorg -Ssuccess-only
2024-07-21 00:43:15,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:43:15,972 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:43:16,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-21 00:43:16,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-07-21 00:43:17,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-21 00:43:17,413 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-21 00:43:18,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-21 00:43:18,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:19,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-21 00:43:19,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-21 00:43:20,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:20,085 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-21 00:43:20,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-21 00:43:20,562 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-21 00:43:21,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-21 00:43:21,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:22,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-21 00:43:22,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-21 00:43:23,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:23,118 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-21 00:43:23,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-21 00:43:24,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-21 00:43:24,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-21 00:43:25,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:25,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-21 00:43:26,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-21 00:43:27,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:27,542 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-21 00:43:28,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-21 00:43:28,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-21 00:43:29,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-21 00:43:29,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:30,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-21 00:43:30,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-21 00:43:31,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:31,004 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-21 00:43:31,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-21 00:43:31,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-21 00:43:32,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-21 00:43:32,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:33,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-21 00:43:33,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:33,898 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-21 00:43:33,898 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:43:33,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-21 00:43:33,898 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:33,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:33,904 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:43:33,909 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:43:33,909 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:43:33,940 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:43:33,947 [ scc.git] DEBUG Already up to date.
2024-07-21 00:43:33,947 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-21 00:43:34,604 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-21 00:43:34,604 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-21 00:43:34,610 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-21 00:43:35,631 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-21 00:43:35,631 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-21 00:43:35,636 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-21 00:43:36,112 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-21 00:43:36,112 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-21 00:43:36,117 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-21 00:43:36,459 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-21 00:43:36,460 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-21 00:43:36,464 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-21 00:43:36,841 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-21 00:43:36,841 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-21 00:43:36,845 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:43:36,846 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:36,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:36,851 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-21 00:43:36,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:36,864 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-21 00:43:36,957 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-21 00:43:36,976 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:36,980 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-21 00:43:36,980 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-21 00:43:36,980 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-21 00:43:37,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:37,147 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-21 00:43:37,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:37,163 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-21 00:43:37,410 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-21 00:43:37,410 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-21 00:43:37,410 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-21 00:43:37,410 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-21 00:43:37,411 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:37,415 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-21 00:43:37,415 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-21 00:43:37,415 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-21 00:43:37,415 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-21 00:43:37,415 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-21 00:43:37,416 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-21 00:43:37,416 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-21 00:43:37,416 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-21 00:43:37,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:37,573 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-21 00:43:37,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:37,591 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-21 00:43:37,705 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-21 00:43:37,707 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:37,710 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-21 00:43:37,710 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-21 00:43:37,710 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-21 00:43:37,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:37,990 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-21 00:43:38,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:38,016 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-21 00:43:38,044 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:38,055 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-21 00:43:38,056 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-21 00:43:38,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:38,405 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-21 00:43:38,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:38,427 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-21 00:43:38,476 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-21 00:43:38,477 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:38,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:38,813 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:43:38,852 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:38,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:38,858 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:43:38,899 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:43:38,908 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d6b60bb0> has no local changes
2024-07-21 00:43:38,908 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:43:38,919 [ scc.git] DEBUG [detached HEAD 702754a] merge master -Dorg -Ssuccess-only
2024-07-21 00:43:38,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:43:38,919 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:43:39,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-21 00:43:39,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-21 00:43:40,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-21 00:43:40,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-21 00:43:41,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:41,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-21 00:43:42,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-21 00:43:42,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:42,864 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-21 00:43:42,864 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:43:42,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-21 00:43:42,864 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:42,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:42,871 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:43:42,878 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:43:42,878 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:43:42,885 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:43:42,893 [ scc.git] DEBUG Already up to date.
2024-07-21 00:43:42,893 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-21 00:43:43,248 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-21 00:43:43,248 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-21 00:43:43,253 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:43:43,253 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:43,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:43,258 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-21 00:43:43,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:43,268 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-21 00:43:43,277 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:43:43,280 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-21 00:43:43,280 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-21 00:43:43,280 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-21 00:43:43,280 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-21 00:43:43,280 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-21 00:43:43,280 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-21 00:43:43,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:43,437 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:43:43,477 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:43,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:43,485 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:43:43,529 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:43:43,537 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d6b87e20> has no local changes
2024-07-21 00:43:43,537 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:43:43,547 [ scc.git] DEBUG [detached HEAD 1ea858d] merge master -Dorg -Ssuccess-only
2024-07-21 00:43:43,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:43:43,548 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:43:43,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-21 00:43:44,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-21 00:43:44,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-21 00:43:45,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-21 00:43:45,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:46,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-21 00:43:46,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:46,925 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-21 00:43:47,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-21 00:43:47,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-21 00:43:48,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-21 00:43:48,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:49,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-21 00:43:49,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:49,773 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-21 00:43:49,773 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:43:49,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-21 00:43:49,774 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:49,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:49,780 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:43:49,786 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:43:49,786 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:43:49,793 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:43:49,799 [ scc.git] DEBUG Already up to date.
2024-07-21 00:43:49,799 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-21 00:43:50,390 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-21 00:43:50,390 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-21 00:43:50,396 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-21 00:43:50,897 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-21 00:43:50,898 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-21 00:43:50,902 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:43:50,902 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:50,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:50,909 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-21 00:43:50,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:50,923 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-21 00:43:51,006 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-21 00:43:51,006 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-21 00:43:51,006 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-21 00:43:51,006 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-21 00:43:51,006 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-21 00:43:51,007 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-21 00:43:51,014 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-21 00:43:51,021 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-21 00:43:51,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:51,177 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-21 00:43:51,185 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-21 00:43:51,190 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#129](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-07-21 00:43:51,194 [ scc.config] DEBUG Found github.token
2024-07-21 00:43:51,195 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-21 00:43:51,195 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-21 00:43:51,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:51,205 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-21 00:43:51,230 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-21 00:43:51,230 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-21 00:43:51,230 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-21 00:43:51,230 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-21 00:43:51,231 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-21 00:43:51,236 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-21 00:43:51,243 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-21 00:43:51,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:43:51,581 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-21 00:43:51,588 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-21 00:43:51,594 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#129](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-07-21 00:43:51,600 [ scc.config] DEBUG Found github.token
2024-07-21 00:43:51,601 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-21 00:43:51,601 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:43:51,644 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:43:51,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:43:51,650 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:43:51,696 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:43:51,704 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d4340f10> has no local changes
2024-07-21 00:43:51,704 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:43:51,714 [ scc.git] DEBUG [detached HEAD 2c2d579] merge master -Dorg -Ssuccess-only
2024-07-21 00:43:51,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:43:51,715 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:43:52,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-21 00:43:52,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-21 00:43:52,621 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-21 00:43:53,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-21 00:43:53,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:54,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-21 00:43:54,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-21 00:43:55,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:55,219 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-21 00:43:55,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-21 00:43:55,703 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-21 00:43:56,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-21 00:43:56,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:43:57,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-21 00:43:57,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-21 00:43:58,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:43:58,151 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-21 00:43:58,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-21 00:43:58,640 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-21 00:43:59,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-21 00:43:59,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:44:00,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-21 00:44:00,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-21 00:44:00,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:44:00,987 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-21 00:44:01,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-21 00:44:01,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-21 00:44:02,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-21 00:44:02,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-21 00:44:03,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-21 00:44:04,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-21 00:44:04,035 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:04,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-21 00:44:04,035 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:04,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:04,041 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:44:04,047 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:04,047 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:44:04,053 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:44:04,058 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:04,059 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-21 00:44:04,405 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-21 00:44:04,406 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-21 00:44:04,410 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-21 00:44:04,776 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-21 00:44:04,776 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-21 00:44:04,780 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-21 00:44:05,154 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-21 00:44:05,154 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-21 00:44:05,159 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:05,159 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:05,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:05,164 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-21 00:44:05,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:05,173 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-21 00:44:05,182 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:44:05,184 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-21 00:44:05,184 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-21 00:44:05,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:05,349 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-21 00:44:05,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:05,359 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-21 00:44:05,414 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-21 00:44:05,415 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:44:05,418 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-21 00:44:05,418 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-21 00:44:05,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:05,774 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-21 00:44:05,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:05,785 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-21 00:44:05,806 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-21 00:44:05,807 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:44:05,810 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-21 00:44:05,810 [ scc.git] DEBUG package.json | 2 +-
2024-07-21 00:44:05,810 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-21 00:44:06,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:06,183 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:06,223 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:06,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:06,229 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:06,266 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:06,274 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d4304580> has no local changes
2024-07-21 00:44:06,274 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:06,284 [ scc.git] DEBUG [detached HEAD 8226402] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:06,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:06,284 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:44:06,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-21 00:44:07,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-21 00:44:07,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-21 00:44:08,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:44:08,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-21 00:44:09,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:44:09,102 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-21 00:44:09,102 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:09,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-21 00:44:09,102 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:09,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:09,109 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:44:09,116 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:09,116 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:44:09,123 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:44:09,129 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:09,130 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-21 00:44:09,518 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-21 00:44:09,518 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-21 00:44:09,522 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:09,522 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:09,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:09,527 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-21 00:44:09,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:09,537 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-21 00:44:09,545 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:44:09,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:09,700 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:09,738 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:09,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:09,745 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:09,784 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:09,791 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d4355e80> has no local changes
2024-07-21 00:44:09,791 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:09,799 [ scc.git] DEBUG [detached HEAD 6c8dce2] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:09,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:09,800 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:44:10,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-21 00:44:10,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-21 00:44:11,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-21 00:44:11,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-21 00:44:12,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-21 00:44:12,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:44:13,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-21 00:44:13,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:44:13,588 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-21 00:44:13,588 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:13,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-21 00:44:13,588 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:13,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:13,594 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:44:13,600 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:13,601 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:44:13,607 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:44:13,614 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:13,614 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-21 00:44:14,077 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-21 00:44:14,077 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-21 00:44:14,082 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:14,082 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:14,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:14,088 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-21 00:44:14,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:14,110 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-21 00:44:14,121 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-21 00:44:14,122 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:44:14,124 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-21 00:44:14,124 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-21 00:44:14,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:14,286 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:14,325 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:14,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:14,330 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:14,369 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:14,375 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d4316b50> has no local changes
2024-07-21 00:44:14,375 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:14,383 [ scc.git] DEBUG [detached HEAD e517283] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:14,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:14,384 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:44:14,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-21 00:44:15,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-21 00:44:15,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-21 00:44:16,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-21 00:44:16,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:44:17,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-21 00:44:17,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:44:17,679 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-21 00:44:17,679 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:17,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-21 00:44:17,680 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:17,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:17,685 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:44:17,689 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:17,689 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:44:17,694 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:44:17,698 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:17,699 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-21 00:44:18,124 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-21 00:44:18,124 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-21 00:44:18,128 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:18,128 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:18,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:18,134 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-21 00:44:18,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:18,146 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-21 00:44:18,174 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-21 00:44:18,175 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-21 00:44:18,175 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-21 00:44:18,175 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-21 00:44:18,175 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-21 00:44:18,175 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-21 00:44:18,175 [ scc.git] DEBUG Auto-merging setup.py
2024-07-21 00:44:18,175 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-21 00:44:18,175 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-21 00:44:18,175 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-21 00:44:18,182 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-21 00:44:18,189 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-21 00:44:18,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:18,354 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-21 00:44:18,361 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-21 00:44:18,366 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#129](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
--conflicts
2024-07-21 00:44:18,371 [ scc.config] DEBUG Found github.token
2024-07-21 00:44:18,372 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-21 00:44:18,372 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:18,414 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:18,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:18,420 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:18,461 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:18,467 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d4304730> has no local changes
2024-07-21 00:44:18,467 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:18,475 [ scc.git] DEBUG [detached HEAD 76e99a1] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:18,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:18,475 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:44:19,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-21 00:44:19,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-21 00:44:20,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-21 00:44:20,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-21 00:44:21,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:44:21,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-21 00:44:21,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:44:21,994 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-21 00:44:21,994 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:21,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-21 00:44:21,994 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:21,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:22,003 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:44:22,012 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:22,013 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:44:22,024 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:44:22,035 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:22,035 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-21 00:44:22,530 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-21 00:44:22,530 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-21 00:44:22,537 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:22,537 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:22,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:22,545 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-21 00:44:22,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:22,561 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-07-21 00:44:22,592 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-21 00:44:22,597 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-21 00:44:22,597 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-21 00:44:22,597 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-21 00:44:22,597 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-21 00:44:22,597 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-21 00:44:22,597 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-21 00:44:22,597 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-21 00:44:22,597 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-21 00:44:22,597 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-21 00:44:22,597 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-21 00:44:22,600 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-21 00:44:22,601 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-21 00:44:22,601 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-21 00:44:22,601 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-21 00:44:22,601 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-21 00:44:22,601 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-21 00:44:22,601 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-21 00:44:22,601 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-21 00:44:22,601 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-21 00:44:22,601 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-21 00:44:22,601 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-21 00:44:22,601 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-21 00:44:22,601 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-21 00:44:22,601 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-21 00:44:22,601 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-21 00:44:22,601 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-21 00:44:22,601 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-21 00:44:22,602 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-21 00:44:22,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:22,769 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:22,817 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:22,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:22,825 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:22,873 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:22,881 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d42cf640> has no local changes
2024-07-21 00:44:22,882 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:22,896 [ scc.git] DEBUG [detached HEAD 39814cd] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:22,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:22,896 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:44:23,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-21 00:44:23,223 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:23,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-21 00:44:23,223 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:23,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:23,230 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:44:23,237 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:23,237 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:44:23,244 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:44:23,252 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:23,252 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:23,252 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:23,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:23,260 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:23,308 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:23,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:23,316 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:23,369 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:23,379 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d426be80> has no local changes
2024-07-21 00:44:23,380 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:23,395 [ scc.git] DEBUG [detached HEAD ecc9722] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:23,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:23,396 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:44:23,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-21 00:44:23,665 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:23,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-21 00:44:23,666 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:23,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:23,674 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:44:23,682 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:23,682 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:44:23,690 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:44:23,698 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:23,698 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:23,698 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:23,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:23,705 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:23,750 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:23,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:23,758 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:23,805 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:23,814 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d42d1d30> has no local changes
2024-07-21 00:44:23,814 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:23,825 [ scc.git] DEBUG [detached HEAD dbf5f2a] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:23,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:23,826 [ scc.git] INFO Overriding base-branch from master to main
2024-07-21 00:44:23,826 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:44:24,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-21 00:44:24,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-21 00:44:25,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-21 00:44:25,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-21 00:44:26,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-21 00:44:26,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:44:27,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-21 00:44:27,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-21 00:44:28,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:44:28,032 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-21 00:44:28,032 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:28,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-21 00:44:28,032 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:28,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:28,042 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-21 00:44:28,048 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:28,048 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-21 00:44:28,054 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-21 00:44:28,061 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:28,061 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-21 00:44:28,484 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-21 00:44:28,485 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-21 00:44:28,489 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:28,490 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:28,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:28,495 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-21 00:44:28,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:28,510 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-21 00:44:28,528 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-21 00:44:28,529 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-21 00:44:28,529 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-21 00:44:28,529 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-21 00:44:28,537 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-21 00:44:28,545 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-21 00:44:28,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:28,705 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-21 00:44:28,712 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-21 00:44:28,719 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#129](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-21 00:44:28,725 [ scc.config] DEBUG Found github.token
2024-07-21 00:44:28,726 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-21 00:44:28,726 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:28,767 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:28,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:28,773 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:28,813 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:28,822 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d42b1f40> has no local changes
2024-07-21 00:44:28,823 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:28,833 [ scc.git] DEBUG [detached HEAD eb2c3ba] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:28,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:28,834 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:44:29,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-21 00:44:29,121 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:29,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-21 00:44:29,121 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:29,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:29,128 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:44:29,134 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:29,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:44:29,141 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:44:29,149 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:29,150 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:29,150 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:29,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:29,156 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:29,203 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:29,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:29,210 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:29,249 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:29,257 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d426f7c0> has no local changes
2024-07-21 00:44:29,257 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:29,266 [ scc.git] DEBUG [detached HEAD e2408ab] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:29,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:29,267 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:44:29,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-21 00:44:29,560 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:29,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-21 00:44:29,560 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:29,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:29,567 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:44:29,572 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:29,572 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:44:29,578 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:44:29,584 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:29,584 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:29,584 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:29,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:29,589 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:29,628 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:29,629 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:29,635 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:29,688 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:29,696 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d4293490> has no local changes
2024-07-21 00:44:29,696 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:29,706 [ scc.git] DEBUG [detached HEAD af9c065] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:29,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:29,707 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:44:30,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-21 00:44:30,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-21 00:44:31,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-21 00:44:31,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-21 00:44:31,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:44:32,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-21 00:44:32,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:44:32,936 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-21 00:44:32,936 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:32,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-21 00:44:32,936 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:32,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:32,942 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-21 00:44:32,948 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:32,948 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-21 00:44:32,954 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-21 00:44:32,960 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:32,960 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-21 00:44:33,372 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-21 00:44:33,373 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-21 00:44:33,378 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:33,378 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:33,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:33,384 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-21 00:44:33,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:33,398 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-21 00:44:33,426 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-21 00:44:33,427 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-21 00:44:33,427 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-21 00:44:33,427 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-21 00:44:33,434 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-21 00:44:33,442 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-21 00:44:33,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:33,588 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-21 00:44:33,594 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-21 00:44:33,600 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#129](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-21 00:44:33,605 [ scc.config] DEBUG Found github.token
2024-07-21 00:44:33,605 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-21 00:44:33,605 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:33,646 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:33,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:33,652 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:33,693 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:33,700 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d42358b0> has no local changes
2024-07-21 00:44:33,700 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:33,709 [ scc.git] DEBUG [detached HEAD d8f80df] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:33,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:33,709 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-21 00:44:33,709 [ scc.repo] DEBUG ## PRs found:
2024-07-21 00:44:34,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-21 00:44:34,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-21 00:44:35,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-21 00:44:35,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-21 00:44:36,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-21 00:44:36,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-21 00:44:37,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-21 00:44:37,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-21 00:44:38,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-21 00:44:38,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-21 00:44:39,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-21 00:44:39,089 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-21 00:44:39,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-21 00:44:40,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-21 00:44:40,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-21 00:44:41,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-21 00:44:41,166 [ scc.repo] DEBUG ## Branches found:
2024-07-21 00:44:41,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-21 00:44:41,166 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:41,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:41,173 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-21 00:44:41,180 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-21 00:44:41,180 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-21 00:44:41,187 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-21 00:44:41,195 [ scc.git] DEBUG Already up to date.
2024-07-21 00:44:41,195 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-21 00:44:41,630 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-21 00:44:41,630 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-21 00:44:41,637 [ scc.git] DEBUG ## Unique users: []
2024-07-21 00:44:41,637 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:41,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:41,647 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-21 00:44:41,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:41,668 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-21 00:44:41,728 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-21 00:44:41,728 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-21 00:44:41,728 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-21 00:44:41,729 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-21 00:44:41,737 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-21 00:44:41,746 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-21 00:44:41,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:41,917 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-21 00:44:41,931 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-21 00:44:41,941 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#129](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-21 00:44:41,948 [ scc.config] DEBUG Found github.token
2024-07-21 00:44:41,949 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-21 00:44:41,949 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-21 00:44:41,997 [ scc.git] DEBUG Get sha1 of %s
2024-07-21 00:44:41,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-21 00:44:42,005 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:42,046 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:42,055 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d42355b0> has no local changes
2024-07-21 00:44:42,055 [ 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:42,066 [ scc.git] DEBUG [detached HEAD 4f90c07] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:42,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:42,066 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-21 00:44:42,143 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-21 00:44:42,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:42,342 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-21 00:44:42,347 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-21 00:44:42,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:42,756 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-21 00:44:42,761 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-21 00:44:43,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:43,174 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-21 00:44:43,180 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-21 00:44:43,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:43,579 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-21 00:44:43,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:44,008 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-21 00:44:44,013 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-21 00:44:44,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:44,405 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-21 00:44:44,410 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-21 00:44:44,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:44,831 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-21 00:44:44,836 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-21 00:44:45,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:45,241 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-21 00:44:45,250 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-21 00:44:45,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:45,670 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-21 00:44:45,675 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-21 00:44:46,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:46,091 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-21 00:44:46,096 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-21 00:44:46,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:46,517 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-21 00:44:46,523 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-21 00:44:46,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:46,932 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-21 00:44:46,937 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-21 00:44:47,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:47,335 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-21 00:44:47,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:47,757 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-21 00:44:48,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:48,141 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-21 00:44:48,145 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-21 00:44:48,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:48,552 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-21 00:44:48,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:48,986 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-21 00:44:49,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:49,388 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-21 00:44:49,394 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-21 00:44:49,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:49,814 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-21 00:44:49,818 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-21 00:44:50,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:50,229 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-21 00:44:50,234 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-21 00:44:50,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:50,641 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-21 00:44:50,645 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-21 00:44:51,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-21 00:44:51,053 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-21 00:44:51,053 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-21 00:44:51,139 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa4d7cc3d30> has local changes
2024-07-21 00:44:51,139 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 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#129 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/129/)'
2024-07-21 00:44:51,154 [ scc.git] DEBUG [detached HEAD 3e4407b] merge master -Dorg -Ssuccess-only
2024-07-21 00:44:51,155 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-21 00:44:51,155 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-21 00:44:51,155 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,155 [ scc.merge] INFO
2024-07-21 00:44:51,155 [ scc.merge] INFO
2024-07-21 00:44:51,155 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-21 00:44:51,155 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,155 [ scc.merge] INFO
2024-07-21 00:44:51,155 [ scc.merge] INFO
2024-07-21 00:44:51,155 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-21 00:44:51,155 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:44:51,155 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-21 00:44:51,155 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,155 [ scc.merge] INFO
2024-07-21 00:44:51,155 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,155 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-21 00:44:51,156 [ scc.merge] INFO
2024-07-21 00:44:51,156 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-21 00:44:51,156 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-21 00:44:51,156 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,156 [ scc.merge] INFO
2024-07-21 00:44:51,156 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-21 00:44:51,156 [ scc.merge] INFO
2024-07-21 00:44:51,156 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-21 00:44:51,156 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-21 00:44:51,156 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,156 [ scc.merge] INFO
2024-07-21 00:44:51,156 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-21 00:44:51,156 [ scc.merge] INFO
2024-07-21 00:44:51,156 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-21 00:44:51,156 [ scc.merge] INFO
2024-07-21 00:44:51,156 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-21 00:44:51,156 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-21 00:44:51,156 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,156 [ scc.merge] INFO
2024-07-21 00:44:51,156 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,156 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-07-21 00:44:51,157 [ scc.merge] INFO
2024-07-21 00:44:51,157 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-21 00:44:51,157 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,157 [ scc.merge] INFO
2024-07-21 00:44:51,157 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-21 00:44:51,157 [ scc.merge] INFO
2024-07-21 00:44:51,157 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-21 00:44:51,157 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,157 [ scc.merge] INFO
2024-07-21 00:44:51,157 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-21 00:44:51,157 [ scc.merge] INFO
2024-07-21 00:44:51,157 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-21 00:44:51,157 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-21 00:44:51,157 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,157 [ scc.merge] INFO
2024-07-21 00:44:51,157 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-21 00:44:51,157 [ scc.merge] INFO
2024-07-21 00:44:51,157 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-21 00:44:51,157 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-21 00:44:51,157 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,157 [ scc.merge] INFO
2024-07-21 00:44:51,157 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,157 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-21 00:44:51,157 [ scc.merge] INFO
2024-07-21 00:44:51,158 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-21 00:44:51,158 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,158 [ scc.merge] INFO
2024-07-21 00:44:51,158 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-21 00:44:51,158 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-21 00:44:51,158 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-21 00:44:51,158 [ scc.merge] INFO
2024-07-21 00:44:51,158 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-21 00:44:51,158 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:44:51,158 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-21 00:44:51,158 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-21 00:44:51,158 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-21 00:44:51,158 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,158 [ scc.merge] INFO
2024-07-21 00:44:51,158 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,158 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-21 00:44:51,158 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-21 00:44:51,158 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-21 00:44:51,158 [ scc.merge] INFO
2024-07-21 00:44:51,158 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-21 00:44:51,158 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,158 [ scc.merge] INFO
2024-07-21 00:44:51,158 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,158 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-21 00:44:51,158 [ scc.merge] INFO
2024-07-21 00:44:51,158 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-21 00:44:51,158 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:44:51,158 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-21 00:44:51,158 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,158 [ scc.merge] INFO
2024-07-21 00:44:51,158 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,158 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-21 00:44:51,158 [ scc.merge] INFO
2024-07-21 00:44:51,158 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-21 00:44:51,158 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,158 [ scc.merge] INFO
2024-07-21 00:44:51,158 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-21 00:44:51,159 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-21 00:44:51,159 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO Merged PRs:
2024-07-21 00:44:51,159 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-21 00:44:51,159 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-21 00:44:51,159 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-21 00:44:51,159 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:44:51,159 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-21 00:44:51,159 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-21 00:44:51,159 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-21 00:44:51,159 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-21 00:44:51,159 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-21 00:44:51,159 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-21 00:44:51,159 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-21 00:44:51,159 [ scc.merge] INFO
2024-07-21 00:44:51,159 [ scc.merge] INFO Repository: ome/scripts
2024-07-21 00:44:51,160 [ scc.merge] INFO Excluded PRs:
2024-07-21 00:44:51,160 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-21 00:44:51,160 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-21 00:44:51,160 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-21 00:44:51,160 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-21 00:44:51,160 [ scc.merge] INFO Already up to date.
2024-07-21 00:44:51,160 [ scc.merge] INFO
2024-07-21 00:44:51,160 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-21 00:44:51,160 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-21 00:44:51,160 [ scc.merge] INFO
2024-07-21 00:44:51,160 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-21 00:44:51,160 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-21 00:44:51,167 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-21 00:44:51,172 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-21 00:44:51,176 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-21 00:44:51,183 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-21 00:44:51,189 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-21 00:44:51,194 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,199 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,199 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-21 00:44:51,199 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-21 00:44:51,204 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-21 00:44:51,209 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-21 00:44:51,214 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-21 00:44:51,219 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-21 00:44:51,224 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-21 00:44:51,231 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-21 00:44:51,236 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-21 00:44:51,242 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-21 00:44:51,248 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-21 00:44:51,254 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-21 00:44:51,261 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-21 00:44:51,267 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-21 00:44:51,273 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-21 00:44:51,279 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-21 00:44:51,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-21 00:44:51,286 [ scc.git] DEBUG Calling 'git remote'
2024-07-21 00:44:51,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.1 to 5.9.2-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD f4f152f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from fefe87cf
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from c20d273
nothing to commit, working tree clean
[detached HEAD 4020a07] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-07-21 00:45:38,360 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-07-21 00:45:47,740 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-07-21 00:45:50,155 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-21 00:45:54,753 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-21 00:46:42,300 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
