Skipping 107 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-07-19 00:44:42,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-19 00:44:43,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-19 00:44:43,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-19 00:44:44,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-19 00:44:44,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2
2024-07-19 00:44:44,694 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-07-19 00:44:44,695 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:44:44,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-19 00:44:44,695 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:44:44,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:44,701 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:44:44,706 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:44:44,706 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:44:44,712 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:44:44,718 [ scc.git] DEBUG Already up to date.
2024-07-19 00:44:44,719 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-19 00:44:45,165 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-19 00:44:45,165 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-19 00:44:45,170 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-19 00:44:45,887 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-19 00:44:45,887 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-19 00:44:45,892 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-19 00:44:46,930 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-19 00:44:46,930 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-19 00:44:46,935 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-19 00:44:47,348 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-19 00:44:47,348 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-19 00:44:47,354 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-07-19 00:44:48,058 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-19 00:44:48,059 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-07-19 00:44:48,065 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:44:48,065 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:44:48,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:48,072 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-19 00:44:48,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:48,084 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-19 00:44:48,169 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-19 00:44:48,170 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:44:48,176 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-19 00:44:48,176 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-19 00:44:48,176 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-19 00:44:48,176 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-19 00:44:48,176 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-19 00:44:48,176 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-19 00:44:48,176 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-19 00:44:48,176 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-19 00:44:48,176 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-19 00:44:48,176 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-19 00:44:48,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:44:48,346 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-19 00:44:48,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:48,359 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-19 00:44:48,575 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-19 00:44:48,575 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-19 00:44:48,575 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-19 00:44:48,575 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-19 00:44:48,576 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:44:48,582 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-19 00:44:48,582 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-19 00:44:48,582 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-19 00:44:48,583 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-19 00:44:48,583 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-19 00:44:48,583 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-19 00:44:48,583 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-19 00:44:48,583 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-19 00:44:48,583 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-19 00:44:48,583 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-19 00:44:48,583 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-19 00:44:48,583 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-19 00:44:48,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:44:48,789 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-19 00:44:48,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:48,806 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-19 00:44:49,000 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-07-19 00:44:49,001 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-19 00:44:49,001 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-19 00:44:49,001 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-07-19 00:44:49,001 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-19 00:44:49,001 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-19 00:44:49,001 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:44:49,012 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-07-19 00:44:49,012 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-07-19 00:44:49,012 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-07-19 00:44:49,012 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-07-19 00:44:49,012 [ scc.git] DEBUG src/index.html | 1 +
2024-07-19 00:44:49,012 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-07-19 00:44:49,012 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-07-19 00:44:49,012 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-07-19 00:44:49,012 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-07-19 00:44:49,012 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-07-19 00:44:49,012 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-07-19 00:44:49,012 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-07-19 00:44:49,012 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-07-19 00:44:49,012 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-07-19 00:44:49,012 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-07-19 00:44:49,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:44:49,216 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-19 00:44:49,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:49,231 [ 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-19 00:44:49,267 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:44:49,271 [ scc.git] DEBUG setup.py | 2 +-
2024-07-19 00:44:49,271 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-19 00:44:49,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:44:49,645 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-07-19 00:44:49,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:49,660 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-07-19 00:44:49,761 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-19 00:44:49,761 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-19 00:44:49,761 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:44:49,766 [ scc.git] DEBUG .gitignore | 2 +-
2024-07-19 00:44:49,766 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-07-19 00:44:49,766 [ scc.git] DEBUG src/index.html | 3 +++
2024-07-19 00:44:49,766 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-07-19 00:44:49,767 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-07-19 00:44:50,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:44:50,063 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:44:50,106 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:44:50,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:50,112 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:44:50,154 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:44:50,163 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd457bb430> has no local changes
2024-07-19 00:44:50,163 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Generated by OMERO-plugins-push#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:44:50,173 [ scc.git] DEBUG [detached HEAD c9138479] merge master -Dorg -Ssuccess-only
2024-07-19 00:44:50,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:44:50,173 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:44:50,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-19 00:44:51,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-19 00:44:51,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-19 00:44:52,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-19 00:44:52,525 [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-19 00:44:53,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-19 00:44:53,490 [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-19 00:44:53,491 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-19 00:44:53,491 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:44:53,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-19 00:44:53,491 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:44:53,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:53,498 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:44:53,504 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:44:53,504 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:44:53,510 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:44:53,517 [ scc.git] DEBUG Already up to date.
2024-07-19 00:44:53,517 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-19 00:44:53,930 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-19 00:44:53,930 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-19 00:44:53,935 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:44:53,935 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:44:53,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:53,942 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-19 00:44:53,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:53,955 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-19 00:44:54,008 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-19 00:44:54,009 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:44:54,011 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-19 00:44:54,012 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-19 00:44:54,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:44:54,179 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:44:54,226 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:44:54,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:54,233 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:44:54,278 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:44:54,286 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd5486af40> has no local changes
2024-07-19 00:44:54,286 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:44:54,297 [ scc.git] DEBUG [detached HEAD 4df314d] merge master -Dorg -Ssuccess-only
2024-07-19 00:44:54,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:44:54,298 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:44:54,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-19 00:44:55,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-19 00:44:55,249 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-19 00:44:55,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-19 00:44:56,370 [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-19 00:44:56,892 [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-19 00:44:57,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-19 00:44:57,866 [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-19 00:44:57,867 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-19 00:44:57,867 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:44:57,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-19 00:44:57,867 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:44:57,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:57,873 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:44:57,879 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:44:57,879 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:44:57,886 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:44:57,892 [ scc.git] DEBUG Already up to date.
2024-07-19 00:44:57,893 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-19 00:44:58,308 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-19 00:44:58,308 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-19 00:44:58,312 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:44:58,312 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:44:58,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:58,317 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-19 00:44:58,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:58,326 [ 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-19 00:44:58,336 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:44:58,340 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-19 00:44:58,340 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-19 00:44:58,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:44:58,511 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:44:58,552 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:44:58,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:44:58,557 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:44:58,595 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:44:58,603 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd457c9fa0> has no local changes
2024-07-19 00:44:58,603 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:44:58,614 [ scc.git] DEBUG [detached HEAD 17ce0ad] merge master -Dorg -Ssuccess-only
2024-07-19 00:44:58,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:44:58,615 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:44:59,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-19 00:44:59,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-19 00:44:59,614 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-19 00:45:00,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-19 00:45:00,742 [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-19 00:45:01,332 [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-19 00:45:01,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-19 00:45:02,263 [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-19 00:45:02,264 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-19 00:45:02,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-19 00:45:02,755 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-19 00:45:03,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-19 00:45:03,827 [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-19 00:45:04,352 [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-19 00:45:04,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-19 00:45:05,309 [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-19 00:45:05,310 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-19 00:45:05,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-19 00:45:06,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-19 00:45:06,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-19 00:45:07,284 [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-19 00:45:07,778 [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-19 00:45:08,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-19 00:45:08,715 [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-19 00:45:08,716 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-19 00:45:09,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-19 00:45:09,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-19 00:45:10,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-19 00:45:10,746 [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-19 00:45:11,251 [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-19 00:45:11,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-19 00:45:12,203 [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-19 00:45:12,204 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-19 00:45:12,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-19 00:45:13,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-19 00:45:13,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-19 00:45:14,193 [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-19 00:45:14,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-19 00:45:15,211 [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-19 00:45:15,211 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-19 00:45:15,212 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:45:15,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-19 00:45:15,212 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:15,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:15,221 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:45:15,229 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:45:15,229 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:45:15,290 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:45:15,298 [ scc.git] DEBUG Already up to date.
2024-07-19 00:45:15,298 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-19 00:45:15,915 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-19 00:45:15,916 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-19 00:45:15,927 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-19 00:45:17,131 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-19 00:45:17,131 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-19 00:45:17,137 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-19 00:45:17,666 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-19 00:45:17,666 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-19 00:45:17,678 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-19 00:45:18,092 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-19 00:45:18,092 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-19 00:45:18,102 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-19 00:45:18,473 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-19 00:45:18,474 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-19 00:45:18,481 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:45:18,481 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:18,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:18,488 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-19 00:45:18,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:18,509 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-19 00:45:18,599 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-19 00:45:18,599 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:45:18,603 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-19 00:45:18,603 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-19 00:45:18,603 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-19 00:45:18,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:18,785 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-19 00:45:18,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:18,799 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-19 00:45:18,985 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-19 00:45:18,986 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-19 00:45:18,986 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-19 00:45:18,986 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-19 00:45:18,987 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:45:18,994 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-19 00:45:18,994 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-19 00:45:18,994 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-19 00:45:18,995 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-19 00:45:18,995 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-19 00:45:18,995 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-19 00:45:18,995 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-19 00:45:18,995 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-19 00:45:19,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:19,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-19 00:45:19,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:19,264 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-19 00:45:19,394 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-19 00:45:19,395 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:45:19,402 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-19 00:45:19,402 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-19 00:45:19,402 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-19 00:45:19,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:19,775 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-19 00:45:19,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:19,827 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-19 00:45:19,864 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:45:19,875 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-19 00:45:19,876 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-19 00:45:20,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:20,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-19 00:45:20,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:20,259 [ 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-19 00:45:20,365 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-19 00:45:20,366 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:45:20,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:20,631 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:45:20,692 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:20,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:20,703 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:45:20,783 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:45:20,795 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd5485adf0> has no local changes
2024-07-19 00:45:20,796 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Generated by OMERO-plugins-push#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:45:20,812 [ scc.git] DEBUG [detached HEAD feab375] merge master -Dorg -Ssuccess-only
2024-07-19 00:45:20,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:45:20,812 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:45:21,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-19 00:45:21,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-19 00:45:22,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-19 00:45:22,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-19 00:45:23,295 [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-19 00:45:23,763 [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-19 00:45:24,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-19 00:45:24,736 [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-19 00:45:24,738 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-19 00:45:24,738 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:45:24,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-19 00:45:24,739 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:24,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:24,752 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:45:24,760 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:45:24,760 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:45:24,768 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:45:24,776 [ scc.git] DEBUG Already up to date.
2024-07-19 00:45:24,776 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-19 00:45:25,189 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-19 00:45:25,190 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-19 00:45:25,197 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:45:25,198 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:25,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:25,208 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-19 00:45:25,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:25,227 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-19 00:45:25,245 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:45:25,250 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-19 00:45:25,250 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-19 00:45:25,250 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-19 00:45:25,250 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-19 00:45:25,250 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-19 00:45:25,250 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-19 00:45:25,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:25,410 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:45:25,478 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:25,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:25,488 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:45:25,539 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:45:25,548 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd4477f610> has no local changes
2024-07-19 00:45:25,549 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:45:25,562 [ scc.git] DEBUG [detached HEAD d419250] merge master -Dorg -Ssuccess-only
2024-07-19 00:45:25,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:45:25,563 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:45:25,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-19 00:45:26,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-19 00:45:27,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-19 00:45:27,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-19 00:45:28,062 [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-19 00:45:28,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-19 00:45:28,945 [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-19 00:45:28,946 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-19 00:45:29,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-19 00:45:29,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-19 00:45:30,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-19 00:45:30,910 [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-19 00:45:31,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-19 00:45:31,872 [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-19 00:45:31,873 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-19 00:45:31,874 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:45:31,874 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-19 00:45:31,874 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:31,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:31,895 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:45:31,912 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:45:31,913 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:45:31,937 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:45:31,959 [ scc.git] DEBUG Already up to date.
2024-07-19 00:45:31,960 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-19 00:45:32,543 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-19 00:45:32,544 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-19 00:45:32,554 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-19 00:45:33,208 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-19 00:45:33,208 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-19 00:45:33,213 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:45:33,213 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:33,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:33,219 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-19 00:45:33,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:33,233 [ 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-19 00:45:33,348 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-19 00:45:33,349 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-19 00:45:33,349 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-19 00:45:33,349 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-19 00:45:33,349 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-19 00:45:33,350 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-19 00:45:33,357 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-19 00:45:33,365 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-19 00:45:33,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:33,528 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-19 00:45:33,540 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-19 00:45:33,549 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#127](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-07-19 00:45:33,557 [ scc.config] DEBUG Found github.token
2024-07-19 00:45:33,557 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-19 00:45:33,558 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-19 00:45:33,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:33,577 [ 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-19 00:45:33,629 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-19 00:45:33,629 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-19 00:45:33,629 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-19 00:45:33,629 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-19 00:45:33,630 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-19 00:45:33,640 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-19 00:45:33,650 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-19 00:45:33,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:33,952 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-19 00:45:33,979 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-19 00:45:34,007 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#127](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/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-19 00:45:34,021 [ scc.config] DEBUG Found github.token
2024-07-19 00:45:34,021 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-19 00:45:34,021 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:45:34,070 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:34,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:34,076 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:45:34,114 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:45:34,122 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd4477f8b0> has no local changes
2024-07-19 00:45:34,122 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:45:34,131 [ scc.git] DEBUG [detached HEAD 2ed33a8] merge master -Dorg -Ssuccess-only
2024-07-19 00:45:34,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:45:34,132 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:45:34,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-19 00:45:35,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-19 00:45:35,046 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-19 00:45:35,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-19 00:45:36,126 [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-19 00:45:36,632 [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-19 00:45:37,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-19 00:45:37,592 [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-19 00:45:37,593 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-19 00:45:38,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-19 00:45:38,105 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-19 00:45:38,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-19 00:45:39,155 [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-19 00:45:39,674 [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-19 00:45:40,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-19 00:45:40,683 [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-19 00:45:40,683 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-19 00:45:41,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-19 00:45:41,159 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-19 00:45:41,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-19 00:45:42,247 [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-19 00:45:42,747 [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-19 00:45:43,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-19 00:45:43,630 [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-19 00:45:43,632 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-19 00:45:44,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-19 00:45:44,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-19 00:45:45,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-19 00:45:45,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-19 00:45:46,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-19 00:45:46,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-19 00:45:46,558 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:45:46,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-19 00:45:46,559 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:46,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:46,574 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:45:46,587 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:45:46,587 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:45:46,600 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:45:46,610 [ scc.git] DEBUG Already up to date.
2024-07-19 00:45:46,611 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-19 00:45:46,999 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-19 00:45:46,999 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-19 00:45:47,005 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-19 00:45:47,406 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-19 00:45:47,407 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-19 00:45:47,412 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-19 00:45:47,806 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-19 00:45:47,806 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-19 00:45:47,811 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:45:47,811 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:47,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:47,817 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-19 00:45:47,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:47,829 [ 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-19 00:45:47,861 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:45:47,866 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-19 00:45:47,866 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-19 00:45:48,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:48,034 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-19 00:45:48,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:48,048 [ 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-19 00:45:48,103 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-19 00:45:48,104 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:45:48,109 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-19 00:45:48,109 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-19 00:45:48,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:48,458 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-19 00:45:48,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:48,476 [ 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-19 00:45:48,503 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-19 00:45:48,504 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:45:48,509 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-19 00:45:48,509 [ scc.git] DEBUG package.json | 2 +-
2024-07-19 00:45:48,509 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-19 00:45:48,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:48,883 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:45:48,933 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:48,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:48,939 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:45:48,986 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:45:48,995 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd4477f670> has no local changes
2024-07-19 00:45:48,995 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:45:49,007 [ scc.git] DEBUG [detached HEAD 0e82cb9] merge master -Dorg -Ssuccess-only
2024-07-19 00:45:49,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:45:49,008 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:45:49,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-19 00:45:49,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-19 00:45:50,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-19 00:45:50,924 [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-19 00:45:51,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-19 00:45:51,880 [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-19 00:45:51,881 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-19 00:45:51,881 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:45:51,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-19 00:45:51,882 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:51,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:51,890 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:45:51,897 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:45:51,897 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:45:51,904 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:45:51,911 [ scc.git] DEBUG Already up to date.
2024-07-19 00:45:51,912 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-19 00:45:52,303 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-19 00:45:52,304 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-19 00:45:52,309 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:45:52,309 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:52,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:52,315 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-19 00:45:52,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:52,327 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-19 00:45:52,338 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:45:52,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:52,513 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:45:52,557 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:52,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:52,566 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:45:52,612 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:45:52,620 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd54812f10> has no local changes
2024-07-19 00:45:52,621 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:45:52,631 [ scc.git] DEBUG [detached HEAD a07cc3b] merge master -Dorg -Ssuccess-only
2024-07-19 00:45:52,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:45:52,631 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:45:53,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-19 00:45:53,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-19 00:45:53,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-19 00:45:54,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-19 00:45:55,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-19 00:45:55,491 [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-19 00:45:56,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-19 00:45:56,468 [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-19 00:45:56,469 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-19 00:45:56,469 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:45:56,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-19 00:45:56,470 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:56,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:56,476 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:45:56,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:45:56,483 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:45:56,488 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:45:56,494 [ scc.git] DEBUG Already up to date.
2024-07-19 00:45:56,495 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-19 00:45:56,985 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-19 00:45:56,985 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-19 00:45:56,990 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:45:56,991 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:56,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:56,998 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-19 00:45:57,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:57,010 [ 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-19 00:45:57,022 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-19 00:45:57,023 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:45:57,025 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-19 00:45:57,025 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-19 00:45:57,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:45:57,202 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:45:57,253 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:45:57,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:45:57,260 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:45:57,305 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:45:57,312 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd44791b80> has no local changes
2024-07-19 00:45:57,312 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:45:57,322 [ scc.git] DEBUG [detached HEAD 7c878bf] merge master -Dorg -Ssuccess-only
2024-07-19 00:45:57,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:45:57,322 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:45:57,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-19 00:45:58,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-19 00:45:58,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-19 00:45:59,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-19 00:45:59,709 [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-19 00:46:00,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-19 00:46:00,682 [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-19 00:46:00,683 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-19 00:46:00,683 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:46:00,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-19 00:46:00,684 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:00,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:00,692 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:46:00,699 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:46:00,699 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:46:00,706 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:46:00,714 [ scc.git] DEBUG Already up to date.
2024-07-19 00:46:00,714 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-19 00:46:01,134 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-19 00:46:01,134 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-19 00:46:01,139 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:46:01,139 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:01,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:01,147 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-19 00:46:01,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:01,163 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-19 00:46:01,205 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-19 00:46:01,205 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-19 00:46:01,205 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-19 00:46:01,205 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-19 00:46:01,205 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-19 00:46:01,205 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-19 00:46:01,205 [ scc.git] DEBUG Auto-merging setup.py
2024-07-19 00:46:01,205 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-19 00:46:01,205 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-19 00:46:01,206 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-19 00:46:01,213 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-19 00:46:01,220 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-19 00:46:01,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:01,407 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-19 00:46:01,413 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-19 00:46:01,421 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#127](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2024-07-19 00:46:01,427 [ scc.config] DEBUG Found github.token
2024-07-19 00:46:01,428 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-19 00:46:01,428 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:46:01,473 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:01,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:01,480 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:46:01,522 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:46:01,547 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd457c4f10> has no local changes
2024-07-19 00:46:01,547 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:46:01,575 [ scc.git] DEBUG [detached HEAD 654ffbe] merge master -Dorg -Ssuccess-only
2024-07-19 00:46:01,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:01,576 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:46:01,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-19 00:46:02,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-19 00:46:02,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-19 00:46:03,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-19 00:46:03,894 [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-19 00:46:04,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-19 00:46:04,775 [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-19 00:46:04,776 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-19 00:46:04,776 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:46:04,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-19 00:46:04,776 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:04,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:04,791 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:46:04,802 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:46:04,802 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:46:04,812 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:46:04,823 [ scc.git] DEBUG Already up to date.
2024-07-19 00:46:04,824 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-19 00:46:05,323 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-19 00:46:05,323 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-19 00:46:05,330 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:46:05,330 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:05,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:05,342 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-19 00:46:05,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:05,363 [ 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-19 00:46:05,398 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-19 00:46:05,402 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-19 00:46:05,402 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-19 00:46:05,402 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-19 00:46:05,402 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-19 00:46:05,406 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-19 00:46:05,406 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-19 00:46:05,406 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-19 00:46:05,407 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-19 00:46:05,407 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-19 00:46:05,407 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-19 00:46:05,407 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-19 00:46:05,407 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-19 00:46:05,408 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-19 00:46:05,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:05,570 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:46:05,618 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:05,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:05,626 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:46:05,673 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:46:05,681 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd4477d700> has no local changes
2024-07-19 00:46:05,681 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:46:05,693 [ scc.git] DEBUG [detached HEAD 07bfff4] merge master -Dorg -Ssuccess-only
2024-07-19 00:46:05,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:05,694 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:46:06,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-19 00:46:06,009 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:46:06,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-19 00:46:06,009 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:06,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:06,019 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:46:06,028 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:46:06,028 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:46:06,040 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:46:06,049 [ scc.git] DEBUG Already up to date.
2024-07-19 00:46:06,050 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:46:06,050 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:06,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:06,056 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:46:06,105 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:06,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:06,114 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:46:06,177 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:46:06,186 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd44789e50> has no local changes
2024-07-19 00:46:06,186 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:46:06,198 [ scc.git] DEBUG [detached HEAD 7de46a9] merge master -Dorg -Ssuccess-only
2024-07-19 00:46:06,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:06,198 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:46:06,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-19 00:46:06,453 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:46:06,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-19 00:46:06,453 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:06,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:06,461 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:46:06,467 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:46:06,468 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:46:06,477 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:46:06,495 [ scc.git] DEBUG Already up to date.
2024-07-19 00:46:06,495 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:46:06,495 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:06,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:06,503 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:46:06,556 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:06,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:06,564 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:46:06,610 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:46:06,618 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd447594f0> has no local changes
2024-07-19 00:46:06,618 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:46:06,630 [ scc.git] DEBUG [detached HEAD 5486946] merge master -Dorg -Ssuccess-only
2024-07-19 00:46:06,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:06,631 [ scc.git] INFO Overriding base-branch from master to main
2024-07-19 00:46:06,631 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:46:06,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-19 00:46:07,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-19 00:46:07,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-19 00:46:08,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-19 00:46:08,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-19 00:46:09,467 [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-19 00:46:09,953 [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-19 00:46:10,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-19 00:46:10,821 [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-19 00:46:10,822 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-19 00:46:10,822 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:46:10,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-19 00:46:10,823 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:10,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:10,830 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-19 00:46:10,836 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:46:10,837 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-19 00:46:10,843 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-19 00:46:10,848 [ scc.git] DEBUG Already up to date.
2024-07-19 00:46:10,849 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-19 00:46:11,300 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-19 00:46:11,300 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-19 00:46:11,307 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:46:11,307 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:11,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:11,314 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-19 00:46:11,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:11,334 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-19 00:46:11,407 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-19 00:46:11,407 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-19 00:46:11,407 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-19 00:46:11,408 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-19 00:46:11,416 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-19 00:46:11,426 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-19 00:46:11,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:11,609 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-19 00:46:11,617 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-19 00:46:11,623 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#127](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-19 00:46:11,629 [ scc.config] DEBUG Found github.token
2024-07-19 00:46:11,630 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-19 00:46:11,630 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:46:11,685 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:11,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:11,692 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:46:11,741 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:46:11,749 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd447094f0> has no local changes
2024-07-19 00:46:11,750 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:46:11,760 [ scc.git] DEBUG [detached HEAD 99ab50a] merge master -Dorg -Ssuccess-only
2024-07-19 00:46:11,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:11,761 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:46:12,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-19 00:46:12,069 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:46:12,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-19 00:46:12,070 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:12,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:12,078 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:46:12,085 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:46:12,085 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:46:12,093 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:46:12,100 [ scc.git] DEBUG Already up to date.
2024-07-19 00:46:12,100 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:46:12,101 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:12,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:12,109 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:46:12,159 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:12,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:12,168 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:46:12,215 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:46:12,224 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd4475cf40> has no local changes
2024-07-19 00:46:12,225 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:46:12,237 [ scc.git] DEBUG [detached HEAD 4b84b79] merge master -Dorg -Ssuccess-only
2024-07-19 00:46:12,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:12,238 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:46:12,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-19 00:46:12,501 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:46:12,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-19 00:46:12,501 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:12,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:12,513 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:46:12,523 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:46:12,524 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:46:12,536 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:46:12,547 [ scc.git] DEBUG Already up to date.
2024-07-19 00:46:12,547 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:46:12,548 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:12,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:12,555 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:46:12,617 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:12,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:12,626 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:46:12,688 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:46:12,700 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd44732700> has no local changes
2024-07-19 00:46:12,700 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:46:12,712 [ scc.git] DEBUG [detached HEAD ddc3acc] merge master -Dorg -Ssuccess-only
2024-07-19 00:46:12,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:12,712 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:46:13,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-19 00:46:13,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-19 00:46:14,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-19 00:46:14,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-19 00:46:14,990 [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-19 00:46:15,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-19 00:46:15,939 [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-19 00:46:15,940 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-19 00:46:15,940 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:46:15,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-19 00:46:15,940 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:15,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:15,951 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-19 00:46:15,962 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:46:15,962 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-19 00:46:15,978 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-19 00:46:15,989 [ scc.git] DEBUG Already up to date.
2024-07-19 00:46:15,989 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-19 00:46:16,444 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-19 00:46:16,445 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-19 00:46:16,458 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:46:16,459 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:16,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:16,477 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-19 00:46:16,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:16,542 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-19 00:46:16,620 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-19 00:46:16,621 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-19 00:46:16,621 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-19 00:46:16,622 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-19 00:46:16,631 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-19 00:46:16,641 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-19 00:46:16,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:16,826 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-19 00:46:16,837 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-19 00:46:16,844 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#127](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-19 00:46:16,851 [ scc.config] DEBUG Found github.token
2024-07-19 00:46:16,851 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-19 00:46:16,852 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:46:16,902 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:16,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:16,911 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:46:16,956 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:46:16,965 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd446c3df0> has no local changes
2024-07-19 00:46:16,966 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:46:16,978 [ scc.git] DEBUG [detached HEAD d140e1b] merge master -Dorg -Ssuccess-only
2024-07-19 00:46:16,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:16,979 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-19 00:46:16,979 [ scc.repo] DEBUG ## PRs found:
2024-07-19 00:46:17,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-19 00:46:17,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-19 00:46:18,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-19 00:46:19,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-19 00:46:19,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-19 00:46:20,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-19 00:46:20,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-19 00:46:21,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-19 00:46:21,783 [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-19 00:46:22,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-19 00:46:22,639 [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-19 00:46:22,640 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-19 00:46:23,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-19 00:46:23,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-19 00:46:24,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-19 00:46:24,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-19 00:46:24,678 [ scc.repo] DEBUG ## Branches found:
2024-07-19 00:46:24,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-19 00:46:24,678 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:24,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:24,685 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-19 00:46:24,690 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-19 00:46:24,690 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-19 00:46:24,696 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-19 00:46:24,702 [ scc.git] DEBUG Already up to date.
2024-07-19 00:46:24,702 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-19 00:46:25,241 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-19 00:46:25,241 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-19 00:46:25,247 [ scc.git] DEBUG ## Unique users: []
2024-07-19 00:46:25,247 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:25,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:25,255 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-19 00:46:25,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:25,268 [ 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-19 00:46:25,317 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-19 00:46:25,317 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-19 00:46:25,317 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-19 00:46:25,318 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-19 00:46:25,326 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-19 00:46:25,335 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-19 00:46:25,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:25,516 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-19 00:46:25,528 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-19 00:46:25,535 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#127](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-19 00:46:25,544 [ scc.config] DEBUG Found github.token
2024-07-19 00:46:25,544 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-19 00:46:25,545 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-19 00:46:25,625 [ scc.git] DEBUG Get sha1 of %s
2024-07-19 00:46:25,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-19 00:46:25,632 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:46:25,676 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:46:25,683 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd4471bee0> has no local changes
2024-07-19 00:46:25,683 [ 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#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:46:25,694 [ scc.git] DEBUG [detached HEAD d7bd780] merge master -Dorg -Ssuccess-only
2024-07-19 00:46:25,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:25,694 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-19 00:46:25,776 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-19 00:46:25,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:25,959 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-19 00:46:25,966 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-19 00:46:26,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:26,386 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-19 00:46:26,392 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-19 00:46:26,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:26,813 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-19 00:46:26,818 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-19 00:46:27,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:27,260 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-19 00:46:27,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:27,680 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-19 00:46:27,690 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-19 00:46:28,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:28,096 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-19 00:46:28,100 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-19 00:46:28,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:28,510 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-19 00:46:28,517 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-19 00:46:28,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:28,931 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-19 00:46:28,940 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-19 00:46:29,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:29,364 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-19 00:46:29,376 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-19 00:46:29,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:29,789 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-19 00:46:29,803 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-19 00:46:30,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:30,301 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-19 00:46:30,310 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-19 00:46:30,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:30,728 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-19 00:46:30,734 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-19 00:46:31,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:31,172 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-19 00:46:31,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:31,594 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-19 00:46:32,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:32,020 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-19 00:46:32,025 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-19 00:46:32,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:32,471 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-19 00:46:32,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:32,889 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-19 00:46:33,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:33,299 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-19 00:46:33,304 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-19 00:46:33,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:33,725 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-19 00:46:33,732 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-19 00:46:34,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:34,161 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-19 00:46:34,166 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-19 00:46:34,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:34,587 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-19 00:46:34,592 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-19 00:46:34,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-19 00:46:35,004 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-19 00:46:35,005 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-19 00:46:35,095 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efd5593aaf0> has local changes
2024-07-19 00:46:35,096 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#127 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/127/)'
2024-07-19 00:46:35,110 [ scc.git] DEBUG [detached HEAD 56ddc78] merge master -Dorg -Ssuccess-only
2024-07-19 00:46:35,110 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-19 00:46:35,110 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-19 00:46:35,111 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,111 [ scc.merge] INFO
2024-07-19 00:46:35,111 [ scc.merge] INFO
2024-07-19 00:46:35,111 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-19 00:46:35,111 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,111 [ scc.merge] INFO
2024-07-19 00:46:35,111 [ scc.merge] INFO
2024-07-19 00:46:35,111 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-19 00:46:35,111 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:46:35,111 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-19 00:46:35,111 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,111 [ scc.merge] INFO
2024-07-19 00:46:35,111 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,111 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-19 00:46:35,111 [ scc.merge] INFO
2024-07-19 00:46:35,111 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-19 00:46:35,111 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:46:35,111 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-19 00:46:35,111 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-19 00:46:35,111 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-19 00:46:35,111 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-19 00:46:35,111 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,111 [ scc.merge] INFO
2024-07-19 00:46:35,111 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,111 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-19 00:46:35,111 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-19 00:46:35,111 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-19 00:46:35,111 [ scc.merge] INFO
2024-07-19 00:46:35,111 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-19 00:46:35,111 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:46:35,111 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-19 00:46:35,111 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,111 [ scc.merge] INFO
2024-07-19 00:46:35,111 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,111 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-19 00:46:35,112 [ scc.merge] INFO
2024-07-19 00:46:35,112 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-19 00:46:35,112 [ scc.merge] INFO
2024-07-19 00:46:35,112 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-19 00:46:35,112 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-19 00:46:35,112 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,112 [ scc.merge] INFO
2024-07-19 00:46:35,112 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-07-19 00:46:35,112 [ scc.merge] INFO
2024-07-19 00:46:35,112 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-19 00:46:35,112 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,112 [ scc.merge] INFO
2024-07-19 00:46:35,112 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-19 00:46:35,112 [ scc.merge] INFO
2024-07-19 00:46:35,112 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-19 00:46:35,112 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,112 [ scc.merge] INFO
2024-07-19 00:46:35,112 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-19 00:46:35,112 [ scc.merge] INFO
2024-07-19 00:46:35,112 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-19 00:46:35,112 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-19 00:46:35,112 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-19 00:46:35,112 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,112 [ scc.merge] INFO
2024-07-19 00:46:35,113 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-19 00:46:35,113 [ scc.merge] INFO
2024-07-19 00:46:35,113 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-19 00:46:35,113 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-19 00:46:35,113 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,113 [ scc.merge] INFO
2024-07-19 00:46:35,113 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-19 00:46:35,113 [ scc.merge] INFO
2024-07-19 00:46:35,113 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-19 00:46:35,113 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,113 [ scc.merge] INFO
2024-07-19 00:46:35,113 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-19 00:46:35,113 [ scc.merge] INFO
2024-07-19 00:46:35,113 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-19 00:46:35,113 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-19 00:46:35,113 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,113 [ scc.merge] INFO
2024-07-19 00:46:35,113 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-19 00:46:35,113 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-19 00:46:35,113 [ scc.merge] INFO
2024-07-19 00:46:35,113 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-19 00:46:35,113 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,113 [ scc.merge] INFO
2024-07-19 00:46:35,113 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,114 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-19 00:46:35,114 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:46:35,114 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-19 00:46:35,114 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,114 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-19 00:46:35,114 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-19 00:46:35,114 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-19 00:46:35,114 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO Merged PRs:
2024-07-19 00:46:35,114 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-19 00:46:35,114 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-19 00:46:35,114 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-19 00:46:35,114 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:46:35,114 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-19 00:46:35,114 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,114 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-19 00:46:35,114 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-19 00:46:35,114 [ scc.merge] INFO
2024-07-19 00:46:35,115 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-19 00:46:35,115 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,115 [ scc.merge] INFO
2024-07-19 00:46:35,115 [ scc.merge] INFO
2024-07-19 00:46:35,115 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-19 00:46:35,115 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,115 [ scc.merge] INFO
2024-07-19 00:46:35,115 [ scc.merge] INFO
2024-07-19 00:46:35,115 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-19 00:46:35,115 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,115 [ scc.merge] INFO
2024-07-19 00:46:35,115 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-19 00:46:35,115 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-19 00:46:35,115 [ scc.merge] INFO
2024-07-19 00:46:35,115 [ scc.merge] INFO Repository: ome/scripts
2024-07-19 00:46:35,115 [ scc.merge] INFO Excluded PRs:
2024-07-19 00:46:35,115 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-19 00:46:35,115 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-19 00:46:35,115 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-19 00:46:35,115 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-19 00:46:35,115 [ scc.merge] INFO Already up to date.
2024-07-19 00:46:35,115 [ scc.merge] INFO
2024-07-19 00:46:35,115 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-19 00:46:35,115 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-19 00:46:35,115 [ scc.merge] INFO
2024-07-19 00:46:35,115 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-19 00:46:35,115 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-19 00:46:35,121 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-19 00:46:35,127 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-19 00:46:35,135 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-19 00:46:35,140 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-19 00:46:35,146 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-19 00:46:35,152 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-19 00:46:35,158 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-19 00:46:35,163 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-19 00:46:35,168 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-19 00:46:35,173 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-19 00:46:35,179 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-19 00:46:35,184 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,188 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-19 00:46:35,189 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-19 00:46:35,194 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,199 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,199 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-19 00:46:35,199 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-19 00:46:35,205 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-19 00:46:35,211 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-19 00:46:35,217 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-19 00:46:35,229 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-19 00:46:35,244 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-19 00:46:35,256 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-19 00:46:35,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-19 00:46:35,267 [ scc.git] DEBUG Calling 'git remote'
2024-07-19 00:46:35,280 [ 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 0442674] 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 3600a83] 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-19 00:47:28,035 [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-19 00:47:37,233 [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-19 00:47:39,782 [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-19 00:47:44,398 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-19 00:48:33,763 [ 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}
