Console Output
Skipping 94 KB..
Full Logs://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-08-10 00:43:19,602 [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-08-10 00:43:20,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-10 00:43:20,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:43:20,446 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-08-10 00:43:20,447 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:43:20,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-10 00:43:20,447 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:20,447 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:20,452 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:43:20,457 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:43:20,457 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:43:20,463 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:43:20,475 [ scc.git] DEBUG Updating fefe87cf..430fc3f8
2024-08-10 00:43:21,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/580 HTTP/1.1" 200 None
2024-08-10 00:43:21,197 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-10 00:43:21,585 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-10 00:43:21,585 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-10 00:43:21,591 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-10 00:43:22,113 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-10 00:43:22,113 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-10 00:43:22,118 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-10 00:43:23,175 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-10 00:43:23,176 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-10 00:43:23,181 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-10 00:43:23,505 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-10 00:43:23,505 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-10 00:43:23,510 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-10 00:43:23,923 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-10 00:43:23,923 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-10 00:43:23,928 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:43:23,928 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:23,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:23,933 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-10 00:43:23,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:23,946 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-10 00:43:24,031 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-10 00:43:24,031 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-10 00:43:24,032 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:24,038 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-10 00:43:24,038 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-10 00:43:24,038 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-10 00:43:24,038 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-10 00:43:24,038 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-10 00:43:24,038 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-10 00:43:24,038 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-10 00:43:24,038 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-10 00:43:24,038 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-10 00:43:24,038 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-10 00:43:24,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:24,174 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-10 00:43:24,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:24,189 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-10 00:43:24,374 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-10 00:43:24,375 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-10 00:43:24,375 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-10 00:43:24,375 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-10 00:43:24,375 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:24,382 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-10 00:43:24,382 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-10 00:43:24,382 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-10 00:43:24,382 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-10 00:43:24,382 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-10 00:43:24,382 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-10 00:43:24,382 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-10 00:43:24,382 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-10 00:43:24,382 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-10 00:43:24,382 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-10 00:43:24,382 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-10 00:43:24,382 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-10 00:43:24,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:24,553 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-10 00:43:24,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:24,568 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-10 00:43:24,795 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-10 00:43:24,795 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-10 00:43:24,795 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-10 00:43:24,795 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-10 00:43:24,795 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-10 00:43:24,795 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-10 00:43:24,819 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:24,830 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-10 00:43:24,830 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-10 00:43:24,830 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-10 00:43:24,830 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-10 00:43:24,830 [ scc.git] DEBUG src/index.html | 1 +
2024-08-10 00:43:24,830 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-10 00:43:24,830 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-10 00:43:24,830 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-10 00:43:24,830 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-10 00:43:24,832 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-10 00:43:24,833 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-10 00:43:24,833 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-10 00:43:24,833 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-10 00:43:24,833 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-10 00:43:24,833 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-10 00:43:24,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:24,961 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-10 00:43:24,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:24,976 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-10 00:43:25,017 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:25,020 [ scc.git] DEBUG setup.py | 2 +-
2024-08-10 00:43:25,020 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-10 00:43:25,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:25,347 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-08-10 00:43:25,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:25,362 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-08-10 00:43:25,443 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-10 00:43:25,444 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-10 00:43:25,444 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:25,450 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-10 00:43:25,450 [ scc.git] DEBUG src/index.html | 3 +++
2024-08-10 00:43:25,450 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-08-10 00:43:25,450 [ scc.git] DEBUG 3 files changed, 14 insertions(+), 2 deletions(-)
2024-08-10 00:43:25,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:25,723 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:43:25,767 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:25,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:25,773 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:43:25,818 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:43:25,827 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff140734f0> has no local changes
2024-08-10 00:43:25,827 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating fefe87cf..430fc3f8
Previously merged:
- PR 580 Rdornier 'Weird translation'
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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:43:25,841 [ scc.git] DEBUG [detached HEAD 722e94ec] merge master -Dorg -Ssuccess-only
2024-08-10 00:43:25,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:43:25,841 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:43:26,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-10 00:43:26,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-10 00:43:27,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-10 00:43:27,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-10 00:43:28,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:43:28,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-10 00:43:29,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:43:29,093 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-10 00:43:29,093 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:43:29,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-10 00:43:29,093 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:29,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:29,099 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:43:29,104 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:43:29,104 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:43:29,110 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:43:29,115 [ scc.git] DEBUG Already up to date.
2024-08-10 00:43:29,115 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-10 00:43:29,504 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-10 00:43:29,504 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-10 00:43:29,508 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:43:29,509 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:29,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:29,514 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-10 00:43:29,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:29,525 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-10 00:43:29,611 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-10 00:43:29,611 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:29,614 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-10 00:43:29,614 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-10 00:43:29,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:29,765 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:43:29,805 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:29,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:29,810 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:43:29,858 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:43:29,864 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff158d81f0> has no local changes
2024-08-10 00:43:29,864 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:43:29,872 [ scc.git] DEBUG [detached HEAD bf7ddfb] merge master -Dorg -Ssuccess-only
2024-08-10 00:43:29,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:43:29,873 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:43:30,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-10 00:43:30,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-10 00:43:30,671 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-10 00:43:31,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-10 00:43:31,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:43:32,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-10 00:43:32,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-10 00:43:33,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:43:33,234 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-10 00:43:33,234 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:43:33,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-10 00:43:33,234 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:33,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:33,242 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:43:33,249 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:43:33,249 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:43:33,257 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:43:33,265 [ scc.git] DEBUG Already up to date.
2024-08-10 00:43:33,266 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-10 00:43:33,581 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-10 00:43:33,582 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-10 00:43:33,586 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:43:33,586 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:33,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:33,593 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-10 00:43:33,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:33,603 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-10 00:43:33,615 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:33,619 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-10 00:43:33,619 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-10 00:43:33,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:33,756 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:43:33,807 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:33,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:33,812 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:43:33,854 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:43:33,862 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff1592fb50> has no local changes
2024-08-10 00:43:33,863 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:43:33,875 [ scc.git] DEBUG [detached HEAD e9aef29] merge master -Dorg -Ssuccess-only
2024-08-10 00:43:33,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:43:33,876 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:43:34,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-10 00:43:34,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-10 00:43:35,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-10 00:43:35,348 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-10 00:43:35,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-10 00:43:36,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:43:37,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-10 00:43:37,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-10 00:43:37,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:43:37,817 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-10 00:43:38,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-10 00:43:38,273 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-10 00:43:38,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-10 00:43:39,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:43:39,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-10 00:43:40,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-10 00:43:40,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:43:40,654 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-10 00:43:41,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-10 00:43:41,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-10 00:43:41,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-10 00:43:42,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:43:42,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-10 00:43:43,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-10 00:43:43,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:43:43,912 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-10 00:43:44,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-10 00:43:44,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-10 00:43:45,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-10 00:43:45,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:43:46,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-10 00:43:46,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-10 00:43:47,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:43:47,146 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-10 00:43:47,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-10 00:43:48,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-10 00:43:48,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-10 00:43:48,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:43:49,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-10 00:43:49,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:43:49,767 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-10 00:43:49,768 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:43:49,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-10 00:43:49,768 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:49,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:49,773 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:43:49,778 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:43:49,779 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:43:49,848 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:43:49,854 [ scc.git] DEBUG Already up to date.
2024-08-10 00:43:49,855 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-10 00:43:50,318 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-10 00:43:50,318 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-10 00:43:50,324 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-10 00:43:51,454 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-10 00:43:51,454 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-10 00:43:51,460 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-10 00:43:51,886 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-10 00:43:51,887 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-10 00:43:51,893 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-10 00:43:52,212 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-10 00:43:52,212 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-10 00:43:52,217 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-10 00:43:52,503 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-10 00:43:52,504 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-10 00:43:52,509 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:43:52,510 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:52,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:52,516 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-10 00:43:52,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:52,531 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-10 00:43:52,609 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-10 00:43:52,610 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:52,613 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-10 00:43:52,613 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-10 00:43:52,613 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-10 00:43:52,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:52,768 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-10 00:43:52,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:52,783 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-10 00:43:52,967 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-10 00:43:52,968 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-10 00:43:52,968 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-10 00:43:52,968 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-10 00:43:52,969 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:52,975 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-10 00:43:52,975 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-10 00:43:52,975 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-10 00:43:52,975 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-10 00:43:52,975 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-10 00:43:52,975 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-10 00:43:52,975 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-10 00:43:52,975 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-10 00:43:53,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:53,154 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-10 00:43:53,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:53,168 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-10 00:43:53,249 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-10 00:43:53,250 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:53,253 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-10 00:43:53,253 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-10 00:43:53,253 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-10 00:43:53,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:53,552 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-10 00:43:53,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:53,577 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-10 00:43:53,624 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:53,634 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-10 00:43:53,634 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-10 00:43:53,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:53,933 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-10 00:43:53,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:53,957 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-10 00:43:54,022 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-10 00:43:54,023 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:54,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:54,339 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:43:54,384 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:54,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:54,391 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:43:54,433 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:43:54,442 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff158bbbe0> has no local changes
2024-08-10 00:43:54,442 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Generated by OMERO-plugins-push#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:43:54,453 [ scc.git] DEBUG [detached HEAD b1ea3e1] merge master -Dorg -Ssuccess-only
2024-08-10 00:43:54,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:43:54,454 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:43:54,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-10 00:43:55,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-10 00:43:55,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-10 00:43:56,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-10 00:43:56,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:43:57,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-10 00:43:57,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-10 00:43:58,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:43:58,108 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-10 00:43:58,109 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:43:58,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-10 00:43:58,109 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:58,109 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:58,114 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:43:58,120 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:43:58,120 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:43:58,126 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:43:58,131 [ scc.git] DEBUG Already up to date.
2024-08-10 00:43:58,132 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-10 00:43:58,449 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-10 00:43:58,449 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-10 00:43:58,453 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:43:58,453 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:58,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:58,459 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-10 00:43:58,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:58,470 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-10 00:43:58,480 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:43:58,483 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-10 00:43:58,483 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-10 00:43:58,483 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-10 00:43:58,483 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-10 00:43:58,483 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-10 00:43:58,483 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-10 00:43:58,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:43:58,628 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:43:58,667 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:43:58,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:43:58,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:43:58,713 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:43:58,720 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff158c0bb0> has no local changes
2024-08-10 00:43:58,720 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:43:58,729 [ scc.git] DEBUG [detached HEAD b59c964] merge master -Dorg -Ssuccess-only
2024-08-10 00:43:58,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:43:58,730 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:43:59,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-10 00:43:59,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-10 00:44:00,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-10 00:44:00,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-10 00:44:01,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:01,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-10 00:44:02,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:02,071 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-10 00:44:02,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-10 00:44:02,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-10 00:44:03,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-10 00:44:03,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:04,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-10 00:44:04,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:04,713 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-10 00:44:04,713 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:04,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-10 00:44:04,714 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:04,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:04,720 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:44:04,726 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:04,726 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:44:04,732 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:44:04,739 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:04,739 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-10 00:44:05,294 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-10 00:44:05,294 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-10 00:44:05,300 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-10 00:44:05,839 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-10 00:44:05,839 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-10 00:44:05,845 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:05,845 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:05,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:05,854 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-10 00:44:05,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:05,879 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-10 00:44:05,962 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-10 00:44:05,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-10 00:44:05,963 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-10 00:44:05,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-10 00:44:05,963 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-10 00:44:05,964 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-10 00:44:05,975 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-10 00:44:05,984 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-10 00:44:06,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:06,115 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-10 00:44:06,127 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-10 00:44:06,138 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#148](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-08-10 00:44:06,149 [ scc.config] DEBUG Found github.token
2024-08-10 00:44:06,150 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-10 00:44:06,150 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-10 00:44:06,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:06,179 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-10 00:44:06,229 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-10 00:44:06,230 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-10 00:44:06,230 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-10 00:44:06,230 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-10 00:44:06,231 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-10 00:44:06,240 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-10 00:44:06,251 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-10 00:44:06,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:06,507 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-10 00:44:06,531 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-10 00:44:06,546 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#148](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-08-10 00:44:06,558 [ scc.config] DEBUG Found github.token
2024-08-10 00:44:06,559 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-10 00:44:06,559 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:06,637 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:06,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:06,656 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:06,769 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:06,785 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff1409ef40> has no local changes
2024-08-10 00:44:06,786 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:06,801 [ scc.git] DEBUG [detached HEAD 5046a79] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:06,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:06,802 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:07,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-10 00:44:07,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-10 00:44:07,618 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-10 00:44:08,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-10 00:44:08,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:09,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-10 00:44:09,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-10 00:44:09,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:09,969 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-10 00:44:10,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-10 00:44:10,415 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-10 00:44:10,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-10 00:44:11,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:11,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-10 00:44:12,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-10 00:44:12,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:12,950 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-10 00:44:13,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-10 00:44:13,391 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-10 00:44:13,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-10 00:44:14,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:14,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-10 00:44:15,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-10 00:44:15,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:15,911 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-10 00:44:16,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-10 00:44:16,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-10 00:44:17,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-10 00:44:17,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-10 00:44:18,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-10 00:44:18,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-10 00:44:18,760 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:18,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-10 00:44:18,761 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:18,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:18,772 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:44:18,784 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:18,784 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:44:18,795 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:44:18,805 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:18,806 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-10 00:44:19,172 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-10 00:44:19,172 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-10 00:44:19,183 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-10 00:44:19,541 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-10 00:44:19,541 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-10 00:44:19,546 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-10 00:44:19,927 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-10 00:44:19,928 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-10 00:44:19,933 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:19,934 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:19,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:19,941 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-10 00:44:19,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:19,959 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-10 00:44:19,972 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:44:19,975 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-10 00:44:19,975 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-10 00:44:20,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:20,112 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-10 00:44:20,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:20,127 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-10 00:44:20,166 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-10 00:44:20,169 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:44:20,176 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-10 00:44:20,176 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-10 00:44:20,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:20,498 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-10 00:44:20,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:20,544 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-10 00:44:20,572 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-10 00:44:20,573 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:44:20,576 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-10 00:44:20,577 [ scc.git] DEBUG package.json | 2 +-
2024-08-10 00:44:20,577 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-10 00:44:20,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:20,884 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:20,927 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:20,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:20,933 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:20,975 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:20,983 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff14064580> has no local changes
2024-08-10 00:44:20,983 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:20,993 [ scc.git] DEBUG [detached HEAD a16cb4f] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:20,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:20,994 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:21,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-10 00:44:21,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-10 00:44:22,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-10 00:44:22,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:23,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-10 00:44:23,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:23,711 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-10 00:44:23,711 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:23,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-10 00:44:23,711 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:23,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:23,719 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:44:23,726 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:23,726 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:44:23,733 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:44:23,740 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:23,740 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-10 00:44:24,059 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-10 00:44:24,059 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-10 00:44:24,066 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:24,066 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:24,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:24,072 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-10 00:44:24,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:24,093 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-10 00:44:24,103 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:44:24,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:24,238 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:24,278 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:24,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:24,283 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:24,330 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:24,337 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff1407de80> has no local changes
2024-08-10 00:44:24,337 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:24,346 [ scc.git] DEBUG [detached HEAD 666db93] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:24,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:24,346 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:24,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-10 00:44:25,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-10 00:44:25,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-10 00:44:26,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-10 00:44:26,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-10 00:44:27,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:27,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-10 00:44:27,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:27,934 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-10 00:44:27,934 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:27,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-10 00:44:27,934 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:27,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:27,939 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:44:27,944 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:27,944 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:44:27,950 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:44:27,956 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:27,956 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-10 00:44:28,355 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-10 00:44:28,355 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-10 00:44:28,359 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:28,359 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:28,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:28,365 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-10 00:44:28,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:28,376 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-10 00:44:28,385 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-10 00:44:28,386 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:44:28,389 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-10 00:44:28,389 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-10 00:44:28,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:28,526 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:28,568 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:28,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:28,575 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:28,618 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:28,625 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efefc7beb50> has no local changes
2024-08-10 00:44:28,626 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:28,636 [ scc.git] DEBUG [detached HEAD aa3e26b] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:28,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:28,636 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:29,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-10 00:44:29,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-10 00:44:29,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-10 00:44:30,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-10 00:44:30,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:31,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-10 00:44:31,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:31,773 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-10 00:44:31,773 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:31,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-10 00:44:31,774 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:31,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:31,779 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:44:31,793 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:31,793 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:44:31,802 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:44:31,809 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:31,809 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-10 00:44:32,141 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-10 00:44:32,142 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-10 00:44:32,146 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:32,146 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:32,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:32,152 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-10 00:44:32,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:32,170 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-10 00:44:32,209 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-10 00:44:32,209 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-10 00:44:32,209 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-10 00:44:32,209 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-10 00:44:32,209 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-10 00:44:32,209 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-10 00:44:32,209 [ scc.git] DEBUG Auto-merging setup.py
2024-08-10 00:44:32,209 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-10 00:44:32,209 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-10 00:44:32,210 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-10 00:44:32,217 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-10 00:44:32,224 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-10 00:44:32,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:32,363 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-10 00:44:32,370 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-10 00:44:32,376 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#148](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2024-08-10 00:44:32,381 [ scc.config] DEBUG Found github.token
2024-08-10 00:44:32,381 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-10 00:44:32,381 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:32,426 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:32,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:32,433 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:32,475 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:32,482 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff14064730> has no local changes
2024-08-10 00:44:32,482 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:32,491 [ scc.git] DEBUG [detached HEAD a44a15a] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:32,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:32,492 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:32,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-10 00:44:33,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-10 00:44:33,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-10 00:44:34,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-10 00:44:34,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:35,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-10 00:44:35,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:35,697 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-10 00:44:35,697 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:35,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-10 00:44:35,697 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:35,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:35,705 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:44:35,712 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:35,712 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:44:35,720 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:44:35,727 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:35,728 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-10 00:44:36,083 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-10 00:44:36,083 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-10 00:44:36,088 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:36,088 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:36,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:36,094 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-10 00:44:36,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:36,109 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-08-10 00:44:36,155 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-10 00:44:36,158 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-10 00:44:36,158 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-10 00:44:36,158 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-10 00:44:36,158 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-10 00:44:36,158 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-10 00:44:36,160 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-10 00:44:36,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-10 00:44:36,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-10 00:44:36,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-10 00:44:36,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-10 00:44:36,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-10 00:44:36,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-10 00:44:36,161 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-10 00:44:36,161 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-10 00:44:36,161 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-10 00:44:36,161 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-10 00:44:36,161 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-10 00:44:36,161 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-10 00:44:36,161 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-10 00:44:36,161 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-10 00:44:36,161 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-10 00:44:36,161 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-10 00:44:36,161 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-10 00:44:36,161 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-10 00:44:36,161 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-10 00:44:36,161 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-10 00:44:36,161 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-10 00:44:36,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-10 00:44:36,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-10 00:44:36,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-10 00:44:36,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-10 00:44:36,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-10 00:44:36,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-10 00:44:36,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-10 00:44:36,162 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-10 00:44:36,162 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-10 00:44:36,162 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-10 00:44:36,162 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-10 00:44:36,162 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-10 00:44:36,162 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-10 00:44:36,162 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-10 00:44:36,162 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-10 00:44:36,162 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-10 00:44:36,162 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-10 00:44:36,162 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-10 00:44:36,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:36,297 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:36,342 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:36,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:36,349 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:36,395 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:36,404 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efefc7f7640> has no local changes
2024-08-10 00:44:36,404 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:36,416 [ scc.git] DEBUG [detached HEAD c14c3b4] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:36,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:36,417 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:36,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-10 00:44:36,713 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:36,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-10 00:44:36,713 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:36,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:36,719 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:44:36,725 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:36,725 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:44:36,731 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:44:36,737 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:36,737 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:36,738 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:36,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:36,744 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:36,797 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:36,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:36,803 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:36,843 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:36,849 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efefc791e80> has no local changes
2024-08-10 00:44:36,850 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:36,859 [ scc.git] DEBUG [detached HEAD 0061e80] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:36,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:36,859 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:37,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-10 00:44:37,128 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:37,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-10 00:44:37,128 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:37,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:37,134 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:44:37,140 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:37,141 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:44:37,147 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:44:37,154 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:37,155 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:37,155 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:37,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:37,161 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:37,201 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:37,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:37,207 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:37,249 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:37,255 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efefc7c2b80> has no local changes
2024-08-10 00:44:37,256 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:37,264 [ scc.git] DEBUG [detached HEAD f2427da] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:37,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:37,265 [ scc.git] INFO Overriding base-branch from master to main
2024-08-10 00:44:37,265 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:37,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-10 00:44:38,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-10 00:44:38,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-10 00:44:38,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-10 00:44:39,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-10 00:44:39,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:40,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-10 00:44:40,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:40,780 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-10 00:44:40,781 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:40,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-10 00:44:40,781 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:40,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:40,788 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-10 00:44:40,794 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:40,794 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-10 00:44:40,801 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-10 00:44:40,808 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:40,809 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-10 00:44:41,186 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-10 00:44:41,187 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-10 00:44:41,192 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:41,192 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:41,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:41,199 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-10 00:44:41,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:41,211 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-10 00:44:41,232 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-10 00:44:41,232 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-10 00:44:41,232 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-10 00:44:41,233 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-10 00:44:41,240 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-10 00:44:41,248 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-10 00:44:41,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:41,398 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-10 00:44:41,416 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-10 00:44:41,424 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#148](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-10 00:44:41,430 [ scc.config] DEBUG Found github.token
2024-08-10 00:44:41,430 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-10 00:44:41,431 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:41,471 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:41,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:41,478 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:41,520 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:41,529 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efefc7e8f40> has no local changes
2024-08-10 00:44:41,529 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:41,540 [ scc.git] DEBUG [detached HEAD b1bde8d] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:41,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:41,541 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:41,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-10 00:44:41,800 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:41,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-10 00:44:41,800 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:41,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:41,806 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:44:41,812 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:41,812 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:44:41,818 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:44:41,825 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:41,825 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:41,825 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:41,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:41,832 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:41,880 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:41,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:41,885 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:41,923 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:41,930 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efefc7807c0> has no local changes
2024-08-10 00:44:41,930 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:41,939 [ scc.git] DEBUG [detached HEAD b1d93db] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:41,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:41,940 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:42,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-10 00:44:42,213 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:42,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-10 00:44:42,214 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:42,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:42,220 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:44:42,224 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:42,225 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:44:42,230 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:44:42,236 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:42,236 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:42,236 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:42,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:42,241 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:42,280 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:42,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:42,285 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:42,327 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:42,334 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efefc739490> has no local changes
2024-08-10 00:44:42,334 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:42,344 [ scc.git] DEBUG [detached HEAD 9fd5a5c] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:42,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:42,345 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:42,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-10 00:44:43,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-10 00:44:43,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-10 00:44:44,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-10 00:44:44,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:45,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-10 00:44:45,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:45,575 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-10 00:44:45,575 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:45,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-10 00:44:45,576 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:45,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:45,585 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-10 00:44:45,592 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:45,592 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-10 00:44:45,600 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-10 00:44:45,607 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:45,607 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-10 00:44:45,968 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-10 00:44:45,968 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-10 00:44:45,975 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:45,976 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:45,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:45,987 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-10 00:44:45,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:46,005 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-10 00:44:46,040 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-10 00:44:46,040 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-10 00:44:46,040 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-10 00:44:46,041 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-10 00:44:46,052 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-10 00:44:46,062 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-10 00:44:46,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:46,215 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-10 00:44:46,225 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-10 00:44:46,237 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#148](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-10 00:44:46,246 [ scc.config] DEBUG Found github.token
2024-08-10 00:44:46,246 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-10 00:44:46,247 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:46,302 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:46,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:46,313 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:46,381 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:46,394 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efefc75c8b0> has no local changes
2024-08-10 00:44:46,394 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:46,410 [ scc.git] DEBUG [detached HEAD 48dda1c] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:46,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:46,412 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-10 00:44:46,412 [ scc.repo] DEBUG ## PRs found:
2024-08-10 00:44:46,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-10 00:44:47,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-10 00:44:47,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-10 00:44:48,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-10 00:44:48,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-10 00:44:49,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-10 00:44:49,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-10 00:44:50,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-10 00:44:50,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-10 00:44:50,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-10 00:44:51,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-10 00:44:51,304 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-10 00:44:51,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-10 00:44:52,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-10 00:44:52,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-10 00:44:53,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-10 00:44:53,184 [ scc.repo] DEBUG ## Branches found:
2024-08-10 00:44:53,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-10 00:44:53,184 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:53,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:53,193 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-10 00:44:53,201 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-10 00:44:53,202 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-10 00:44:53,211 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-10 00:44:53,220 [ scc.git] DEBUG Already up to date.
2024-08-10 00:44:53,221 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-10 00:44:53,656 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-10 00:44:53,656 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-10 00:44:53,663 [ scc.git] DEBUG ## Unique users: []
2024-08-10 00:44:53,663 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:53,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:53,674 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-10 00:44:53,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:53,705 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-10 00:44:53,747 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-10 00:44:53,747 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-10 00:44:53,747 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-10 00:44:53,748 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-10 00:44:53,759 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-10 00:44:53,774 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-10 00:44:53,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:53,944 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-10 00:44:53,954 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-10 00:44:53,962 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#148](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-10 00:44:53,969 [ scc.config] DEBUG Found github.token
2024-08-10 00:44:53,969 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-10 00:44:53,970 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-10 00:44:54,019 [ scc.git] DEBUG Get sha1 of %s
2024-08-10 00:44:54,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-10 00:44:54,026 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:54,078 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:44:54,088 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efefc75c5b0> has no local changes
2024-08-10 00:44:54,089 [ 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#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:44:54,101 [ scc.git] DEBUG [detached HEAD 4b0af8a] merge master -Dorg -Ssuccess-only
2024-08-10 00:44:54,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:44:54,101 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-10 00:44:54,184 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-10 00:44:54,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:54,349 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-10 00:44:54,355 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-10 00:44:54,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:54,727 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-10 00:44:54,735 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-10 00:44:55,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:55,110 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-10 00:44:55,115 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-10 00:44:55,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:55,501 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-10 00:44:55,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:55,903 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-10 00:44:55,910 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-10 00:44:56,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:56,283 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-10 00:44:56,291 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-10 00:44:56,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:56,680 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-10 00:44:56,688 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-10 00:44:57,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:57,084 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-10 00:44:57,097 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-10 00:44:57,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:57,459 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-10 00:44:57,464 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-10 00:44:57,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:57,863 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-10 00:44:57,870 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-10 00:44:58,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:58,284 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-10 00:44:58,289 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-10 00:44:58,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:58,677 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-10 00:44:58,682 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-10 00:44:59,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:59,066 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-10 00:44:59,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:59,453 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-10 00:44:59,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:44:59,844 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-10 00:44:59,850 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-10 00:45:00,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:45:00,241 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-10 00:45:00,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:45:00,621 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-10 00:45:00,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:45:01,018 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-10 00:45:01,026 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-10 00:45:01,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:45:01,408 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-10 00:45:01,417 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-10 00:45:01,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:45:01,800 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-10 00:45:01,811 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-10 00:45:02,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:45:02,199 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-10 00:45:02,216 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-10 00:45:02,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-10 00:45:02,588 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-10 00:45:02,589 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-10 00:45:02,750 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff169ca790> has local changes
2024-08-10 00:45:02,750 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating fefe87cf..430fc3f8
Previously merged:
- PR 580 Rdornier 'Weird translation'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#148 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/148/)'
2024-08-10 00:45:02,788 [ scc.git] DEBUG [detached HEAD 8967796] merge master -Dorg -Ssuccess-only
2024-08-10 00:45:02,788 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-10 00:45:02,788 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-10 00:45:02,789 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,789 [ scc.merge] INFO
2024-08-10 00:45:02,789 [ scc.merge] INFO
2024-08-10 00:45:02,789 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-10 00:45:02,789 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,789 [ scc.merge] INFO
2024-08-10 00:45:02,789 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,789 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-10 00:45:02,789 [ scc.merge] INFO
2024-08-10 00:45:02,789 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-10 00:45:02,789 [ scc.merge] INFO Excluded PRs:
2024-08-10 00:45:02,789 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-10 00:45:02,789 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,789 [ scc.merge] INFO
2024-08-10 00:45:02,789 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,789 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-10 00:45:02,789 [ scc.merge] INFO
2024-08-10 00:45:02,789 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-10 00:45:02,789 [ scc.merge] INFO Excluded PRs:
2024-08-10 00:45:02,790 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-10 00:45:02,790 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-10 00:45:02,790 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-10 00:45:02,790 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-10 00:45:02,790 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,790 [ scc.merge] INFO
2024-08-10 00:45:02,790 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,790 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-10 00:45:02,790 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-10 00:45:02,790 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-10 00:45:02,790 [ scc.merge] INFO
2024-08-10 00:45:02,790 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-10 00:45:02,790 [ scc.merge] INFO Excluded PRs:
2024-08-10 00:45:02,790 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-10 00:45:02,790 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,790 [ scc.merge] INFO
2024-08-10 00:45:02,790 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,790 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-10 00:45:02,790 [ scc.merge] INFO
2024-08-10 00:45:02,790 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-10 00:45:02,790 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-10 00:45:02,790 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-10 00:45:02,791 [ scc.merge] INFO
2024-08-10 00:45:02,791 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-10 00:45:02,791 [ scc.merge] INFO Excluded PRs:
2024-08-10 00:45:02,791 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-10 00:45:02,791 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-10 00:45:02,791 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-10 00:45:02,791 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-10 00:45:02,791 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-10 00:45:02,791 [ scc.merge] INFO Updating fefe87cf..430fc3f8
2024-08-10 00:45:02,791 [ scc.merge] INFO Previously merged:
2024-08-10 00:45:02,791 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation'
2024-08-10 00:45:02,791 [ scc.merge] INFO
2024-08-10 00:45:02,791 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,791 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-10 00:45:02,791 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-10 00:45:02,791 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-10 00:45:02,791 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-10 00:45:02,791 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-10 00:45:02,791 [ scc.merge] INFO
2024-08-10 00:45:02,791 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-10 00:45:02,791 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,791 [ scc.merge] INFO
2024-08-10 00:45:02,792 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,792 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-10 00:45:02,792 [ scc.merge] INFO
2024-08-10 00:45:02,792 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-10 00:45:02,792 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,792 [ scc.merge] INFO
2024-08-10 00:45:02,792 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,792 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-10 00:45:02,792 [ scc.merge] INFO
2024-08-10 00:45:02,792 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-10 00:45:02,792 [ scc.merge] INFO Excluded PRs:
2024-08-10 00:45:02,792 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-10 00:45:02,792 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-10 00:45:02,792 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-10 00:45:02,792 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,792 [ scc.merge] INFO
2024-08-10 00:45:02,792 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,792 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-10 00:45:02,792 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-10 00:45:02,792 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-10 00:45:02,792 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-10 00:45:02,792 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-10 00:45:02,792 [ scc.merge] INFO
2024-08-10 00:45:02,793 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-10 00:45:02,793 [ scc.merge] INFO Excluded PRs:
2024-08-10 00:45:02,793 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-10 00:45:02,793 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,793 [ scc.merge] INFO
2024-08-10 00:45:02,793 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,793 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-10 00:45:02,793 [ scc.merge] INFO
2024-08-10 00:45:02,793 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-10 00:45:02,793 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,793 [ scc.merge] INFO
2024-08-10 00:45:02,793 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-10 00:45:02,793 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-10 00:45:02,793 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-10 00:45:02,793 [ scc.merge] INFO
2024-08-10 00:45:02,793 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-10 00:45:02,793 [ scc.merge] INFO Excluded PRs:
2024-08-10 00:45:02,793 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-10 00:45:02,793 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-10 00:45:02,793 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-10 00:45:02,793 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,793 [ scc.merge] INFO
2024-08-10 00:45:02,793 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,794 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-10 00:45:02,794 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-10 00:45:02,794 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-10 00:45:02,794 [ scc.merge] INFO
2024-08-10 00:45:02,794 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-10 00:45:02,794 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,794 [ scc.merge] INFO
2024-08-10 00:45:02,794 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,794 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-10 00:45:02,794 [ scc.merge] INFO
2024-08-10 00:45:02,794 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-10 00:45:02,794 [ scc.merge] INFO Excluded PRs:
2024-08-10 00:45:02,794 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-10 00:45:02,794 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,794 [ scc.merge] INFO
2024-08-10 00:45:02,794 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,794 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-10 00:45:02,794 [ scc.merge] INFO
2024-08-10 00:45:02,794 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-10 00:45:02,794 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,794 [ scc.merge] INFO
2024-08-10 00:45:02,795 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-10 00:45:02,795 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-10 00:45:02,795 [ scc.merge] INFO
2024-08-10 00:45:02,795 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-10 00:45:02,795 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,795 [ scc.merge] INFO
2024-08-10 00:45:02,795 [ scc.merge] INFO Merged PRs:
2024-08-10 00:45:02,795 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-10 00:45:02,795 [ scc.merge] INFO
2024-08-10 00:45:02,795 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-10 00:45:02,795 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,795 [ scc.merge] INFO
2024-08-10 00:45:02,795 [ scc.merge] INFO
2024-08-10 00:45:02,795 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-10 00:45:02,795 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,795 [ scc.merge] INFO
2024-08-10 00:45:02,795 [ scc.merge] INFO
2024-08-10 00:45:02,795 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-10 00:45:02,795 [ scc.merge] INFO Excluded PRs:
2024-08-10 00:45:02,795 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-10 00:45:02,795 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,795 [ scc.merge] INFO
2024-08-10 00:45:02,796 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-10 00:45:02,796 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-10 00:45:02,796 [ scc.merge] INFO
2024-08-10 00:45:02,796 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-10 00:45:02,796 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,796 [ scc.merge] INFO
2024-08-10 00:45:02,796 [ scc.merge] INFO
2024-08-10 00:45:02,796 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-10 00:45:02,796 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,796 [ scc.merge] INFO
2024-08-10 00:45:02,796 [ scc.merge] INFO
2024-08-10 00:45:02,796 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-10 00:45:02,796 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,796 [ scc.merge] INFO
2024-08-10 00:45:02,796 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-10 00:45:02,796 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-10 00:45:02,796 [ scc.merge] INFO
2024-08-10 00:45:02,796 [ scc.merge] INFO Repository: ome/scripts
2024-08-10 00:45:02,796 [ scc.merge] INFO Excluded PRs:
2024-08-10 00:45:02,796 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-10 00:45:02,796 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-10 00:45:02,796 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-10 00:45:02,796 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-10 00:45:02,797 [ scc.merge] INFO Already up to date.
2024-08-10 00:45:02,797 [ scc.merge] INFO
2024-08-10 00:45:02,797 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-10 00:45:02,797 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-10 00:45:02,797 [ scc.merge] INFO
2024-08-10 00:45:02,797 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-10 00:45:02,797 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-10 00:45:02,807 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-10 00:45:02,817 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-10 00:45:02,828 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-10 00:45:02,837 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-10 00:45:02,847 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-10 00:45:02,855 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-10 00:45:02,863 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-10 00:45:02,870 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-10 00:45:02,880 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-10 00:45:02,888 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-10 00:45:02,896 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-10 00:45:02,903 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-10 00:45:02,910 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-10 00:45:02,916 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,923 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,923 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-10 00:45:02,923 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-10 00:45:02,930 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-10 00:45:02,936 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-10 00:45:02,943 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-10 00:45:02,950 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-10 00:45:02,957 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-10 00:45:02,964 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-10 00:45:02,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-10 00:45:02,971 [ scc.git] DEBUG Calling 'git remote'
2024-08-10 00:45:02,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.2 to 5.9.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD e29ffe8] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from fefe87cf
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD 58fcff1] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-10 00:45:49,789 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-08-10 00:45:58,464 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-08-10 00:46:00,721 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-10 00:46:05,167 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-10 00:46:51,257 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci