Skipping 107 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-07-16 00:42:29,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-16 00:42:30,266 [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-16 00:42:30,729 [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-16 00:42:31,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-16 00:42:31,567 [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-16 00:42:31,568 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-07-16 00:42:31,568 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:42:31,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-16 00:42:31,569 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:42:31,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:31,575 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:42:31,581 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:42:31,581 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:42:31,603 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:42:31,610 [ scc.git] DEBUG Already up to date.
2024-07-16 00:42:31,610 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-16 00:42:32,045 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-16 00:42:32,046 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-16 00:42:32,051 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-16 00:42:32,536 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-16 00:42:32,536 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-16 00:42:32,542 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-16 00:42:33,586 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-16 00:42:33,586 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-16 00:42:33,593 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-16 00:42:33,937 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-16 00:42:33,937 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-16 00:42:33,942 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-07-16 00:42:34,516 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-16 00:42:34,516 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-07-16 00:42:34,522 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:42:34,522 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:42:34,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:34,529 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-16 00:42:34,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:34,542 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-16 00:42:34,581 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-16 00:42:34,581 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:42:34,588 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-16 00:42:34,588 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-16 00:42:34,588 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-16 00:42:34,588 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-16 00:42:34,588 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-16 00:42:34,588 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-16 00:42:34,588 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-16 00:42:34,588 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-16 00:42:34,588 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-16 00:42:34,588 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-16 00:42:34,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:42:34,759 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-16 00:42:34,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:34,775 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-16 00:42:34,998 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-16 00:42:34,998 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-16 00:42:34,998 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-16 00:42:34,998 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-16 00:42:34,999 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:42:35,005 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-16 00:42:35,005 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-16 00:42:35,006 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-16 00:42:35,006 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-16 00:42:35,006 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-16 00:42:35,006 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-16 00:42:35,006 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-16 00:42:35,006 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-16 00:42:35,006 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-16 00:42:35,006 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-16 00:42:35,006 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-16 00:42:35,006 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-16 00:42:35,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:42:35,171 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-16 00:42:35,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:35,186 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-16 00:42:35,340 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-07-16 00:42:35,340 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-16 00:42:35,340 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-16 00:42:35,340 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-07-16 00:42:35,340 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-16 00:42:35,340 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-16 00:42:35,341 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:42:35,352 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-07-16 00:42:35,352 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-07-16 00:42:35,352 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-07-16 00:42:35,352 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-07-16 00:42:35,352 [ scc.git] DEBUG src/index.html | 1 +
2024-07-16 00:42:35,352 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-07-16 00:42:35,352 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-07-16 00:42:35,352 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-07-16 00:42:35,352 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-07-16 00:42:35,352 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-07-16 00:42:35,353 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-07-16 00:42:35,353 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-07-16 00:42:35,353 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-07-16 00:42:35,353 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-07-16 00:42:35,353 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-07-16 00:42:35,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:42:35,570 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-16 00:42:35,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:35,585 [ 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-16 00:42:35,630 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:42:35,633 [ scc.git] DEBUG setup.py | 2 +-
2024-07-16 00:42:35,633 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-16 00:42:35,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:42:35,983 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-07-16 00:42:35,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:36,003 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-07-16 00:42:36,050 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-16 00:42:36,050 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-16 00:42:36,062 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:42:36,067 [ scc.git] DEBUG .gitignore | 2 +-
2024-07-16 00:42:36,067 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-07-16 00:42:36,067 [ scc.git] DEBUG src/index.html | 3 +++
2024-07-16 00:42:36,067 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-07-16 00:42:36,067 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-07-16 00:42:36,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:42:36,381 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:42:36,424 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:42:36,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:36,431 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:42:36,469 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:42:36,477 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc846f2430> has no local changes
2024-07-16 00:42:36,477 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:42:36,487 [ scc.git] DEBUG [detached HEAD 8adee06f] merge master -Dorg -Ssuccess-only
2024-07-16 00:42:36,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:42:36,488 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:42:36,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-16 00:42:37,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-16 00:42:37,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-16 00:42:38,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-16 00:42:38,791 [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-16 00:42:39,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-16 00:42:39,637 [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-16 00:42:39,637 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-16 00:42:39,638 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:42:39,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-16 00:42:39,638 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:42:39,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:39,644 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:42:39,650 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:42:39,650 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:42:39,657 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:42:39,664 [ scc.git] DEBUG Already up to date.
2024-07-16 00:42:39,665 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-16 00:42:40,049 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-16 00:42:40,049 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-16 00:42:40,053 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:42:40,054 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:42:40,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:40,059 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-16 00:42:40,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:40,073 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-16 00:42:40,106 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-16 00:42:40,107 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:42:40,110 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-16 00:42:40,110 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-16 00:42:40,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:42:40,268 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:42:40,323 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:42:40,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:40,332 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:42:40,388 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:42:40,397 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc85f8bf40> has no local changes
2024-07-16 00:42:40,398 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:42:40,409 [ scc.git] DEBUG [detached HEAD 89711b5] merge master -Dorg -Ssuccess-only
2024-07-16 00:42:40,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:42:40,410 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:42:40,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-16 00:42:41,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-16 00:42:41,262 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-16 00:42:41,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-16 00:42:42,342 [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-16 00:42:42,871 [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-16 00:42:43,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-16 00:42:43,737 [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-16 00:42:43,738 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-16 00:42:43,738 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:42:43,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-16 00:42:43,739 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:42:43,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:43,744 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:42:43,749 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:42:43,749 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:42:43,754 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:42:43,760 [ scc.git] DEBUG Already up to date.
2024-07-16 00:42:43,760 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-16 00:42:44,148 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-16 00:42:44,148 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-16 00:42:44,153 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:42:44,153 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:42:44,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:44,160 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-16 00:42:44,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:44,173 [ 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-16 00:42:44,186 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:42:44,190 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-16 00:42:44,191 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-16 00:42:44,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:42:44,347 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:42:44,389 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:42:44,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:42:44,396 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:42:44,445 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:42:44,453 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc84700fa0> has no local changes
2024-07-16 00:42:44,453 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:42:44,463 [ scc.git] DEBUG [detached HEAD 782d281] merge master -Dorg -Ssuccess-only
2024-07-16 00:42:44,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:42:44,464 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:42:44,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-16 00:42:45,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-16 00:42:45,339 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-16 00:42:45,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-16 00:42:46,470 [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-16 00:42:46,950 [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-16 00:42:47,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-16 00:42:47,951 [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-16 00:42:47,951 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-16 00:42:48,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-16 00:42:48,407 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-16 00:42:48,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-16 00:42:49,453 [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-16 00:42:50,067 [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-16 00:42:50,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-16 00:42:51,073 [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-16 00:42:51,074 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-16 00:42:51,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-16 00:42:52,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-16 00:42:52,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-16 00:42:52,997 [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-16 00:42:53,464 [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-16 00:42:53,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-16 00:42:54,367 [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-16 00:42:54,368 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-16 00:42:54,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-16 00:42:55,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-16 00:42:55,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-16 00:42:56,402 [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-16 00:42:56,889 [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-16 00:42:57,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-16 00:42:57,843 [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-16 00:42:57,844 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-16 00:42:58,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-16 00:42:58,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-16 00:42:59,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-16 00:42:59,755 [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-16 00:43:00,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-16 00:43:00,666 [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-16 00:43:00,667 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-16 00:43:00,668 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:00,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-16 00:43:00,668 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:00,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:00,676 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:00,683 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:00,684 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:00,692 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:00,700 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:00,701 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-16 00:43:01,233 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-16 00:43:01,233 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-16 00:43:01,254 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-16 00:43:02,191 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-16 00:43:02,191 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-16 00:43:02,197 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-16 00:43:02,613 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-16 00:43:02,614 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-16 00:43:02,620 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-16 00:43:02,958 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-16 00:43:02,958 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-16 00:43:02,965 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-16 00:43:03,299 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-16 00:43:03,299 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-16 00:43:03,306 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:03,306 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:03,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:03,314 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-16 00:43:03,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:03,329 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-16 00:43:03,373 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-16 00:43:03,374 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:03,381 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-16 00:43:03,381 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-16 00:43:03,381 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-16 00:43:03,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:03,550 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-16 00:43:03,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:03,567 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-16 00:43:03,679 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-16 00:43:03,679 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-16 00:43:03,679 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-16 00:43:03,679 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-16 00:43:03,679 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:03,684 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-16 00:43:03,685 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-16 00:43:03,685 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-16 00:43:03,685 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-16 00:43:03,685 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-16 00:43:03,685 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-16 00:43:03,685 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-16 00:43:03,685 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-16 00:43:03,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:03,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-16 00:43:03,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:03,979 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-16 00:43:04,042 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-16 00:43:04,042 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:04,046 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-16 00:43:04,046 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-16 00:43:04,046 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-16 00:43:04,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:04,397 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-16 00:43:04,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:04,422 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-16 00:43:04,468 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:04,478 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-16 00:43:04,478 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-16 00:43:04,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:04,807 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-16 00:43:04,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:04,820 [ 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-16 00:43:04,911 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-16 00:43:04,913 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:05,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:05,219 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:05,261 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:05,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:05,267 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:05,327 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:05,339 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc85f81df0> has no local changes
2024-07-16 00:43:05,340 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:05,353 [ scc.git] DEBUG [detached HEAD 5652603] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:05,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:05,354 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:05,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-16 00:43:06,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-16 00:43:06,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-16 00:43:07,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-16 00:43:07,751 [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-16 00:43:08,294 [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-16 00:43:08,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-16 00:43:09,267 [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-16 00:43:09,268 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-16 00:43:09,269 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:09,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-16 00:43:09,269 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:09,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:09,276 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:09,283 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:09,283 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:09,290 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:09,297 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:09,297 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-16 00:43:09,670 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-16 00:43:09,670 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-16 00:43:09,675 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:09,675 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:09,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:09,683 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-16 00:43:09,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:09,698 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-16 00:43:09,711 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:09,714 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-16 00:43:09,714 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-16 00:43:09,714 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-16 00:43:09,714 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-16 00:43:09,714 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-16 00:43:09,714 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-16 00:43:09,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:09,891 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:09,937 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:09,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:09,944 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:09,989 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:09,996 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc846b8610> has no local changes
2024-07-16 00:43:09,996 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:10,005 [ scc.git] DEBUG [detached HEAD ff65569] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:10,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:10,006 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:10,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-16 00:43:11,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-16 00:43:11,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-16 00:43:12,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-16 00:43:12,592 [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-16 00:43:13,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-16 00:43:13,527 [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-16 00:43:13,528 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-16 00:43:13,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-16 00:43:14,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-16 00:43:15,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-16 00:43:15,510 [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-16 00:43:16,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-16 00:43:16,428 [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-16 00:43:16,429 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-16 00:43:16,430 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:16,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-16 00:43:16,430 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:16,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:16,436 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:16,441 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:16,442 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:16,449 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:16,455 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:16,455 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-16 00:43:17,108 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-16 00:43:17,108 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-16 00:43:17,113 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-16 00:43:17,706 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-16 00:43:17,706 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-16 00:43:17,712 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:17,712 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:17,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:17,723 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-16 00:43:17,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:17,736 [ 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-16 00:43:17,824 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-16 00:43:17,824 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-16 00:43:17,824 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-16 00:43:17,824 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-16 00:43:17,825 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-16 00:43:17,826 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-16 00:43:17,832 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-16 00:43:17,840 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-16 00:43:18,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:18,025 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-16 00:43:18,033 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-16 00:43:18,039 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#124](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-07-16 00:43:18,047 [ scc.config] DEBUG Found github.token
2024-07-16 00:43:18,048 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-16 00:43:18,048 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-16 00:43:18,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:18,062 [ 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-16 00:43:18,098 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-16 00:43:18,098 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-16 00:43:18,098 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-16 00:43:18,098 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-16 00:43:18,099 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-16 00:43:18,106 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-16 00:43:18,115 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-16 00:43:18,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:18,439 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-16 00:43:18,447 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-16 00:43:18,454 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#124](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/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-16 00:43:18,460 [ scc.config] DEBUG Found github.token
2024-07-16 00:43:18,461 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-16 00:43:18,461 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:18,507 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:18,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:18,514 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:18,560 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:18,570 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc846b88b0> has no local changes
2024-07-16 00:43:18,570 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:18,582 [ scc.git] DEBUG [detached HEAD 175523c] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:18,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:18,583 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:19,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-16 00:43:19,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-16 00:43:19,480 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-16 00:43:20,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-16 00:43:20,578 [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-16 00:43:21,103 [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-16 00:43:21,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-16 00:43:22,085 [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-16 00:43:22,086 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-16 00:43:22,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-16 00:43:22,551 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-16 00:43:23,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-16 00:43:23,729 [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-16 00:43:24,233 [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-16 00:43:24,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-16 00:43:25,215 [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-16 00:43:25,216 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-16 00:43:25,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-16 00:43:25,696 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-16 00:43:26,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-16 00:43:26,775 [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-16 00:43:27,226 [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-16 00:43:27,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-16 00:43:28,099 [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-16 00:43:28,100 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-16 00:43:28,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-16 00:43:29,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-16 00:43:29,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-16 00:43:29,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-16 00:43:30,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-16 00:43:30,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-16 00:43:30,943 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:30,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-16 00:43:30,943 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:30,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:30,952 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:30,962 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:30,963 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:30,970 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:30,979 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:30,980 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-16 00:43:31,402 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-16 00:43:31,402 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-16 00:43:31,411 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-16 00:43:31,764 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-16 00:43:31,764 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-16 00:43:31,771 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-16 00:43:32,141 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-16 00:43:32,141 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-16 00:43:32,146 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:32,147 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:32,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:32,155 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-16 00:43:32,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:32,173 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-16 00:43:32,190 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:32,195 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-16 00:43:32,195 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-16 00:43:32,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:32,363 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-16 00:43:32,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:32,383 [ 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-16 00:43:32,435 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-16 00:43:32,436 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:32,442 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-16 00:43:32,442 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-16 00:43:32,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:32,770 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-16 00:43:32,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:32,790 [ 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-16 00:43:32,849 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-16 00:43:32,850 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:32,855 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-16 00:43:32,856 [ scc.git] DEBUG package.json | 2 +-
2024-07-16 00:43:32,856 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-16 00:43:33,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:33,195 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:33,243 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:33,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:33,250 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:33,296 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:33,307 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc846b8670> has no local changes
2024-07-16 00:43:33,307 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:33,319 [ scc.git] DEBUG [detached HEAD 4f278d2] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:33,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:33,320 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:33,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-16 00:43:34,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-16 00:43:34,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-16 00:43:35,126 [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-16 00:43:35,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-16 00:43:36,072 [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-16 00:43:36,073 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-16 00:43:36,074 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:36,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-16 00:43:36,074 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:36,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:36,082 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:36,092 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:36,092 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:36,100 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:36,106 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:36,107 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-16 00:43:36,486 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-16 00:43:36,486 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-16 00:43:36,494 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:36,494 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:36,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:36,500 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-16 00:43:36,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:36,512 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-16 00:43:36,524 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:36,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:36,684 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:36,731 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:36,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:36,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:36,796 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:36,804 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc85f37f10> has no local changes
2024-07-16 00:43:36,804 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:36,814 [ scc.git] DEBUG [detached HEAD 39b4ffe] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:36,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:36,815 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:37,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-16 00:43:37,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-16 00:43:38,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-16 00:43:38,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-16 00:43:39,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-16 00:43:39,580 [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-16 00:43:40,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-16 00:43:40,508 [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-16 00:43:40,509 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-16 00:43:40,510 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:40,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-16 00:43:40,510 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:40,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:40,517 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:40,522 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:40,522 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:40,528 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:40,533 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:40,534 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-16 00:43:41,025 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-16 00:43:41,025 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-16 00:43:41,032 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:41,032 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:41,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:41,041 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-16 00:43:41,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:41,063 [ 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-16 00:43:41,080 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-16 00:43:41,081 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:41,084 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-16 00:43:41,084 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-16 00:43:41,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:41,262 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:41,320 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:41,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:41,329 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:41,381 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:41,459 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc846cab80> has no local changes
2024-07-16 00:43:41,459 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:41,471 [ scc.git] DEBUG [detached HEAD 41711d7] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:41,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:41,472 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:41,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-16 00:43:42,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-16 00:43:42,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-16 00:43:43,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-16 00:43:43,737 [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-16 00:43:44,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-16 00:43:44,748 [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-16 00:43:44,749 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-16 00:43:44,749 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:44,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-16 00:43:44,750 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:44,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:44,767 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:44,780 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:44,781 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:44,796 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:44,810 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:44,810 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-16 00:43:45,232 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-16 00:43:45,233 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-16 00:43:45,240 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:45,241 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:45,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:45,251 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-16 00:43:45,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:45,286 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-16 00:43:45,344 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-16 00:43:45,344 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-16 00:43:45,345 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-16 00:43:45,345 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-16 00:43:45,345 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-16 00:43:45,345 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-16 00:43:45,345 [ scc.git] DEBUG Auto-merging setup.py
2024-07-16 00:43:45,345 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-16 00:43:45,349 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-16 00:43:45,353 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-16 00:43:45,378 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-16 00:43:45,391 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-16 00:43:45,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:45,551 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-16 00:43:45,579 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-16 00:43:45,603 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#124](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-07-16 00:43:45,621 [ scc.config] DEBUG Found github.token
2024-07-16 00:43:45,622 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-16 00:43:45,622 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:45,755 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:45,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:45,776 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:45,880 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:45,894 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc8471ef10> has no local changes
2024-07-16 00:43:45,895 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:45,915 [ scc.git] DEBUG [detached HEAD f43f503] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:45,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:45,917 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:46,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-16 00:43:47,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-16 00:43:47,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-16 00:43:49,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-16 00:43:49,683 [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-16 00:43:50,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-16 00:43:50,638 [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-16 00:43:50,639 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-16 00:43:50,639 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:50,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-16 00:43:50,640 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:50,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:50,651 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:50,664 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:50,664 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:50,675 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:50,684 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:50,684 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-16 00:43:51,175 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-16 00:43:51,176 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-16 00:43:51,181 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:51,181 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:51,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:51,188 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-16 00:43:51,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:51,208 [ 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-16 00:43:51,254 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-16 00:43:51,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-16 00:43:51,260 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-16 00:43:51,261 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-16 00:43:51,261 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-16 00:43:51,261 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-16 00:43:51,261 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-16 00:43:51,261 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-16 00:43:51,261 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-16 00:43:51,261 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-16 00:43:51,261 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-16 00:43:51,261 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-16 00:43:51,262 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-16 00:43:51,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:51,418 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:51,461 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:51,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:51,469 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:51,527 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:51,535 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc846b6bb0> has no local changes
2024-07-16 00:43:51,536 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:51,547 [ scc.git] DEBUG [detached HEAD b6cded5] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:51,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:51,547 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:51,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-16 00:43:51,846 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:51,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-16 00:43:51,846 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:51,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:51,854 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:51,862 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:51,862 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:51,871 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:51,879 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:51,879 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:51,879 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:51,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:51,887 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:51,931 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:51,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:51,939 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:51,981 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:51,991 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc846ebe50> has no local changes
2024-07-16 00:43:51,991 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:52,002 [ scc.git] DEBUG [detached HEAD 1b670e6] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:52,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:52,002 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:52,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-16 00:43:52,302 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:52,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-16 00:43:52,303 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:52,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:52,309 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:52,316 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:52,316 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:52,323 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:52,330 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:52,330 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:52,330 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:52,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:52,336 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:52,383 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:52,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:52,391 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:52,438 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:52,447 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc846924f0> has no local changes
2024-07-16 00:43:52,447 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:52,463 [ scc.git] DEBUG [detached HEAD 0f2d61f] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:52,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:52,464 [ scc.git] INFO Overriding base-branch from master to main
2024-07-16 00:43:52,464 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:52,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-16 00:43:53,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-16 00:43:53,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-16 00:43:54,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-16 00:43:54,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-16 00:43:55,221 [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-16 00:43:55,736 [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-16 00:43:56,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-16 00:43:56,683 [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-16 00:43:56,684 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-16 00:43:56,685 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:56,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-16 00:43:56,685 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:56,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:56,702 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-16 00:43:56,714 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:56,714 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-16 00:43:56,722 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-16 00:43:56,730 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:56,731 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-16 00:43:57,200 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-16 00:43:57,200 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-16 00:43:57,205 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:57,206 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:57,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:57,215 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-16 00:43:57,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:57,231 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-16 00:43:57,262 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-16 00:43:57,263 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-16 00:43:57,263 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-16 00:43:57,263 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-16 00:43:57,277 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-16 00:43:57,295 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-16 00:43:57,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:43:57,507 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-16 00:43:57,521 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-16 00:43:57,529 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#124](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-16 00:43:57,536 [ scc.config] DEBUG Found github.token
2024-07-16 00:43:57,537 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-16 00:43:57,537 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:57,591 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:57,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:57,600 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:57,643 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:57,652 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc846424f0> has no local changes
2024-07-16 00:43:57,653 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:57,665 [ scc.git] DEBUG [detached HEAD ca5c284] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:57,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:57,666 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:57,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-16 00:43:57,948 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:57,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-16 00:43:57,948 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:57,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:57,957 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:57,964 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:57,964 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:57,969 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:57,975 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:57,975 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:57,976 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:57,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:57,981 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:58,024 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:58,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:58,030 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:58,071 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:58,080 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc84682f40> has no local changes
2024-07-16 00:43:58,080 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:58,099 [ scc.git] DEBUG [detached HEAD 1bf4eba] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:58,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:58,100 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:58,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-16 00:43:58,419 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:43:58,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-16 00:43:58,420 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:58,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:58,435 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:43:58,446 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:43:58,446 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:43:58,458 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:43:58,469 [ scc.git] DEBUG Already up to date.
2024-07-16 00:43:58,469 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:43:58,469 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:58,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:58,478 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:43:58,529 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:43:58,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:43:58,538 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:43:58,585 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:43:58,595 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc8466a700> has no local changes
2024-07-16 00:43:58,595 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:43:58,606 [ scc.git] DEBUG [detached HEAD 7f2313a] merge master -Dorg -Ssuccess-only
2024-07-16 00:43:58,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:43:58,606 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:43:58,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-16 00:43:59,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-16 00:43:59,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-16 00:44:00,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-16 00:44:00,843 [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-16 00:44:01,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-16 00:44:01,827 [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-16 00:44:01,828 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-16 00:44:01,828 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:44:01,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-16 00:44:01,828 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:44:01,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:44:01,838 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-16 00:44:01,849 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:44:01,850 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-16 00:44:01,865 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-16 00:44:01,882 [ scc.git] DEBUG Already up to date.
2024-07-16 00:44:01,883 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-16 00:44:02,314 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-16 00:44:02,315 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-16 00:44:02,323 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:44:02,323 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:44:02,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:44:02,341 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-16 00:44:02,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:44:02,379 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-16 00:44:02,505 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-16 00:44:02,505 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-16 00:44:02,505 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-16 00:44:02,506 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-16 00:44:02,521 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-16 00:44:02,541 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-16 00:44:02,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:02,716 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-16 00:44:02,737 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-16 00:44:02,745 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#124](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-16 00:44:02,751 [ scc.config] DEBUG Found github.token
2024-07-16 00:44:02,751 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-16 00:44:02,751 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:44:02,821 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:44:02,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:44:02,831 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:44:02,932 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:44:02,960 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc845fcdf0> has no local changes
2024-07-16 00:44:02,961 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:44:02,985 [ scc.git] DEBUG [detached HEAD d1a0e59] merge master -Dorg -Ssuccess-only
2024-07-16 00:44:02,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:02,985 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-16 00:44:02,985 [ scc.repo] DEBUG ## PRs found:
2024-07-16 00:44:03,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-16 00:44:03,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-16 00:44:04,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-16 00:44:04,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-16 00:44:05,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-16 00:44:05,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-16 00:44:06,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-16 00:44:06,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-16 00:44:07,254 [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-16 00:44:07,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-16 00:44:08,137 [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-16 00:44:08,138 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-16 00:44:08,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-16 00:44:09,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-16 00:44:09,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-16 00:44:10,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-16 00:44:10,163 [ scc.repo] DEBUG ## Branches found:
2024-07-16 00:44:10,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-16 00:44:10,163 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:44:10,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:44:10,170 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-16 00:44:10,176 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-16 00:44:10,176 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-16 00:44:10,184 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-16 00:44:10,191 [ scc.git] DEBUG Already up to date.
2024-07-16 00:44:10,192 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-16 00:44:10,653 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-16 00:44:10,653 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-16 00:44:10,658 [ scc.git] DEBUG ## Unique users: []
2024-07-16 00:44:10,659 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:44:10,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:44:10,665 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-16 00:44:10,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:44:10,681 [ 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-16 00:44:10,746 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-16 00:44:10,747 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-16 00:44:10,747 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-16 00:44:10,747 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-16 00:44:10,760 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-16 00:44:10,767 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-16 00:44:10,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:10,922 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-16 00:44:10,929 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-16 00:44:10,936 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#124](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-16 00:44:10,942 [ scc.config] DEBUG Found github.token
2024-07-16 00:44:10,942 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-16 00:44:10,943 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-16 00:44:10,984 [ scc.git] DEBUG Get sha1 of %s
2024-07-16 00:44:10,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-16 00:44:10,994 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:44:11,041 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:44:11,050 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc84655ca0> has no local changes
2024-07-16 00:44:11,050 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:44:11,060 [ scc.git] DEBUG [detached HEAD 8efc8f7] merge master -Dorg -Ssuccess-only
2024-07-16 00:44:11,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:11,061 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-16 00:44:11,141 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-16 00:44:11,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:11,383 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-16 00:44:11,388 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-16 00:44:11,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:11,811 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-16 00:44:11,817 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-16 00:44:12,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:12,238 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-16 00:44:12,245 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-16 00:44:12,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:12,646 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-16 00:44:13,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:13,056 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-16 00:44:13,064 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-16 00:44:13,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:13,472 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-16 00:44:13,478 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-16 00:44:13,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:13,955 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-16 00:44:13,960 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-16 00:44:14,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:14,370 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-16 00:44:14,375 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-16 00:44:14,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:14,781 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-16 00:44:14,785 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-16 00:44:15,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:15,212 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-16 00:44:15,220 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-16 00:44:15,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:15,632 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-16 00:44:15,638 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-16 00:44:16,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:16,142 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-16 00:44:16,150 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-16 00:44:16,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:16,547 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-16 00:44:16,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:16,959 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-16 00:44:17,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:17,403 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-16 00:44:17,413 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-16 00:44:17,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:17,814 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-16 00:44:18,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:18,242 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-16 00:44:18,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:18,668 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-16 00:44:18,678 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-16 00:44:19,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:19,096 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-16 00:44:19,103 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-16 00:44:19,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:19,512 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-16 00:44:19,518 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-16 00:44:19,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:19,954 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-16 00:44:19,965 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-16 00:44:20,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-16 00:44:20,382 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-16 00:44:20,383 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-16 00:44:20,515 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcc87062af0> has local changes
2024-07-16 00:44:20,516 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/124/)'
2024-07-16 00:44:20,539 [ scc.git] DEBUG [detached HEAD dc655c6] merge master -Dorg -Ssuccess-only
2024-07-16 00:44:20,540 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-16 00:44:20,540 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-16 00:44:20,540 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,540 [ scc.merge] INFO
2024-07-16 00:44:20,540 [ scc.merge] INFO
2024-07-16 00:44:20,540 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-16 00:44:20,540 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,540 [ scc.merge] INFO
2024-07-16 00:44:20,541 [ scc.merge] INFO
2024-07-16 00:44:20,541 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-16 00:44:20,541 [ scc.merge] INFO Excluded PRs:
2024-07-16 00:44:20,541 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-16 00:44:20,541 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,541 [ scc.merge] INFO
2024-07-16 00:44:20,541 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,541 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-16 00:44:20,541 [ scc.merge] INFO
2024-07-16 00:44:20,541 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-16 00:44:20,541 [ scc.merge] INFO Excluded PRs:
2024-07-16 00:44:20,541 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-16 00:44:20,541 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-16 00:44:20,541 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-16 00:44:20,541 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-16 00:44:20,541 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,541 [ scc.merge] INFO
2024-07-16 00:44:20,541 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,541 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-16 00:44:20,541 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-16 00:44:20,541 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-16 00:44:20,541 [ scc.merge] INFO
2024-07-16 00:44:20,541 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-16 00:44:20,541 [ scc.merge] INFO Excluded PRs:
2024-07-16 00:44:20,542 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-16 00:44:20,542 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,542 [ scc.merge] INFO
2024-07-16 00:44:20,542 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,542 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-16 00:44:20,542 [ scc.merge] INFO
2024-07-16 00:44:20,542 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-16 00:44:20,542 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-16 00:44:20,542 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-16 00:44:20,542 [ scc.merge] INFO
2024-07-16 00:44:20,542 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-16 00:44:20,542 [ scc.merge] INFO Excluded PRs:
2024-07-16 00:44:20,542 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-07-16 00:44:20,542 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-16 00:44:20,542 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,542 [ scc.merge] INFO
2024-07-16 00:44:20,542 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,542 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-16 00:44:20,542 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-16 00:44:20,542 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-07-16 00:44:20,542 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-16 00:44:20,542 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-07-16 00:44:20,542 [ scc.merge] INFO
2024-07-16 00:44:20,542 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-16 00:44:20,542 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,542 [ scc.merge] INFO
2024-07-16 00:44:20,543 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,543 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-16 00:44:20,543 [ scc.merge] INFO
2024-07-16 00:44:20,543 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-16 00:44:20,543 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,543 [ scc.merge] INFO
2024-07-16 00:44:20,543 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,543 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-16 00:44:20,543 [ scc.merge] INFO
2024-07-16 00:44:20,543 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-16 00:44:20,543 [ scc.merge] INFO Excluded PRs:
2024-07-16 00:44:20,543 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-16 00:44:20,543 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-16 00:44:20,543 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,543 [ scc.merge] INFO
2024-07-16 00:44:20,543 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,543 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-16 00:44:20,543 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-16 00:44:20,543 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-16 00:44:20,543 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-16 00:44:20,543 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-16 00:44:20,543 [ scc.merge] INFO
2024-07-16 00:44:20,543 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-16 00:44:20,543 [ scc.merge] INFO Excluded PRs:
2024-07-16 00:44:20,544 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-16 00:44:20,544 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,544 [ scc.merge] INFO
2024-07-16 00:44:20,544 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,544 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-16 00:44:20,544 [ scc.merge] INFO
2024-07-16 00:44:20,544 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-16 00:44:20,544 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,544 [ scc.merge] INFO
2024-07-16 00:44:20,544 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-16 00:44:20,544 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-16 00:44:20,544 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-16 00:44:20,544 [ scc.merge] INFO
2024-07-16 00:44:20,544 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-16 00:44:20,544 [ scc.merge] INFO Excluded PRs:
2024-07-16 00:44:20,544 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-16 00:44:20,544 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-16 00:44:20,544 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-16 00:44:20,544 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,544 [ scc.merge] INFO
2024-07-16 00:44:20,544 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,544 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-16 00:44:20,544 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-16 00:44:20,544 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-16 00:44:20,544 [ scc.merge] INFO
2024-07-16 00:44:20,545 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-16 00:44:20,545 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,545 [ scc.merge] INFO
2024-07-16 00:44:20,545 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,545 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-16 00:44:20,545 [ scc.merge] INFO
2024-07-16 00:44:20,545 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-16 00:44:20,545 [ scc.merge] INFO Excluded PRs:
2024-07-16 00:44:20,545 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-16 00:44:20,545 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,545 [ scc.merge] INFO
2024-07-16 00:44:20,545 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,545 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-16 00:44:20,545 [ scc.merge] INFO
2024-07-16 00:44:20,545 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-16 00:44:20,545 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,545 [ scc.merge] INFO
2024-07-16 00:44:20,545 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-16 00:44:20,545 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-16 00:44:20,545 [ scc.merge] INFO
2024-07-16 00:44:20,545 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-16 00:44:20,545 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,545 [ scc.merge] INFO
2024-07-16 00:44:20,545 [ scc.merge] INFO Merged PRs:
2024-07-16 00:44:20,546 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-16 00:44:20,546 [ scc.merge] INFO
2024-07-16 00:44:20,546 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-16 00:44:20,546 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,546 [ scc.merge] INFO
2024-07-16 00:44:20,546 [ scc.merge] INFO
2024-07-16 00:44:20,546 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-16 00:44:20,546 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,546 [ scc.merge] INFO
2024-07-16 00:44:20,546 [ scc.merge] INFO
2024-07-16 00:44:20,546 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-16 00:44:20,546 [ scc.merge] INFO Excluded PRs:
2024-07-16 00:44:20,546 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-16 00:44:20,546 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,546 [ scc.merge] INFO
2024-07-16 00:44:20,546 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-16 00:44:20,546 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-16 00:44:20,546 [ scc.merge] INFO
2024-07-16 00:44:20,546 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-16 00:44:20,546 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,546 [ scc.merge] INFO
2024-07-16 00:44:20,546 [ scc.merge] INFO
2024-07-16 00:44:20,546 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-16 00:44:20,546 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,546 [ scc.merge] INFO
2024-07-16 00:44:20,546 [ scc.merge] INFO
2024-07-16 00:44:20,547 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-16 00:44:20,547 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,547 [ scc.merge] INFO
2024-07-16 00:44:20,547 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-16 00:44:20,547 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-16 00:44:20,547 [ scc.merge] INFO
2024-07-16 00:44:20,547 [ scc.merge] INFO Repository: ome/scripts
2024-07-16 00:44:20,547 [ scc.merge] INFO Excluded PRs:
2024-07-16 00:44:20,547 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-16 00:44:20,547 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-16 00:44:20,547 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-16 00:44:20,547 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-16 00:44:20,547 [ scc.merge] INFO Already up to date.
2024-07-16 00:44:20,547 [ scc.merge] INFO
2024-07-16 00:44:20,547 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-16 00:44:20,547 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-16 00:44:20,547 [ scc.merge] INFO
2024-07-16 00:44:20,547 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-16 00:44:20,548 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-16 00:44:20,561 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-16 00:44:20,572 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-16 00:44:20,580 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-16 00:44:20,588 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-16 00:44:20,599 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-16 00:44:20,609 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-16 00:44:20,618 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-16 00:44:20,627 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-16 00:44:20,642 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-16 00:44:20,661 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-16 00:44:20,677 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-16 00:44:20,696 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-16 00:44:20,716 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-16 00:44:20,733 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-16 00:44:20,749 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-16 00:44:20,765 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,775 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-16 00:44:20,776 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-16 00:44:20,793 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-16 00:44:20,803 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-16 00:44:20,825 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-16 00:44:20,833 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-16 00:44:20,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-16 00:44:20,842 [ scc.git] DEBUG Calling 'git remote'
2024-07-16 00:44:20,852 [ 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 3d17ac2] 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 3b1d059] 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-16 00:45:08,067 [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-16 00:45:17,177 [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-16 00:45:19,583 [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-16 00:45:24,221 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-16 00:46:11,701 [ 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/a3382f31/images/svgs/logo.svg){kind=logo}
