Skipping 106 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-06-06 08:18:59,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/acd328badf4723b6ad334eeff22205a726b61043/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-06 08:18:59,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/acd328badf4723b6ad334eeff22205a726b61043/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 08:19:00,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/acd328badf4723b6ad334eeff22205a726b61043 HTTP/1.1" 200 None
2024-06-06 08:19:00,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/acd328badf4723b6ad334eeff22205a726b61043?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:00,706 [ scc.repo] DEBUG - PR 563 will-moore 'Use path instead of re_path for all URLs'
2024-06-06 08:19:01,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-06-06 08:19:01,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-06-06 08:19:02,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573 HTTP/1.1" 200 None
2024-06-06 08:19:02,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-06 08:19:03,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 08:19:03,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573 HTTP/1.1" 200 None
2024-06-06 08:19:04,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/5750e2b744e687c5064df1b3ee304bfe7b5e6573?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:04,108 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-06 08:19:04,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-06-06 08:19:05,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-06-06 08:19:05,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-06-06 08:19:06,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-06 08:19:06,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 08:19:07,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-06-06 08:19:07,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/b7cad07be139b0ba61a8d0fc2bf3033f90909569?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:07,509 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-06-06 08:19:07,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-06 08:19:08,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-06 08:19:08,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-06 08:19:09,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-06 08:19:09,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 08:19:10,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-06 08:19:10,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:10,839 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-06 08:19:11,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-06 08:19:11,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-06 08:19:12,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-06 08:19:12,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 08:19:13,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-06 08:19:13,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:13,694 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-06 08:19:14,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-06-06 08:19:14,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-06-06 08:19:14,620 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:19:14,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-06 08:19:14,620 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:14,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:14,628 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:19:14,634 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:19:14,634 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:19:14,640 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:19:14,647 [ scc.git] DEBUG Already up to date.
2024-06-06 08:19:14,648 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-06 08:19:15,760 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-06 08:19:15,760 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-06 08:19:15,765 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-06 08:19:16,385 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-06 08:19:16,385 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-06 08:19:16,390 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-06-06 08:19:17,311 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-06 08:19:17,311 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-06-06 08:19:17,316 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-06-06 08:19:17,952 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-06 08:19:17,953 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-06-06 08:19:17,956 [ scc.git] DEBUG Calling 'git fetch origin pull/563/head'
2024-06-06 08:19:18,525 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-06 08:19:18,525 [ scc.git] DEBUG * branch refs/pull/563/head -> FETCH_HEAD
2024-06-06 08:19:18,528 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:19:18,528 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:18,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:18,534 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-06 08:19:18,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:18,546 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-06 08:19:18,758 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:19:18,766 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-06 08:19:18,766 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-06 08:19:18,766 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-06 08:19:18,766 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-06 08:19:18,766 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-06 08:19:18,766 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-06 08:19:18,766 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-06 08:19:18,766 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-06 08:19:18,766 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-06 08:19:18,766 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-06 08:19:18,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:18,934 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-06 08:19:18,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:18,951 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-06 08:19:19,213 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-06 08:19:19,213 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-06 08:19:19,213 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-06 08:19:19,213 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:19:19,220 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-06 08:19:19,220 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-06 08:19:19,220 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-06 08:19:19,220 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-06 08:19:19,220 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-06 08:19:19,220 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-06 08:19:19,220 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-06 08:19:19,220 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-06 08:19:19,220 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-06 08:19:19,220 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-06 08:19:19,220 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-06 08:19:19,220 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-06 08:19:19,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:19,385 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-06-06 08:19:19,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:19,402 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-06-06 08:19:19,674 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-06-06 08:19:19,674 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-06-06 08:19:19,674 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-06-06 08:19:19,674 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-06 08:19:19,674 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-06-06 08:19:19,675 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:19:19,682 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-06-06 08:19:19,682 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-06-06 08:19:19,682 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-06-06 08:19:19,682 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-06-06 08:19:19,682 [ scc.git] DEBUG src/index.html | 1 +
2024-06-06 08:19:19,683 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-06-06 08:19:19,683 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-06-06 08:19:19,683 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-06-06 08:19:19,683 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-06-06 08:19:19,683 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-06-06 08:19:19,683 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-06-06 08:19:19,683 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-06-06 08:19:19,683 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-06-06 08:19:19,685 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-06-06 08:19:19,685 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-06-06 08:19:19,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:19,839 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5750e2b744e687c5064df1b3ee304bfe7b5e6573'
2024-06-06 08:19:19,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:19,854 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 5750e2b744e687c5064df1b3ee304bfe7b5e6573'
2024-06-06 08:19:19,874 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:19:19,878 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-06-06 08:19:19,878 [ scc.git] DEBUG README.rst | 2 +-
2024-06-06 08:19:19,878 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 1 deletion(-)
2024-06-06 08:19:20,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:20,255 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...acd328badf4723b6ad334eeff22205a726b61043'
2024-06-06 08:19:20,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:20,268 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 563 (Use path instead of re_path for all URLs) acd328badf4723b6ad334eeff22205a726b61043'
2024-06-06 08:19:20,283 [ scc.git] DEBUG Auto-merging omero_figure/urls.py
2024-06-06 08:19:20,284 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:19:20,287 [ scc.git] DEBUG omero_figure/urls.py | 68 +++++++++++++++++++++++++---------------------------
2024-06-06 08:19:20,287 [ scc.git] DEBUG 1 file changed, 32 insertions(+), 36 deletions(-)
2024-06-06 08:19:20,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:20,667 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:19:20,712 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:20,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:20,719 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:19:20,762 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:19:20,771 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec65fbb0> has no local changes
2024-06-06 08:19:20,771 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 562 will-moore 'Add changelog 7.0.0'
- PR 563 will-moore 'Use path instead of re_path for all URLs'
Generated by OMERO-plugins-push#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:19:20,782 [ scc.git] DEBUG [detached HEAD b25cdf6b] merge master -Dorg -Ssuccess-only
2024-06-06 08:19:20,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:19:20,783 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:19:21,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-06 08:19:21,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-06 08:19:22,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-06 08:19:22,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-06 08:19:23,217 [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-06-06 08:19:23,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-06 08:19:24,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:24,151 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-06 08:19:24,151 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:19:24,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-06 08:19:24,151 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:24,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:24,158 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:19:24,164 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:19:24,164 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:19:24,170 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:19:24,176 [ scc.git] DEBUG Already up to date.
2024-06-06 08:19:24,177 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-06 08:19:24,592 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-06 08:19:24,592 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-06 08:19:24,597 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:19:24,597 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:24,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:24,603 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-06 08:19:24,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:24,613 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-06 08:19:24,657 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-06 08:19:24,658 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:19:24,660 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-06 08:19:24,660 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-06 08:19:24,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:24,826 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:19:24,865 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:24,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:24,871 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:19:24,908 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:19:24,915 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec611490> has no local changes
2024-06-06 08:19:24,915 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:19:24,925 [ scc.git] DEBUG [detached HEAD 73ee531] merge master -Dorg -Ssuccess-only
2024-06-06 08:19:24,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:19:24,925 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:19:25,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-06 08:19:25,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-06 08:19:25,792 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-06 08:19:26,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-06 08:19:26,820 [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-06-06 08:19:27,376 [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-06-06 08:19:27,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-06 08:19:28,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:28,280 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-06 08:19:28,280 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:19:28,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-06 08:19:28,280 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:28,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:28,286 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:19:28,291 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:19:28,292 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:19:28,298 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:19:28,304 [ scc.git] DEBUG Already up to date.
2024-06-06 08:19:28,304 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-06 08:19:28,669 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-06 08:19:28,669 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-06 08:19:28,675 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:19:28,675 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:28,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:28,681 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-06 08:19:28,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:28,694 [ 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-06-06 08:19:28,707 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:19:28,712 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-06 08:19:28,712 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-06 08:19:28,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:28,863 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:19:28,904 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:28,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:28,910 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:19:28,950 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:19:28,962 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec69bfd0> has no local changes
2024-06-06 08:19:28,962 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:19:28,975 [ scc.git] DEBUG [detached HEAD 2696561] merge master -Dorg -Ssuccess-only
2024-06-06 08:19:28,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:19:28,976 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:19:29,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-06 08:19:29,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-06 08:19:30,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-06 08:19:30,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-06 08:19:31,384 [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-06-06 08:19:31,905 [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-06-06 08:19:32,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-06 08:19:32,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:32,839 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-06 08:19:33,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-06 08:19:33,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-06 08:19:34,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-06 08:19:34,901 [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-06-06 08:19:35,401 [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-06-06 08:19:35,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-06 08:19:36,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:36,313 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-06 08:19:36,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-06 08:19:37,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-06 08:19:37,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-06 08:19:38,226 [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-06-06 08:19:38,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-06 08:19:39,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:39,067 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-06 08:19:39,068 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:19:39,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-06 08:19:39,068 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:39,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:39,074 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:19:39,079 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:19:39,079 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:19:39,086 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:19:39,092 [ scc.git] DEBUG Already up to date.
2024-06-06 08:19:39,092 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-06 08:19:39,586 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-06 08:19:39,587 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-06 08:19:39,591 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-06 08:19:40,508 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-06 08:19:40,508 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-06 08:19:40,513 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-06 08:19:40,973 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-06 08:19:40,973 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-06 08:19:40,978 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:19:40,978 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:40,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:40,985 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-06 08:19:40,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:41,000 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-06 08:19:41,048 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-06 08:19:41,049 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:19:41,052 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-06 08:19:41,053 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-06 08:19:41,053 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-06 08:19:41,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:41,219 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-06 08:19:41,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:41,237 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-06 08:19:41,344 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-06 08:19:41,344 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-06 08:19:41,344 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-06 08:19:41,344 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-06 08:19:41,345 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:19:41,350 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-06 08:19:41,350 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-06 08:19:41,350 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-06 08:19:41,350 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-06 08:19:41,350 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-06 08:19:41,350 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-06 08:19:41,350 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-06 08:19:41,350 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-06 08:19:41,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:41,639 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-06 08:19:41,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:41,654 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-06 08:19:41,700 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-06 08:19:41,701 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:19:41,704 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-06 08:19:41,704 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-06 08:19:41,705 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-06 08:19:42,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:42,054 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:19:42,096 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:42,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:42,103 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:19:42,144 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:19:42,152 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec61a280> has no local changes
2024-06-06 08:19:42,153 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:19:42,164 [ scc.git] DEBUG [detached HEAD 37304d5] merge master -Dorg -Ssuccess-only
2024-06-06 08:19:42,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:19:42,164 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:19:42,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-06 08:19:43,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-06 08:19:43,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-06 08:19:44,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-06 08:19:44,677 [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-06-06 08:19:45,162 [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-06-06 08:19:45,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-06 08:19:46,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:46,032 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-06 08:19:46,032 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:19:46,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-06 08:19:46,032 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:46,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:46,038 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:19:46,044 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:19:46,044 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:19:46,051 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:19:46,058 [ scc.git] DEBUG Already up to date.
2024-06-06 08:19:46,059 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-06 08:19:46,444 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-06 08:19:46,445 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-06 08:19:46,450 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:19:46,450 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:46,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:46,455 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-06 08:19:46,462 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:46,468 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-06 08:19:46,480 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:19:46,484 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-06 08:19:46,485 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-06 08:19:46,485 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-06 08:19:46,485 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-06 08:19:46,485 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-06 08:19:46,485 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-06 08:19:46,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:46,645 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:19:46,689 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:46,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:46,695 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:19:46,739 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:19:46,748 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec62d460> has no local changes
2024-06-06 08:19:46,749 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:19:46,768 [ scc.git] DEBUG [detached HEAD 671bd7e] merge master -Dorg -Ssuccess-only
2024-06-06 08:19:46,769 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:19:46,769 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:19:47,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-06 08:19:47,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-06 08:19:48,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-06 08:19:48,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-06 08:19:49,170 [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-06-06 08:19:49,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-06 08:19:50,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:50,146 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-06 08:19:50,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-06 08:19:51,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-06 08:19:51,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-06 08:19:52,089 [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-06-06 08:19:52,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-06 08:19:53,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:53,017 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-06 08:19:53,017 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:19:53,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-06 08:19:53,017 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:53,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:53,023 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:19:53,028 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:19:53,029 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:19:53,034 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:19:53,040 [ scc.git] DEBUG Already up to date.
2024-06-06 08:19:53,041 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-06 08:19:53,607 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-06 08:19:53,607 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-06 08:19:53,613 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-06 08:19:54,157 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-06 08:19:54,157 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-06 08:19:54,163 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:19:54,163 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:54,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:54,169 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-06 08:19:54,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:54,182 [ 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-06-06 08:19:54,268 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-06 08:19:54,269 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-06 08:19:54,269 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-06 08:19:54,269 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-06 08:19:54,270 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 08:19:54,270 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 08:19:54,277 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-06 08:19:54,284 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-06 08:19:54,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:54,463 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-06 08:19:54,473 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-06 08:19:54,479 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#86](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-06-06 08:19:54,484 [ scc.config] DEBUG Found github.token
2024-06-06 08:19:54,485 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-06 08:19:54,485 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-06 08:19:54,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:54,497 [ 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-06-06 08:19:54,518 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-06 08:19:54,518 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-06 08:19:54,518 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-06 08:19:54,518 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 08:19:54,519 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 08:19:54,525 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-06 08:19:54,533 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-06 08:19:54,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:19:54,868 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-06 08:19:54,876 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-06 08:19:54,882 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#86](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/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-06-06 08:19:54,888 [ scc.config] DEBUG Found github.token
2024-06-06 08:19:54,888 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-06 08:19:54,888 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:19:54,930 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:19:54,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:19:54,936 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:19:54,975 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:19:54,982 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec5d3640> has no local changes
2024-06-06 08:19:54,982 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:19:54,992 [ scc.git] DEBUG [detached HEAD 2fa62c3] merge master -Dorg -Ssuccess-only
2024-06-06 08:19:54,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:19:54,992 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:19:55,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-06 08:19:55,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-06 08:19:55,893 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-06 08:19:56,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-06 08:19:57,019 [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-06-06 08:19:57,533 [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-06-06 08:19:57,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-06 08:19:58,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:19:58,400 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-06 08:19:58,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-06 08:19:58,872 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-06 08:19:59,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-06 08:20:00,152 [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-06-06 08:20:00,645 [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-06-06 08:20:01,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-06 08:20:01,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:20:01,669 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-06 08:20:02,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-06 08:20:02,139 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-06 08:20:02,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-06 08:20:03,210 [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-06-06 08:20:03,709 [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-06-06 08:20:04,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-06 08:20:04,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:20:04,590 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-06 08:20:05,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-06 08:20:05,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-06 08:20:06,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-06 08:20:06,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-06 08:20:06,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-06 08:20:07,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-06 08:20:07,509 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:07,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-06 08:20:07,509 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:07,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:07,517 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:20:07,523 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:07,523 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:20:07,529 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:20:07,536 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:07,536 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-06 08:20:07,928 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-06 08:20:07,928 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-06 08:20:07,933 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-06 08:20:08,327 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-06 08:20:08,327 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-06 08:20:08,332 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-06 08:20:08,716 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-06 08:20:08,717 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-06 08:20:08,721 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:08,722 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:08,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:08,729 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-06 08:20:08,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:08,742 [ 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-06-06 08:20:08,755 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:20:08,759 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-06 08:20:08,760 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-06 08:20:08,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:08,922 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-06 08:20:08,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:08,936 [ 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-06-06 08:20:08,983 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-06 08:20:08,984 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:20:08,987 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-06 08:20:08,987 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-06 08:20:09,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:09,330 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-06 08:20:09,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:09,342 [ 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-06-06 08:20:09,377 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-06 08:20:09,377 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:20:09,381 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-06 08:20:09,381 [ scc.git] DEBUG package.json | 2 +-
2024-06-06 08:20:09,381 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-06 08:20:09,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:09,732 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:09,775 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:09,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:09,782 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:09,824 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:09,832 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec5d3580> has no local changes
2024-06-06 08:20:09,833 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:09,843 [ scc.git] DEBUG [detached HEAD 989a320] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:09,844 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:09,844 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:20:10,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-06 08:20:10,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-06 08:20:11,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-06 08:20:11,810 [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-06-06 08:20:12,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-06 08:20:12,674 [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-06-06 08:20:12,675 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-06 08:20:12,675 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:12,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-06 08:20:12,675 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:12,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:12,682 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:20:12,687 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:12,688 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:20:12,694 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:20:12,702 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:12,702 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-06 08:20:13,099 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-06 08:20:13,100 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-06 08:20:13,105 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:13,105 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:13,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:13,112 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-06 08:20:13,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:13,124 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-06 08:20:13,133 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:20:13,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:13,305 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:13,346 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:13,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:13,352 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:13,394 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:13,400 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec5e4c10> has no local changes
2024-06-06 08:20:13,401 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:13,409 [ scc.git] DEBUG [detached HEAD 6986045] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:13,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:13,410 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:20:13,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-06 08:20:14,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-06 08:20:14,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-06 08:20:15,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-06 08:20:15,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-06 08:20:16,322 [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-06-06 08:20:16,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-06 08:20:17,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:20:17,227 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-06 08:20:17,227 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:17,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-06 08:20:17,227 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:17,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:17,233 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:20:17,237 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:17,238 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:20:17,247 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:20:17,253 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:17,253 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-06 08:20:17,750 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-06 08:20:17,750 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-06 08:20:17,755 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:17,756 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:17,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:17,763 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-06 08:20:17,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:17,778 [ 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-06-06 08:20:17,791 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-06 08:20:17,792 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:20:17,795 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-06 08:20:17,795 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-06 08:20:17,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:17,970 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:18,011 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:18,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:18,017 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:18,055 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:18,061 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec59c5b0> has no local changes
2024-06-06 08:20:18,062 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:18,070 [ scc.git] DEBUG [detached HEAD 318941f] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:18,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:18,070 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:20:18,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-06 08:20:19,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-06 08:20:19,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-06 08:20:20,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-06 08:20:20,541 [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-06-06 08:20:21,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-06 08:20:21,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:20:21,524 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-06 08:20:21,524 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:21,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-06 08:20:21,524 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:21,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:21,533 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:20:21,545 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:21,545 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:20:21,552 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:20:21,560 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:21,560 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-06 08:20:22,040 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-06 08:20:22,040 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-06 08:20:22,046 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:22,046 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:22,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:22,052 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-06 08:20:22,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:22,064 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-06 08:20:22,108 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-06 08:20:22,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-06 08:20:22,109 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-06 08:20:22,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-06 08:20:22,109 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-06 08:20:22,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-06 08:20:22,109 [ scc.git] DEBUG Auto-merging setup.py
2024-06-06 08:20:22,109 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 08:20:22,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-06 08:20:22,109 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 08:20:22,115 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-06 08:20:22,122 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-06 08:20:22,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:22,303 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-06 08:20:22,310 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-06 08:20:22,315 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#86](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2024-06-06 08:20:22,321 [ scc.config] DEBUG Found github.token
2024-06-06 08:20:22,321 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-06 08:20:22,321 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:22,362 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:22,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:22,369 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:22,410 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:22,416 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec623eb0> has no local changes
2024-06-06 08:20:22,416 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:22,424 [ scc.git] DEBUG [detached HEAD cfcbc74] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:22,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:22,425 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:20:22,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-06 08:20:23,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-06 08:20:23,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-06 08:20:24,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-06 08:20:24,702 [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-06-06 08:20:25,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-06 08:20:25,577 [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-06-06 08:20:25,578 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-06 08:20:25,578 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:25,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-06 08:20:25,578 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:25,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:25,585 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:20:25,590 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:25,590 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:20:25,596 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:20:25,602 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:25,602 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-06 08:20:26,816 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-06 08:20:26,816 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-06 08:20:26,822 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:26,822 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:26,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:26,828 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-06 08:20:26,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:26,843 [ 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-06-06 08:20:26,878 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-06 08:20:26,882 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-06 08:20:26,884 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-06 08:20:26,884 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-06 08:20:26,884 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-06 08:20:26,884 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-06 08:20:26,885 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-06 08:20:26,885 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-06 08:20:26,885 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-06 08:20:26,885 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-06 08:20:26,885 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-06 08:20:26,885 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-06 08:20:26,885 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-06 08:20:26,885 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-06 08:20:27,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:27,057 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:27,098 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:27,098 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:27,106 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:27,146 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:27,153 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec59c7f0> has no local changes
2024-06-06 08:20:27,154 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:27,163 [ scc.git] DEBUG [detached HEAD 093fce7] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:27,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:27,164 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:20:27,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-06 08:20:27,487 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:27,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-06 08:20:27,488 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:27,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:27,503 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:20:27,514 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:27,515 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:20:27,523 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:20:27,532 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:27,532 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:27,532 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:27,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:27,537 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:27,576 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:27,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:27,582 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:27,620 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:27,626 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec5adb80> has no local changes
2024-06-06 08:20:27,627 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:27,635 [ scc.git] DEBUG [detached HEAD c50322b] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:27,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:27,636 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:20:27,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-06 08:20:27,922 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:27,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-06 08:20:27,922 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:27,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:27,929 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:20:27,935 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:27,935 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:20:27,942 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:20:27,949 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:27,950 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:27,950 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:27,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:27,956 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:27,998 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:27,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:28,004 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:28,046 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:28,052 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec5ecdf0> has no local changes
2024-06-06 08:20:28,052 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:28,061 [ scc.git] DEBUG [detached HEAD 373093b] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:28,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:28,061 [ scc.git] INFO Overriding base-branch from master to main
2024-06-06 08:20:28,062 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:20:28,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-06 08:20:28,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-06 08:20:29,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-06 08:20:29,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-06 08:20:30,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-06 08:20:30,839 [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-06-06 08:20:31,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 08:20:31,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-06 08:20:32,245 [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-06-06 08:20:32,246 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-06 08:20:32,246 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:32,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-06 08:20:32,246 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:32,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:32,252 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-06 08:20:32,257 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:32,257 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-06 08:20:32,263 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-06 08:20:32,269 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:32,269 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-06 08:20:32,776 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-06 08:20:32,776 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-06 08:20:32,781 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:32,781 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:32,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:32,786 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-06 08:20:32,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:32,797 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-06 08:20:32,815 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-06 08:20:32,815 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-06 08:20:32,815 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 08:20:32,816 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 08:20:32,823 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-06 08:20:32,833 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-06 08:20:32,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:32,990 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-06 08:20:32,999 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-06 08:20:33,005 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#86](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-06 08:20:33,013 [ scc.config] DEBUG Found github.token
2024-06-06 08:20:33,013 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-06 08:20:33,013 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:33,068 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:33,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:33,076 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:33,116 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:33,123 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec5fedf0> has no local changes
2024-06-06 08:20:33,124 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:33,133 [ scc.git] DEBUG [detached HEAD 93d6b0d] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:33,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:33,133 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:20:33,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-06 08:20:33,440 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:33,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-06 08:20:33,441 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:33,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:33,446 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:20:33,452 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:33,452 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:20:33,457 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:20:33,463 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:33,463 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:33,463 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:33,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:33,468 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:33,506 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:33,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:33,511 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:33,549 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:33,556 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec5c1ee0> has no local changes
2024-06-06 08:20:33,556 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:33,565 [ scc.git] DEBUG [detached HEAD bc93909] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:33,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:33,566 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:20:33,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-06 08:20:33,894 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:33,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-06 08:20:33,895 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:33,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:33,900 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:20:33,905 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:33,905 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:20:33,911 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:20:33,916 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:33,916 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:33,916 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:33,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:33,921 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:33,959 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:33,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:33,965 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:34,002 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:34,008 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec5185b0> has no local changes
2024-06-06 08:20:34,009 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:34,017 [ scc.git] DEBUG [detached HEAD f97fb06] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:34,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:34,018 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:20:34,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-06 08:20:34,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-06 08:20:35,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-06 08:20:35,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-06 08:20:36,340 [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-06-06 08:20:36,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-06 08:20:37,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:20:37,204 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-06 08:20:37,204 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:37,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-06 08:20:37,204 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:37,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:37,210 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:20:37,215 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:37,215 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:20:37,221 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:20:37,226 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:37,227 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-06 08:20:37,666 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-06 08:20:37,667 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-06 08:20:37,671 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:37,671 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:37,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:37,676 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-06 08:20:37,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:37,687 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-06 08:20:37,718 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-06 08:20:37,718 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-06 08:20:37,718 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 08:20:37,719 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 08:20:37,725 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-06 08:20:37,732 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-06 08:20:37,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:37,908 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-06 08:20:37,916 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-06 08:20:37,923 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#86](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-06 08:20:37,930 [ scc.config] DEBUG Found github.token
2024-06-06 08:20:37,930 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-06 08:20:37,931 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:37,971 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:37,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:37,977 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:38,016 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:38,024 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec55cbb0> has no local changes
2024-06-06 08:20:38,024 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:38,033 [ scc.git] DEBUG [detached HEAD e2a1c88] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:38,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:38,033 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-06 08:20:38,033 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:20:38,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-06 08:20:39,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-06 08:20:39,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-06 08:20:40,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-06 08:20:40,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-06 08:20:41,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-06 08:20:41,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-06 08:20:41,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-06 08:20:42,458 [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-06-06 08:20:42,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-06 08:20:43,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:20:43,315 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-06 08:20:43,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-06 08:20:44,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-06 08:20:44,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-06 08:20:45,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-06 08:20:45,326 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:20:45,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-06 08:20:45,326 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:45,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:45,332 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-06 08:20:45,337 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:20:45,338 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-06 08:20:45,344 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-06 08:20:45,350 [ scc.git] DEBUG Already up to date.
2024-06-06 08:20:45,350 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-06 08:20:46,148 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-06 08:20:46,149 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-06 08:20:46,153 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:20:46,153 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:46,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:46,160 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-06 08:20:46,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:46,174 [ 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-06-06 08:20:46,286 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-06 08:20:46,286 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-06 08:20:46,287 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 08:20:46,287 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 08:20:46,293 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-06 08:20:46,300 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-06 08:20:46,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:46,449 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-06 08:20:46,457 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-06 08:20:46,463 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#86](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-06 08:20:46,468 [ scc.config] DEBUG Found github.token
2024-06-06 08:20:46,468 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-06 08:20:46,468 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:20:46,506 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:20:46,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:20:46,512 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:46,551 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:46,558 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fecec518280> has no local changes
2024-06-06 08:20:46,558 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:46,568 [ scc.git] DEBUG [detached HEAD 65fed0a] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:46,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:46,568 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:20:46,646 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-06 08:20:46,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:46,881 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-06 08:20:46,886 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-06 08:20:47,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:47,310 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-06 08:20:47,315 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-06 08:20:47,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:47,722 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-06 08:20:47,728 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-06 08:20:48,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:48,133 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-06 08:20:48,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:48,558 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-06 08:20:48,564 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-06 08:20:48,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:48,988 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-06 08:20:48,993 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-06 08:20:49,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:49,396 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-06 08:20:49,402 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-06 08:20:49,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:49,833 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-06 08:20:49,839 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-06 08:20:50,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:50,252 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-06 08:20:50,258 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-06 08:20:50,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:50,666 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-06 08:20:50,672 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-06 08:20:51,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:51,080 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-06 08:20:51,086 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-06 08:20:51,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:51,485 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-06 08:20:51,491 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-06 08:20:51,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:51,907 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-06 08:20:52,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:52,315 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-06 08:20:52,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:52,758 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-06 08:20:52,762 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-06 08:20:53,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:53,177 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-06 08:20:53,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:53,605 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-06 08:20:54,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:54,019 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-06 08:20:54,026 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-06 08:20:54,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:54,440 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-06 08:20:54,445 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-06 08:20:54,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:54,852 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-06 08:20:54,857 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-06 08:20:55,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:55,261 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-06 08:20:55,266 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-06 08:20:55,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:20:55,659 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-06 08:20:55,659 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:20:55,738 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feced77bd90> has local changes
2024-06-06 08:20:55,738 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 562 will-moore 'Add changelog 7.0.0'
- PR 563 will-moore 'Use path instead of re_path for all URLs'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/86/)'
2024-06-06 08:20:55,753 [ scc.git] DEBUG [detached HEAD 50c58b7] merge master -Dorg -Ssuccess-only
2024-06-06 08:20:55,753 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-06 08:20:55,753 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-06 08:20:55,753 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,754 [ scc.merge] INFO
2024-06-06 08:20:55,754 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-06 08:20:55,754 [ scc.merge] INFO
2024-06-06 08:20:55,754 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-06 08:20:55,754 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,754 [ scc.merge] INFO
2024-06-06 08:20:55,754 [ scc.merge] INFO
2024-06-06 08:20:55,754 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-06 08:20:55,754 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-06 08:20:55,754 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,754 [ scc.merge] INFO
2024-06-06 08:20:55,754 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-06 08:20:55,754 [ scc.merge] INFO
2024-06-06 08:20:55,754 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-06 08:20:55,754 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-06 08:20:55,754 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,754 [ scc.merge] INFO
2024-06-06 08:20:55,754 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-06 08:20:55,754 [ scc.merge] INFO
2024-06-06 08:20:55,754 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-06 08:20:55,754 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-06 08:20:55,754 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-06 08:20:55,754 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,755 [ scc.merge] INFO
2024-06-06 08:20:55,755 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-06 08:20:55,755 [ scc.merge] INFO
2024-06-06 08:20:55,755 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-06 08:20:55,755 [ scc.merge] INFO
2024-06-06 08:20:55,755 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-06 08:20:55,755 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-06-06 08:20:55,755 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,755 [ scc.merge] INFO
2024-06-06 08:20:55,755 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 563 will-moore 'Use path instead of re_path for all URLs'
2024-06-06 08:20:55,755 [ scc.merge] INFO
2024-06-06 08:20:55,755 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-06 08:20:55,755 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,755 [ scc.merge] INFO
2024-06-06 08:20:55,755 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-06 08:20:55,755 [ scc.merge] INFO
2024-06-06 08:20:55,755 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-06 08:20:55,755 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,755 [ scc.merge] INFO
2024-06-06 08:20:55,755 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-06 08:20:55,755 [ scc.merge] INFO
2024-06-06 08:20:55,755 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-06 08:20:55,755 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-06 08:20:55,755 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-06 08:20:55,755 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,755 [ scc.merge] INFO
2024-06-06 08:20:55,755 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-06 08:20:55,756 [ scc.merge] INFO
2024-06-06 08:20:55,756 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-06 08:20:55,756 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-06 08:20:55,756 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,756 [ scc.merge] INFO
2024-06-06 08:20:55,756 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-06 08:20:55,756 [ scc.merge] INFO
2024-06-06 08:20:55,756 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-06 08:20:55,756 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,756 [ scc.merge] INFO
2024-06-06 08:20:55,756 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-06 08:20:55,756 [ scc.merge] INFO
2024-06-06 08:20:55,756 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-06 08:20:55,756 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-06 08:20:55,756 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,756 [ scc.merge] INFO
2024-06-06 08:20:55,756 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-06 08:20:55,756 [ scc.merge] INFO
2024-06-06 08:20:55,756 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-06 08:20:55,756 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,756 [ scc.merge] INFO
2024-06-06 08:20:55,756 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,756 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-06 08:20:55,756 [ scc.merge] INFO
2024-06-06 08:20:55,756 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-06 08:20:55,756 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:20:55,757 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-06 08:20:55,757 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,757 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-06 08:20:55,757 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 08:20:55,757 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-06 08:20:55,757 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO Merged PRs:
2024-06-06 08:20:55,757 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-06 08:20:55,757 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-06 08:20:55,757 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-06 08:20:55,757 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:20:55,757 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-06 08:20:55,757 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 08:20:55,757 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-06 08:20:55,757 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO
2024-06-06 08:20:55,757 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-06 08:20:55,758 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,758 [ scc.merge] INFO
2024-06-06 08:20:55,758 [ scc.merge] INFO
2024-06-06 08:20:55,758 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-06 08:20:55,758 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,758 [ scc.merge] INFO
2024-06-06 08:20:55,758 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 08:20:55,758 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-06 08:20:55,758 [ scc.merge] INFO
2024-06-06 08:20:55,758 [ scc.merge] INFO Repository: ome/scripts
2024-06-06 08:20:55,758 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:20:55,758 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-06 08:20:55,758 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-06 08:20:55,758 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-06 08:20:55,758 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-06 08:20:55,758 [ scc.merge] INFO Already up to date.
2024-06-06 08:20:55,758 [ scc.merge] INFO
2024-06-06 08:20:55,758 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 08:20:55,758 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-06 08:20:55,758 [ scc.merge] INFO
2024-06-06 08:20:55,758 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-06 08:20:55,758 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-06 08:20:55,764 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,769 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,769 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-06 08:20:55,769 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-06 08:20:55,774 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-06 08:20:55,780 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,785 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,785 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-06 08:20:55,785 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-06 08:20:55,791 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,797 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,797 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-06 08:20:55,797 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-06 08:20:55,803 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-06 08:20:55,808 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-06 08:20:55,813 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-06 08:20:55,818 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-06 08:20:55,824 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-06 08:20:55,829 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-06 08:20:55,834 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-06 08:20:55,839 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,844 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,844 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-06 08:20:55,844 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-06 08:20:55,849 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-06 08:20:55,854 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-06 08:20:55,859 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-06 08:20:55,864 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-06 08:20:55,870 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,874 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 08:20:55,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-06 08:20:55,875 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:20:55,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.1 to 5.9.2-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 8cf7816] 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 2ca566b
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 3d9e3b87
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 7b7a637
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 5a90893
nothing to commit, working tree clean
[detached HEAD 9ca7898] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-06-06 08:21:44,200 [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-06-06 08:21:53,323 [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-06-06 08:21:55,805 [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-06-06 08:22:00,552 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-06 08:22:52,147 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS