Skipping 107 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-07-14 00:42:35,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-14 00:42:36,169 [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-14 00:42:36,643 [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-14 00:42:37,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-14 00:42:37,593 [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-14 00:42:37,594 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-07-14 00:42:37,594 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:42:37,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-14 00:42:37,595 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:42:37,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:37,602 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:42:37,609 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:42:37,609 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:42:37,617 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:42:37,625 [ scc.git] DEBUG Already up to date.
2024-07-14 00:42:37,626 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-14 00:42:38,048 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-14 00:42:38,049 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-14 00:42:38,056 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-14 00:42:38,806 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-14 00:42:38,806 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-14 00:42:38,813 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-14 00:42:39,844 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-14 00:42:39,844 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-14 00:42:39,850 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-14 00:42:40,203 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-14 00:42:40,203 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-14 00:42:40,208 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-07-14 00:42:40,754 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-14 00:42:40,754 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-07-14 00:42:40,759 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:42:40,759 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:42:40,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:40,765 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-14 00:42:40,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:40,780 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-14 00:42:40,858 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-14 00:42:40,858 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:42:40,865 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-14 00:42:40,865 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-14 00:42:40,865 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-14 00:42:40,865 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-14 00:42:40,865 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-14 00:42:40,865 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-14 00:42:40,865 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-14 00:42:40,865 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-14 00:42:40,865 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-14 00:42:40,865 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-14 00:42:41,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:42:41,028 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-14 00:42:41,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:41,044 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-14 00:42:41,268 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-14 00:42:41,268 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-14 00:42:41,268 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-14 00:42:41,268 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-14 00:42:41,269 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:42:41,276 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-14 00:42:41,276 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-14 00:42:41,276 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-14 00:42:41,276 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-14 00:42:41,276 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-14 00:42:41,276 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-14 00:42:41,276 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-14 00:42:41,276 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-14 00:42:41,277 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-14 00:42:41,277 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-14 00:42:41,277 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-14 00:42:41,277 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-14 00:42:41,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:42:41,435 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-14 00:42:41,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:41,452 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-14 00:42:41,709 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-07-14 00:42:41,709 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-14 00:42:41,709 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-14 00:42:41,709 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-07-14 00:42:41,709 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-14 00:42:41,709 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-14 00:42:41,710 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:42:41,718 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-07-14 00:42:41,718 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-07-14 00:42:41,718 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-07-14 00:42:41,718 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-07-14 00:42:41,718 [ scc.git] DEBUG src/index.html | 1 +
2024-07-14 00:42:41,718 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-07-14 00:42:41,718 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-07-14 00:42:41,718 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-07-14 00:42:41,718 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-07-14 00:42:41,718 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-07-14 00:42:41,718 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-07-14 00:42:41,718 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-07-14 00:42:41,718 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-07-14 00:42:41,718 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-07-14 00:42:41,718 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-07-14 00:42:41,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:42:41,882 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-14 00:42:41,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:41,897 [ 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-14 00:42:41,950 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:42:41,953 [ scc.git] DEBUG setup.py | 2 +-
2024-07-14 00:42:41,953 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-14 00:42:42,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:42:42,312 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-07-14 00:42:42,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:42,328 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-07-14 00:42:42,410 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-14 00:42:42,410 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-14 00:42:42,411 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:42:42,415 [ scc.git] DEBUG .gitignore | 2 +-
2024-07-14 00:42:42,415 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-07-14 00:42:42,415 [ scc.git] DEBUG src/index.html | 3 +++
2024-07-14 00:42:42,415 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-07-14 00:42:42,415 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-07-14 00:42:42,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:42:42,722 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:42:42,764 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:42:42,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:42,769 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:42:42,809 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:42:42,818 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee70f7a430> has no local changes
2024-07-14 00:42:42,818 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:42:42,830 [ scc.git] DEBUG [detached HEAD f9a21323] merge master -Dorg -Ssuccess-only
2024-07-14 00:42:42,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:42:42,831 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:42:43,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-14 00:42:43,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-14 00:42:44,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-14 00:42:44,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-14 00:42:45,132 [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-14 00:42:45,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-14 00:42:46,014 [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-14 00:42:46,015 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-14 00:42:46,015 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:42:46,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-14 00:42:46,015 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:42:46,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:46,021 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:42:46,026 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:42:46,026 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:42:46,032 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:42:46,037 [ scc.git] DEBUG Already up to date.
2024-07-14 00:42:46,037 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-14 00:42:46,451 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-14 00:42:46,451 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-14 00:42:46,456 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:42:46,456 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:42:46,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:46,462 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-14 00:42:46,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:46,474 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-14 00:42:46,517 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-14 00:42:46,518 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:42:46,521 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-14 00:42:46,521 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-14 00:42:46,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:42:46,687 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:42:46,726 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:42:46,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:46,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:42:46,771 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:42:46,778 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee7804ef40> has no local changes
2024-07-14 00:42:46,778 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:42:46,787 [ scc.git] DEBUG [detached HEAD 791a59a] merge master -Dorg -Ssuccess-only
2024-07-14 00:42:46,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:42:46,788 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:42:47,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-14 00:42:47,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-14 00:42:47,732 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-14 00:42:48,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-14 00:42:48,758 [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-14 00:42:49,295 [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-14 00:42:49,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-14 00:42:50,249 [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-14 00:42:50,249 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-14 00:42:50,250 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:42:50,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-14 00:42:50,250 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:42:50,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:50,256 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:42:50,261 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:42:50,261 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:42:50,266 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:42:50,271 [ scc.git] DEBUG Already up to date.
2024-07-14 00:42:50,271 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-14 00:42:50,641 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-14 00:42:50,642 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-14 00:42:50,647 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:42:50,647 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:42:50,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:50,654 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-14 00:42:50,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:50,667 [ 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-14 00:42:50,679 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:42:50,683 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-14 00:42:50,683 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-14 00:42:50,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:42:50,861 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:42:50,904 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:42:50,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:42:50,909 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:42:50,956 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:42:50,964 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee70f88fa0> has no local changes
2024-07-14 00:42:50,965 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:42:50,975 [ scc.git] DEBUG [detached HEAD 8640f67] merge master -Dorg -Ssuccess-only
2024-07-14 00:42:50,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:42:50,975 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:42:51,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-14 00:42:51,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-14 00:42:51,962 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-14 00:42:52,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-14 00:42:53,088 [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-14 00:42:53,558 [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-14 00:42:54,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-14 00:42:54,575 [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-14 00:42:54,576 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-14 00:42:55,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-14 00:42:55,059 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-14 00:42:55,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-14 00:42:56,111 [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-14 00:42:56,635 [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-14 00:42:57,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-14 00:42:57,615 [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-14 00:42:57,616 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-14 00:42:58,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-14 00:42:58,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-14 00:42:59,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-14 00:42:59,539 [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-14 00:42:59,992 [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-14 00:43:00,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-14 00:43:00,869 [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-14 00:43:00,869 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-14 00:43:01,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-14 00:43:01,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-14 00:43:02,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-14 00:43:02,840 [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-14 00:43:03,331 [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-14 00:43:03,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-14 00:43:04,274 [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-14 00:43:04,276 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-14 00:43:04,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-14 00:43:05,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-14 00:43:05,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-14 00:43:06,152 [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-14 00:43:06,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-14 00:43:07,015 [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-14 00:43:07,016 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-14 00:43:07,017 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:43:07,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-14 00:43:07,017 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:07,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:07,024 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:43:07,030 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:43:07,030 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:43:07,091 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:43:07,097 [ scc.git] DEBUG Already up to date.
2024-07-14 00:43:07,097 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-14 00:43:07,604 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-14 00:43:07,605 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-14 00:43:07,611 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-14 00:43:08,710 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-14 00:43:08,711 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-14 00:43:08,716 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-14 00:43:09,137 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-14 00:43:09,137 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-14 00:43:09,143 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-14 00:43:09,496 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-14 00:43:09,496 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-14 00:43:09,502 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-14 00:43:09,877 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-14 00:43:09,877 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-14 00:43:09,882 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:43:09,883 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:09,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:09,889 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-14 00:43:09,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:09,903 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-14 00:43:10,040 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-14 00:43:10,041 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:10,045 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-14 00:43:10,045 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-14 00:43:10,045 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-14 00:43:10,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:10,202 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-14 00:43:10,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:10,215 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-14 00:43:10,393 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-14 00:43:10,394 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-14 00:43:10,394 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-14 00:43:10,394 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-14 00:43:10,394 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:10,399 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-14 00:43:10,399 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-14 00:43:10,399 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-14 00:43:10,399 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-14 00:43:10,399 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-14 00:43:10,399 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-14 00:43:10,399 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-14 00:43:10,399 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-14 00:43:10,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:10,600 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-14 00:43:10,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:10,615 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-14 00:43:10,679 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-14 00:43:10,680 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:10,683 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-14 00:43:10,684 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-14 00:43:10,684 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-14 00:43:11,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:11,024 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-14 00:43:11,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:11,059 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-14 00:43:11,102 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:11,111 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-14 00:43:11,112 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-14 00:43:11,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:11,436 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-14 00:43:11,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:11,462 [ 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-14 00:43:11,525 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-14 00:43:11,527 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:11,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:11,865 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:43:11,909 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:11,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:11,916 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:43:11,958 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:43:11,969 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee78029df0> has no local changes
2024-07-14 00:43:11,969 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:43:11,982 [ scc.git] DEBUG [detached HEAD 737d314] merge master -Dorg -Ssuccess-only
2024-07-14 00:43:11,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:43:11,983 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:43:12,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-14 00:43:12,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-14 00:43:13,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-14 00:43:13,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-14 00:43:14,484 [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-14 00:43:14,964 [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-14 00:43:15,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-14 00:43:15,885 [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-14 00:43:15,885 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-14 00:43:15,886 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:43:15,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-14 00:43:15,886 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:15,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:15,892 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:43:15,897 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:43:15,897 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:43:15,903 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:43:15,908 [ scc.git] DEBUG Already up to date.
2024-07-14 00:43:15,908 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-14 00:43:16,269 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-14 00:43:16,270 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-14 00:43:16,274 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:43:16,274 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:16,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:16,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-14 00:43:16,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:16,291 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-14 00:43:16,300 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:16,303 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-14 00:43:16,303 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-14 00:43:16,303 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-14 00:43:16,303 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-14 00:43:16,303 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-14 00:43:16,303 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-14 00:43:16,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:16,465 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:43:16,522 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:16,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:16,528 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:43:16,567 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:43:16,574 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee7073f610> has no local changes
2024-07-14 00:43:16,575 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:43:16,585 [ scc.git] DEBUG [detached HEAD b22b908] merge master -Dorg -Ssuccess-only
2024-07-14 00:43:16,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:43:16,586 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:43:17,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-14 00:43:17,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-14 00:43:18,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-14 00:43:18,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-14 00:43:18,982 [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-14 00:43:19,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-14 00:43:19,849 [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-14 00:43:19,850 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-14 00:43:20,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-14 00:43:20,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-14 00:43:21,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-14 00:43:21,857 [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-14 00:43:22,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-14 00:43:22,702 [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-14 00:43:22,703 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-14 00:43:22,703 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:43:22,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-14 00:43:22,703 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:22,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:22,709 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:43:22,716 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:43:22,716 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:43:22,722 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:43:22,727 [ scc.git] DEBUG Already up to date.
2024-07-14 00:43:22,727 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-14 00:43:23,381 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-14 00:43:23,382 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-14 00:43:23,387 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-14 00:43:23,916 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-14 00:43:23,917 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-14 00:43:23,923 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:43:23,923 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:23,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:23,930 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-14 00:43:23,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:23,943 [ 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-14 00:43:24,004 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-14 00:43:24,004 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-14 00:43:24,004 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-14 00:43:24,004 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-14 00:43:24,004 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-14 00:43:24,005 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-14 00:43:24,011 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-14 00:43:24,019 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-14 00:43:24,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:24,191 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-14 00:43:24,198 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-14 00:43:24,205 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#122](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-07-14 00:43:24,213 [ scc.config] DEBUG Found github.token
2024-07-14 00:43:24,214 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-14 00:43:24,214 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-14 00:43:24,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:24,228 [ 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-14 00:43:24,262 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-14 00:43:24,262 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-14 00:43:24,262 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-14 00:43:24,262 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-14 00:43:24,263 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-14 00:43:24,270 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-14 00:43:24,278 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-14 00:43:24,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:24,607 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-14 00:43:24,615 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-14 00:43:24,621 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#122](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/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-14 00:43:24,627 [ scc.config] DEBUG Found github.token
2024-07-14 00:43:24,627 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-14 00:43:24,627 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:43:24,667 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:24,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:24,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:43:24,712 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:43:24,720 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee7073f8b0> has no local changes
2024-07-14 00:43:24,721 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:43:24,730 [ scc.git] DEBUG [detached HEAD da39330] merge master -Dorg -Ssuccess-only
2024-07-14 00:43:24,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:43:24,731 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:43:25,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-14 00:43:25,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-14 00:43:25,670 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-14 00:43:26,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-14 00:43:26,717 [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-14 00:43:27,173 [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-14 00:43:27,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-14 00:43:28,152 [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-14 00:43:28,153 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-14 00:43:28,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-14 00:43:28,607 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-14 00:43:29,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-14 00:43:29,679 [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-14 00:43:30,183 [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-14 00:43:30,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-14 00:43:31,157 [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-14 00:43:31,158 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-14 00:43:31,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-14 00:43:31,656 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-14 00:43:32,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-14 00:43:32,695 [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-14 00:43:33,163 [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-14 00:43:33,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-14 00:43:34,165 [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-14 00:43:34,166 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-14 00:43:34,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-14 00:43:35,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-14 00:43:35,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-14 00:43:36,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-14 00:43:36,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-14 00:43:37,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-14 00:43:37,037 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:43:37,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-14 00:43:37,037 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:37,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:37,045 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:43:37,052 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:43:37,052 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:43:37,062 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:43:37,069 [ scc.git] DEBUG Already up to date.
2024-07-14 00:43:37,070 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-14 00:43:37,426 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-14 00:43:37,426 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-14 00:43:37,434 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-14 00:43:37,779 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-14 00:43:37,780 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-14 00:43:37,786 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-14 00:43:38,146 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-14 00:43:38,146 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-14 00:43:38,153 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:43:38,153 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:38,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:38,161 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-14 00:43:38,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:38,174 [ 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-14 00:43:38,186 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:38,189 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-14 00:43:38,189 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-14 00:43:38,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:38,356 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-14 00:43:38,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:38,367 [ 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-14 00:43:38,421 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-14 00:43:38,422 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:38,426 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-14 00:43:38,426 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-14 00:43:38,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:38,765 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-14 00:43:38,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:38,779 [ 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-14 00:43:38,792 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-14 00:43:38,794 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:38,798 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-14 00:43:38,798 [ scc.git] DEBUG package.json | 2 +-
2024-07-14 00:43:38,798 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-14 00:43:39,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:39,205 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:43:39,249 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:39,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:39,257 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:43:39,303 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:43:39,311 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee7073f670> has no local changes
2024-07-14 00:43:39,312 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:43:39,322 [ scc.git] DEBUG [detached HEAD 0184777] merge master -Dorg -Ssuccess-only
2024-07-14 00:43:39,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:43:39,323 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:43:39,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-14 00:43:40,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-14 00:43:40,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-14 00:43:41,103 [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-14 00:43:41,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-14 00:43:41,996 [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-14 00:43:41,996 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-14 00:43:41,996 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:43:41,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-14 00:43:41,996 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:41,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:42,003 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:43:42,008 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:43:42,009 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:43:42,014 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:43:42,019 [ scc.git] DEBUG Already up to date.
2024-07-14 00:43:42,020 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-14 00:43:42,427 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-14 00:43:42,428 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-14 00:43:42,432 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:43:42,433 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:42,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:42,438 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-14 00:43:42,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:42,448 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-14 00:43:42,456 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:42,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:42,629 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:43:42,677 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:42,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:42,684 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:43:42,729 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:43:42,739 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee73fddee0> has no local changes
2024-07-14 00:43:42,740 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:43:42,751 [ scc.git] DEBUG [detached HEAD 38bed8b] merge master -Dorg -Ssuccess-only
2024-07-14 00:43:42,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:43:42,752 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:43:43,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-14 00:43:43,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-14 00:43:44,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-14 00:43:44,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-14 00:43:45,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-14 00:43:45,654 [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-14 00:43:46,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-14 00:43:46,616 [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-14 00:43:46,617 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-14 00:43:46,617 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:43:46,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-14 00:43:46,617 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:46,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:46,624 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:43:46,629 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:43:46,629 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:43:46,634 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:43:46,639 [ scc.git] DEBUG Already up to date.
2024-07-14 00:43:46,640 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-14 00:43:47,114 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-14 00:43:47,114 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-14 00:43:47,119 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:43:47,119 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:47,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:47,125 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-14 00:43:47,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:47,135 [ 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-14 00:43:47,144 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-14 00:43:47,145 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:47,148 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-14 00:43:47,148 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-14 00:43:47,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:47,351 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:43:47,392 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:47,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:47,399 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:43:47,439 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:43:47,449 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee70750b80> has no local changes
2024-07-14 00:43:47,449 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:43:47,459 [ scc.git] DEBUG [detached HEAD 1edfccc] merge master -Dorg -Ssuccess-only
2024-07-14 00:43:47,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:43:47,460 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:43:47,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-14 00:43:48,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-14 00:43:48,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-14 00:43:49,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-14 00:43:49,829 [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-14 00:43:50,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-14 00:43:50,771 [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-14 00:43:50,772 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-14 00:43:50,772 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:43:50,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-14 00:43:50,773 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:50,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:50,780 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:43:50,785 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:43:50,785 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:43:50,790 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:43:50,795 [ scc.git] DEBUG Already up to date.
2024-07-14 00:43:50,796 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-14 00:43:51,296 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-14 00:43:51,296 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-14 00:43:51,301 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:43:51,301 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:51,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:51,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-14 00:43:51,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:51,320 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-14 00:43:51,344 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-14 00:43:51,344 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-14 00:43:51,344 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-14 00:43:51,344 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-14 00:43:51,344 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-14 00:43:51,344 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-14 00:43:51,344 [ scc.git] DEBUG Auto-merging setup.py
2024-07-14 00:43:51,344 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-14 00:43:51,345 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-14 00:43:51,345 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-14 00:43:51,352 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-14 00:43:51,360 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-14 00:43:51,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:51,522 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-14 00:43:51,529 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-14 00:43:51,536 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#122](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-07-14 00:43:51,541 [ scc.config] DEBUG Found github.token
2024-07-14 00:43:51,542 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-14 00:43:51,542 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:43:51,582 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:51,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:51,587 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:43:51,627 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:43:51,634 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee70f9ef10> has no local changes
2024-07-14 00:43:51,635 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:43:51,645 [ scc.git] DEBUG [detached HEAD 3c37714] merge master -Dorg -Ssuccess-only
2024-07-14 00:43:51,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:43:51,645 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:43:52,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-14 00:43:52,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-14 00:43:52,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-14 00:43:53,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-14 00:43:53,973 [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-14 00:43:54,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-14 00:43:54,914 [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-14 00:43:54,914 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-14 00:43:54,914 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:43:54,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-14 00:43:54,914 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:54,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:54,920 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:43:54,926 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:43:54,927 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:43:54,933 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:43:54,940 [ scc.git] DEBUG Already up to date.
2024-07-14 00:43:54,941 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-14 00:43:55,373 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-14 00:43:55,373 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-14 00:43:55,380 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:43:55,380 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:55,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:55,386 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-14 00:43:55,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:55,400 [ 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-14 00:43:55,427 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-14 00:43:55,431 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-14 00:43:55,431 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-14 00:43:55,431 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-14 00:43:55,431 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-14 00:43:55,431 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-14 00:43:55,431 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-14 00:43:55,431 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-14 00:43:55,431 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-14 00:43:55,433 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-14 00:43:55,433 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-14 00:43:55,433 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-14 00:43:55,433 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-14 00:43:55,434 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-14 00:43:55,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:43:55,590 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:43:55,633 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:55,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:55,639 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:43:55,681 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:43:55,690 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee7076a700> has no local changes
2024-07-14 00:43:55,690 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:43:55,701 [ scc.git] DEBUG [detached HEAD aba7f3a] merge master -Dorg -Ssuccess-only
2024-07-14 00:43:55,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:43:55,702 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:43:56,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-14 00:43:56,024 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:43:56,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-14 00:43:56,024 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:56,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:56,030 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:43:56,034 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:43:56,035 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:43:56,039 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:43:56,046 [ scc.git] DEBUG Already up to date.
2024-07-14 00:43:56,046 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:43:56,046 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:56,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:56,052 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:43:56,096 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:56,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:56,102 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:43:56,147 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:43:56,154 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee70770e50> has no local changes
2024-07-14 00:43:56,155 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:43:56,164 [ scc.git] DEBUG [detached HEAD 8097792] merge master -Dorg -Ssuccess-only
2024-07-14 00:43:56,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:43:56,165 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:43:56,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-14 00:43:56,444 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:43:56,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-14 00:43:56,444 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:56,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:56,451 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:43:56,456 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:43:56,456 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:43:56,462 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:43:56,468 [ scc.git] DEBUG Already up to date.
2024-07-14 00:43:56,468 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:43:56,468 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:56,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:56,474 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:43:56,514 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:43:56,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:43:56,520 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:43:56,558 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:43:56,565 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee707184f0> has no local changes
2024-07-14 00:43:56,565 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:43:56,573 [ scc.git] DEBUG [detached HEAD e4d7a9f] merge master -Dorg -Ssuccess-only
2024-07-14 00:43:56,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:43:56,573 [ scc.git] INFO Overriding base-branch from master to main
2024-07-14 00:43:56,573 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:43:56,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-14 00:43:57,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-14 00:43:57,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-14 00:43:58,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-14 00:43:58,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-14 00:43:59,341 [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-14 00:43:59,822 [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-14 00:44:00,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-14 00:44:00,823 [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-14 00:44:00,824 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-14 00:44:00,824 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:44:00,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-14 00:44:00,824 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:00,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:00,830 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-14 00:44:00,835 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:44:00,835 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-14 00:44:00,841 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-14 00:44:00,848 [ scc.git] DEBUG Already up to date.
2024-07-14 00:44:00,848 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-14 00:44:01,573 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-14 00:44:01,573 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-14 00:44:01,577 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:44:01,578 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:01,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:01,583 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-14 00:44:01,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:01,593 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-14 00:44:01,609 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-14 00:44:01,609 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-14 00:44:01,609 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-14 00:44:01,609 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-14 00:44:01,615 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-14 00:44:01,621 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-14 00:44:01,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:01,786 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-14 00:44:01,792 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-14 00:44:01,797 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#122](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-14 00:44:01,802 [ scc.config] DEBUG Found github.token
2024-07-14 00:44:01,802 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-14 00:44:01,802 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:44:01,842 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:01,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:01,848 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:44:01,886 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:44:01,893 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee706c94f0> has no local changes
2024-07-14 00:44:01,893 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:44:01,902 [ scc.git] DEBUG [detached HEAD 17e0645] merge master -Dorg -Ssuccess-only
2024-07-14 00:44:01,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:01,902 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:44:02,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-14 00:44:02,225 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:44:02,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-14 00:44:02,225 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:02,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:02,231 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:44:02,237 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:44:02,237 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:44:02,242 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:44:02,248 [ scc.git] DEBUG Already up to date.
2024-07-14 00:44:02,248 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:44:02,248 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:02,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:02,254 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:44:02,293 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:02,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:02,299 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:44:02,339 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:44:02,346 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee70733f40> has no local changes
2024-07-14 00:44:02,346 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:44:02,357 [ scc.git] DEBUG [detached HEAD 86aa5ed] merge master -Dorg -Ssuccess-only
2024-07-14 00:44:02,357 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:02,357 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:44:02,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-14 00:44:02,674 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:44:02,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-14 00:44:02,674 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:02,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:02,679 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:44:02,684 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:44:02,684 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:44:02,690 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:44:02,696 [ scc.git] DEBUG Already up to date.
2024-07-14 00:44:02,696 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:44:02,696 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:02,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:02,701 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:44:02,743 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:02,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:02,749 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:44:02,787 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:44:02,794 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee706f1700> has no local changes
2024-07-14 00:44:02,794 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:44:02,804 [ scc.git] DEBUG [detached HEAD 5ecd3e4] merge master -Dorg -Ssuccess-only
2024-07-14 00:44:02,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:02,804 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:44:03,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-14 00:44:03,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-14 00:44:04,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-14 00:44:04,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-14 00:44:05,074 [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-14 00:44:05,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-14 00:44:05,993 [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-14 00:44:05,993 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-14 00:44:05,993 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:44:05,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-14 00:44:05,994 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:05,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:06,000 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-14 00:44:06,007 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:44:06,007 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-14 00:44:06,013 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-14 00:44:06,019 [ scc.git] DEBUG Already up to date.
2024-07-14 00:44:06,020 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-14 00:44:06,453 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-14 00:44:06,453 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-14 00:44:06,460 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:44:06,460 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:06,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:06,466 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-14 00:44:06,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:06,482 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-14 00:44:06,570 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-14 00:44:06,570 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-14 00:44:06,570 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-14 00:44:06,571 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-14 00:44:06,578 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-14 00:44:06,587 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-14 00:44:06,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:06,758 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-14 00:44:06,765 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-14 00:44:06,773 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#122](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-14 00:44:06,779 [ scc.config] DEBUG Found github.token
2024-07-14 00:44:06,780 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-14 00:44:06,780 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:44:06,821 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:06,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:06,827 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:44:06,872 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:44:06,880 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee70684df0> has no local changes
2024-07-14 00:44:06,880 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:44:06,889 [ scc.git] DEBUG [detached HEAD a0c7028] merge master -Dorg -Ssuccess-only
2024-07-14 00:44:06,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:06,890 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-14 00:44:06,890 [ scc.repo] DEBUG ## PRs found:
2024-07-14 00:44:07,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-14 00:44:07,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-14 00:44:08,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-14 00:44:08,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-14 00:44:09,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-14 00:44:09,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-14 00:44:10,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-14 00:44:10,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-14 00:44:11,219 [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-14 00:44:11,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-14 00:44:12,077 [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-14 00:44:12,078 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-14 00:44:12,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-14 00:44:13,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-14 00:44:13,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-14 00:44:14,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-14 00:44:14,024 [ scc.repo] DEBUG ## Branches found:
2024-07-14 00:44:14,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-14 00:44:14,024 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:14,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:14,032 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-14 00:44:14,039 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-14 00:44:14,039 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-14 00:44:14,046 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-14 00:44:14,057 [ scc.git] DEBUG Already up to date.
2024-07-14 00:44:14,057 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-14 00:44:14,487 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-14 00:44:14,487 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-14 00:44:14,492 [ scc.git] DEBUG ## Unique users: []
2024-07-14 00:44:14,492 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:14,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:14,498 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-14 00:44:14,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:14,511 [ 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-14 00:44:14,548 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-14 00:44:14,548 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-14 00:44:14,548 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-14 00:44:14,548 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-14 00:44:14,554 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-14 00:44:14,561 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-14 00:44:14,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:14,724 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-14 00:44:14,733 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-14 00:44:14,740 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#122](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-14 00:44:14,746 [ scc.config] DEBUG Found github.token
2024-07-14 00:44:14,746 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-14 00:44:14,747 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-14 00:44:14,788 [ scc.git] DEBUG Get sha1 of %s
2024-07-14 00:44:14,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-14 00:44:14,795 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:44:14,836 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:44:14,844 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee706f5ee0> has no local changes
2024-07-14 00:44:14,844 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:44:14,854 [ scc.git] DEBUG [detached HEAD bf6bc68] merge master -Dorg -Ssuccess-only
2024-07-14 00:44:14,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:14,855 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-14 00:44:14,935 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-14 00:44:15,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:15,147 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-14 00:44:15,152 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-14 00:44:15,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:15,569 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-14 00:44:15,574 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-14 00:44:15,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:15,974 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-14 00:44:15,979 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-14 00:44:16,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:16,397 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-14 00:44:16,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:16,813 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-14 00:44:16,818 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-14 00:44:17,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:17,223 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-14 00:44:17,228 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-14 00:44:17,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:17,634 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-14 00:44:17,641 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-14 00:44:18,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:18,043 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-14 00:44:18,048 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-14 00:44:18,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:18,457 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-14 00:44:18,463 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-14 00:44:18,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:18,855 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-14 00:44:18,859 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-14 00:44:19,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:19,301 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-14 00:44:19,305 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-14 00:44:19,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:19,719 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-14 00:44:19,726 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-14 00:44:20,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:20,128 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-14 00:44:20,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:20,557 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-14 00:44:20,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:20,964 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-14 00:44:20,969 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-14 00:44:21,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:21,379 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-14 00:44:21,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:21,833 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-14 00:44:22,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:22,235 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-14 00:44:22,240 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-14 00:44:22,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:22,643 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-14 00:44:22,651 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-14 00:44:23,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:23,057 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-14 00:44:23,061 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-14 00:44:23,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:23,483 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-14 00:44:23,488 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-14 00:44:23,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-14 00:44:23,900 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-14 00:44:23,900 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-14 00:44:23,999 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee79109d60> has local changes
2024-07-14 00:44:24,000 [ 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#122 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/122/)'
2024-07-14 00:44:24,017 [ scc.git] DEBUG [detached HEAD e01537b] merge master -Dorg -Ssuccess-only
2024-07-14 00:44:24,017 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-14 00:44:24,018 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-14 00:44:24,018 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,018 [ scc.merge] INFO
2024-07-14 00:44:24,018 [ scc.merge] INFO
2024-07-14 00:44:24,018 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-14 00:44:24,018 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,018 [ scc.merge] INFO
2024-07-14 00:44:24,018 [ scc.merge] INFO
2024-07-14 00:44:24,018 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-14 00:44:24,018 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:44:24,018 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-14 00:44:24,018 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,018 [ scc.merge] INFO
2024-07-14 00:44:24,018 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,018 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-14 00:44:24,018 [ scc.merge] INFO
2024-07-14 00:44:24,018 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-14 00:44:24,018 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:44:24,018 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-14 00:44:24,018 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-14 00:44:24,018 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-14 00:44:24,018 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-14 00:44:24,019 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,019 [ scc.merge] INFO
2024-07-14 00:44:24,019 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,019 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-14 00:44:24,019 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-14 00:44:24,019 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-14 00:44:24,019 [ scc.merge] INFO
2024-07-14 00:44:24,019 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-14 00:44:24,019 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:44:24,019 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-14 00:44:24,019 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,019 [ scc.merge] INFO
2024-07-14 00:44:24,019 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,019 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-14 00:44:24,019 [ scc.merge] INFO
2024-07-14 00:44:24,019 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-14 00:44:24,019 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-14 00:44:24,019 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-14 00:44:24,019 [ scc.merge] INFO
2024-07-14 00:44:24,019 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-14 00:44:24,019 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:44:24,019 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-07-14 00:44:24,019 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-14 00:44:24,019 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,019 [ scc.merge] INFO
2024-07-14 00:44:24,019 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,019 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-14 00:44:24,020 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-14 00:44:24,020 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-07-14 00:44:24,020 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-14 00:44:24,020 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-07-14 00:44:24,020 [ scc.merge] INFO
2024-07-14 00:44:24,020 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-14 00:44:24,020 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,020 [ scc.merge] INFO
2024-07-14 00:44:24,020 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,020 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-14 00:44:24,020 [ scc.merge] INFO
2024-07-14 00:44:24,020 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-14 00:44:24,020 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,020 [ scc.merge] INFO
2024-07-14 00:44:24,020 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,020 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-14 00:44:24,020 [ scc.merge] INFO
2024-07-14 00:44:24,020 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-14 00:44:24,020 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:44:24,020 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-14 00:44:24,020 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-14 00:44:24,020 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,020 [ scc.merge] INFO
2024-07-14 00:44:24,020 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-14 00:44:24,021 [ scc.merge] INFO
2024-07-14 00:44:24,021 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-14 00:44:24,021 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-14 00:44:24,021 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,021 [ scc.merge] INFO
2024-07-14 00:44:24,021 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-14 00:44:24,021 [ scc.merge] INFO
2024-07-14 00:44:24,021 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-14 00:44:24,021 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,021 [ scc.merge] INFO
2024-07-14 00:44:24,021 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-14 00:44:24,021 [ scc.merge] INFO
2024-07-14 00:44:24,021 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-14 00:44:24,021 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-14 00:44:24,021 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-14 00:44:24,022 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,022 [ scc.merge] INFO
2024-07-14 00:44:24,022 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,022 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-14 00:44:24,022 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-14 00:44:24,022 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-14 00:44:24,022 [ scc.merge] INFO
2024-07-14 00:44:24,022 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-14 00:44:24,022 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,022 [ scc.merge] INFO
2024-07-14 00:44:24,022 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,022 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-14 00:44:24,022 [ scc.merge] INFO
2024-07-14 00:44:24,022 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-14 00:44:24,022 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:44:24,022 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-14 00:44:24,022 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,022 [ scc.merge] INFO
2024-07-14 00:44:24,022 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,022 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-14 00:44:24,022 [ scc.merge] INFO
2024-07-14 00:44:24,022 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-14 00:44:24,022 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,022 [ scc.merge] INFO
2024-07-14 00:44:24,022 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-14 00:44:24,023 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-14 00:44:24,023 [ scc.merge] INFO
2024-07-14 00:44:24,023 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-14 00:44:24,023 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,023 [ scc.merge] INFO
2024-07-14 00:44:24,023 [ scc.merge] INFO Merged PRs:
2024-07-14 00:44:24,023 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-14 00:44:24,023 [ scc.merge] INFO
2024-07-14 00:44:24,023 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-14 00:44:24,023 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,023 [ scc.merge] INFO
2024-07-14 00:44:24,023 [ scc.merge] INFO
2024-07-14 00:44:24,023 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-14 00:44:24,023 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,023 [ scc.merge] INFO
2024-07-14 00:44:24,023 [ scc.merge] INFO
2024-07-14 00:44:24,023 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-14 00:44:24,023 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:44:24,023 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-14 00:44:24,023 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,023 [ scc.merge] INFO
2024-07-14 00:44:24,023 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-14 00:44:24,023 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-14 00:44:24,023 [ scc.merge] INFO
2024-07-14 00:44:24,023 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-14 00:44:24,023 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,023 [ scc.merge] INFO
2024-07-14 00:44:24,024 [ scc.merge] INFO
2024-07-14 00:44:24,024 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-14 00:44:24,024 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,024 [ scc.merge] INFO
2024-07-14 00:44:24,024 [ scc.merge] INFO
2024-07-14 00:44:24,024 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-14 00:44:24,024 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,024 [ scc.merge] INFO
2024-07-14 00:44:24,024 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-14 00:44:24,024 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-14 00:44:24,024 [ scc.merge] INFO
2024-07-14 00:44:24,024 [ scc.merge] INFO Repository: ome/scripts
2024-07-14 00:44:24,024 [ scc.merge] INFO Excluded PRs:
2024-07-14 00:44:24,024 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-14 00:44:24,024 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-14 00:44:24,024 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-14 00:44:24,024 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-14 00:44:24,024 [ scc.merge] INFO Already up to date.
2024-07-14 00:44:24,024 [ scc.merge] INFO
2024-07-14 00:44:24,024 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-14 00:44:24,024 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-14 00:44:24,024 [ scc.merge] INFO
2024-07-14 00:44:24,024 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-14 00:44:24,025 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-14 00:44:24,034 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-14 00:44:24,041 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-14 00:44:24,048 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-14 00:44:24,055 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-14 00:44:24,063 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-14 00:44:24,072 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-14 00:44:24,079 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-14 00:44:24,086 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-14 00:44:24,092 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-14 00:44:24,099 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-14 00:44:24,105 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-14 00:44:24,112 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-14 00:44:24,118 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-14 00:44:24,125 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-14 00:44:24,131 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,137 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-14 00:44:24,137 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-14 00:44:24,142 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-14 00:44:24,147 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-14 00:44:24,152 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-14 00:44:24,158 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-14 00:44:24,165 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-14 00:44:24,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-14 00:44:24,173 [ scc.git] DEBUG Calling 'git remote'
2024-07-14 00:44:24,178 [ 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 812d9cf] 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 7339bbd] 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-14 00:45:11,741 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-07-14 00:45:21,131 [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-14 00:45:23,550 [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-14 00:45:28,279 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-14 00:46:16,127 [ 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/f5fa13f0/images/svgs/logo.svg){kind=logo}
