Skipping 110 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-07-24 13:08:58,250 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:08:58,255 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:08:58,261 [ scc.git] DEBUG Already up to date.
2024-07-24 13:08:58,261 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-24 13:08:58,597 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-24 13:08:58,597 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-24 13:08:58,601 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-24 13:08:58,954 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-24 13:08:58,954 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-24 13:08:58,958 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-24 13:08:59,325 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-24 13:08:59,325 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-24 13:08:59,328 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-24 13:08:59,682 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-24 13:08:59,682 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-24 13:08:59,686 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-07-24 13:09:00,038 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-24 13:09:00,038 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-07-24 13:09:00,041 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:09:00,042 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:00,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:00,047 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-24 13:09:00,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:00,059 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-24 13:09:00,074 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-24 13:09:00,074 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:00,080 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-24 13:09:00,080 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-24 13:09:00,080 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-24 13:09:00,080 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-24 13:09:00,080 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-24 13:09:00,080 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-24 13:09:00,080 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-24 13:09:00,080 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-24 13:09:00,080 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-24 13:09:00,082 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-24 13:09:00,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:00,250 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-24 13:09:00,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:00,262 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-24 13:09:00,281 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-24 13:09:00,281 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-24 13:09:00,281 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-24 13:09:00,281 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-24 13:09:00,282 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:00,287 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-24 13:09:00,287 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-24 13:09:00,287 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-24 13:09:00,287 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-24 13:09:00,287 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-24 13:09:00,287 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-24 13:09:00,287 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-24 13:09:00,287 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-24 13:09:00,287 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-24 13:09:00,287 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-24 13:09:00,288 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-24 13:09:00,288 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-24 13:09:00,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:00,668 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-24 13:09:00,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:00,680 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-24 13:09:00,709 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-07-24 13:09:00,709 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-24 13:09:00,709 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-24 13:09:00,709 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-07-24 13:09:00,709 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-24 13:09:00,709 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-24 13:09:00,709 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:00,716 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-07-24 13:09:00,716 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-07-24 13:09:00,716 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-07-24 13:09:00,716 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-07-24 13:09:00,716 [ scc.git] DEBUG src/index.html | 1 +
2024-07-24 13:09:00,716 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-07-24 13:09:00,716 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-07-24 13:09:00,716 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-07-24 13:09:00,716 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-07-24 13:09:00,716 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-07-24 13:09:00,717 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-07-24 13:09:00,717 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-07-24 13:09:00,717 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-07-24 13:09:00,717 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-07-24 13:09:00,717 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-07-24 13:09:01,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:01,128 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-24 13:09:01,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:01,141 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-24 13:09:01,155 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:01,158 [ scc.git] DEBUG setup.py | 2 +-
2024-07-24 13:09:01,158 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-24 13:09:01,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:01,545 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-07-24 13:09:01,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:01,557 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-07-24 13:09:01,572 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-24 13:09:01,572 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-24 13:09:01,573 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:01,576 [ scc.git] DEBUG .gitignore | 2 +-
2024-07-24 13:09:01,576 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-07-24 13:09:01,576 [ scc.git] DEBUG src/index.html | 3 +++
2024-07-24 13:09:01,576 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-07-24 13:09:01,576 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-07-24 13:09:01,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:01,963 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:09:01,999 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:01,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:02,004 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:09:02,040 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:09:02,047 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb19482bb0> has no local changes
2024-07-24 13:09:02,047 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Generated by OMERO-plugins-push#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:09:02,056 [ scc.git] DEBUG [detached HEAD 1ae65c86] merge master -Dorg -Ssuccess-only
2024-07-24 13:09:02,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:09:02,056 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:09:02,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-24 13:09:02,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-24 13:09:03,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-24 13:09:04,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-24 13:09:04,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:05,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-24 13:09:05,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:05,509 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-24 13:09:05,509 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:09:05,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-24 13:09:05,509 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:05,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:05,515 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:09:05,519 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:09:05,519 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:09:05,524 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:09:05,529 [ scc.git] DEBUG Already up to date.
2024-07-24 13:09:05,529 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-24 13:09:05,937 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-24 13:09:05,937 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-24 13:09:05,941 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:09:05,941 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:05,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:05,946 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-24 13:09:05,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:05,956 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-24 13:09:05,964 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-24 13:09:05,965 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:05,967 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-24 13:09:05,967 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-24 13:09:06,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:06,144 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:09:06,181 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:06,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:06,186 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:09:06,222 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:09:06,228 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb1946f700> has no local changes
2024-07-24 13:09:06,229 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:09:06,236 [ scc.git] DEBUG [detached HEAD a0f4b09] merge master -Dorg -Ssuccess-only
2024-07-24 13:09:06,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:09:06,237 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:09:06,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-24 13:09:07,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-24 13:09:07,162 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 13:09:07,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-24 13:09:08,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:08,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 13:09:09,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-24 13:09:09,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:09,906 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-24 13:09:09,906 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:09:09,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-24 13:09:09,906 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:09,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:09,912 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:09:09,916 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:09:09,917 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:09:09,921 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:09:09,926 [ scc.git] DEBUG Already up to date.
2024-07-24 13:09:09,926 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-24 13:09:10,298 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-24 13:09:10,298 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-24 13:09:10,302 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:09:10,303 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:10,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:10,308 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-24 13:09:10,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:10,317 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-24 13:09:10,327 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:10,330 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-24 13:09:10,330 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-24 13:09:10,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:10,501 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:09:10,537 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:10,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:10,543 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:09:10,578 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:09:10,585 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb194a2b50> has no local changes
2024-07-24 13:09:10,585 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:09:10,594 [ scc.git] DEBUG [detached HEAD 2bf3cb6] merge master -Dorg -Ssuccess-only
2024-07-24 13:09:10,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:09:10,594 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:09:11,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-24 13:09:11,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-07-24 13:09:12,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-24 13:09:12,134 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 13:09:12,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-24 13:09:13,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:13,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 13:09:14,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-24 13:09:14,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:14,676 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-24 13:09:15,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-24 13:09:15,181 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 13:09:15,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-24 13:09:16,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:16,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 13:09:17,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-24 13:09:17,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:17,934 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-24 13:09:18,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-24 13:09:18,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-24 13:09:19,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-24 13:09:19,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:20,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 13:09:21,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-24 13:09:21,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:21,478 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-24 13:09:21,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-24 13:09:22,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-24 13:09:22,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-24 13:09:23,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:23,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 13:09:24,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-24 13:09:24,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:24,948 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-24 13:09:25,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-24 13:09:25,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-24 13:09:26,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-24 13:09:26,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:27,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-24 13:09:27,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:27,793 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-24 13:09:27,794 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:09:27,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-24 13:09:27,794 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:27,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:27,800 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:09:27,804 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:09:27,804 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:09:27,809 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:09:27,814 [ scc.git] DEBUG Already up to date.
2024-07-24 13:09:27,815 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-24 13:09:28,187 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-24 13:09:28,188 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-24 13:09:28,192 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-24 13:09:28,579 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-24 13:09:28,580 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-24 13:09:28,583 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-24 13:09:28,939 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-24 13:09:28,940 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-24 13:09:28,943 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-24 13:09:29,282 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-24 13:09:29,282 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-24 13:09:29,286 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-24 13:09:29,608 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-24 13:09:29,608 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-24 13:09:29,612 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:09:29,612 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:29,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:29,617 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-24 13:09:29,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:29,627 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-24 13:09:29,637 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-24 13:09:29,638 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:29,641 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-24 13:09:29,641 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-24 13:09:29,641 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-24 13:09:29,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:29,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-24 13:09:29,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:29,833 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-24 13:09:29,849 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-24 13:09:29,850 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-24 13:09:29,850 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-24 13:09:29,850 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-24 13:09:29,850 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:29,854 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-24 13:09:29,854 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-24 13:09:29,854 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-24 13:09:29,854 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-24 13:09:29,854 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-24 13:09:29,854 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-24 13:09:29,854 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-24 13:09:29,854 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-24 13:09:30,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:30,247 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-24 13:09:30,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:30,259 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-24 13:09:30,270 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-24 13:09:30,271 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:30,274 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-24 13:09:30,274 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-24 13:09:30,274 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-24 13:09:30,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:30,673 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-24 13:09:30,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:30,684 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-24 13:09:30,697 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:30,706 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-24 13:09:30,706 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-24 13:09:31,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:31,095 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-24 13:09:31,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:31,106 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-24 13:09:31,136 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-24 13:09:31,136 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:31,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:31,512 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:09:31,549 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:31,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:31,554 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:09:31,589 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:09:31,595 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb1947ad30> has no local changes
2024-07-24 13:09:31,595 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Generated by OMERO-plugins-push#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:09:31,603 [ scc.git] DEBUG [detached HEAD b37514f] merge master -Dorg -Ssuccess-only
2024-07-24 13:09:31,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:09:31,604 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:09:32,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-24 13:09:32,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-24 13:09:33,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-24 13:09:33,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-24 13:09:34,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:34,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 13:09:35,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-24 13:09:35,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:35,549 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-24 13:09:35,549 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:09:35,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-24 13:09:35,549 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:35,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:35,555 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:09:35,559 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:09:35,559 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:09:35,564 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:09:35,569 [ scc.git] DEBUG Already up to date.
2024-07-24 13:09:35,569 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-24 13:09:35,913 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-24 13:09:35,913 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-24 13:09:35,917 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:09:35,917 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:35,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:35,921 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-24 13:09:35,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:35,931 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-24 13:09:35,940 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:35,943 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-24 13:09:35,943 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-24 13:09:35,943 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-24 13:09:35,943 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-24 13:09:35,943 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-24 13:09:35,943 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-24 13:09:36,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:36,126 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:09:36,163 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:36,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:36,167 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:09:36,202 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:09:36,208 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb19475df0> has no local changes
2024-07-24 13:09:36,208 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:09:36,215 [ scc.git] DEBUG [detached HEAD ed13d8f] merge master -Dorg -Ssuccess-only
2024-07-24 13:09:36,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:09:36,216 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:09:36,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-24 13:09:37,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-24 13:09:37,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-24 13:09:38,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-24 13:09:38,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:39,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-24 13:09:39,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:39,584 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-24 13:09:40,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-24 13:09:40,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-24 13:09:41,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-24 13:09:41,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:42,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-24 13:09:42,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:42,492 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-24 13:09:42,493 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:09:42,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-24 13:09:42,493 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:42,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:42,498 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:09:42,503 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:09:42,503 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:09:42,508 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:09:42,512 [ scc.git] DEBUG Already up to date.
2024-07-24 13:09:42,513 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-24 13:09:42,886 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-24 13:09:42,886 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-24 13:09:42,890 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-24 13:09:43,245 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-24 13:09:43,246 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-24 13:09:43,249 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:09:43,249 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:43,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:43,255 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-24 13:09:43,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:43,266 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-24 13:09:43,279 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-24 13:09:43,279 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-24 13:09:43,279 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-24 13:09:43,279 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-24 13:09:43,279 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 13:09:43,279 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 13:09:43,284 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-24 13:09:43,290 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-24 13:09:43,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:43,442 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-24 13:09:43,448 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-24 13:09:43,453 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#134](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-07-24 13:09:43,457 [ scc.config] DEBUG Found github.token
2024-07-24 13:09:43,457 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-24 13:09:43,458 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-24 13:09:43,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:43,468 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-24 13:09:43,483 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-24 13:09:43,483 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-24 13:09:43,483 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-24 13:09:43,483 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 13:09:43,483 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 13:09:43,489 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-24 13:09:43,495 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-24 13:09:43,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:43,860 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-24 13:09:43,866 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-24 13:09:43,871 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#134](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-07-24 13:09:43,875 [ scc.config] DEBUG Found github.token
2024-07-24 13:09:43,875 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-24 13:09:43,875 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:09:43,911 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:43,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:43,915 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:09:43,950 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:09:43,956 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb1842ff10> has no local changes
2024-07-24 13:09:43,956 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:09:43,964 [ scc.git] DEBUG [detached HEAD e256a27] merge master -Dorg -Ssuccess-only
2024-07-24 13:09:43,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:09:43,964 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:09:44,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-24 13:09:44,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-24 13:09:44,961 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 13:09:45,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-24 13:09:46,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:46,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 13:09:47,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-24 13:09:47,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:47,700 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-24 13:09:48,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-24 13:09:48,202 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 13:09:48,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-24 13:09:49,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:49,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 13:09:50,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-24 13:09:50,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:50,775 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-24 13:09:51,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-24 13:09:51,326 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-24 13:09:51,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-24 13:09:52,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:09:52,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 13:09:53,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-24 13:09:53,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:09:53,819 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-24 13:09:54,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-24 13:09:54,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-24 13:09:55,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-24 13:09:55,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-24 13:09:56,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-24 13:09:56,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-24 13:09:56,903 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:09:56,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-24 13:09:56,903 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:56,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:56,908 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:09:56,913 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:09:56,913 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:09:56,918 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:09:56,923 [ scc.git] DEBUG Already up to date.
2024-07-24 13:09:56,923 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-24 13:09:57,302 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-24 13:09:57,302 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-24 13:09:57,305 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-24 13:09:57,653 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-24 13:09:57,653 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-24 13:09:57,656 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-24 13:09:57,989 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-24 13:09:57,989 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-24 13:09:57,993 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:09:57,993 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:57,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:57,997 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-24 13:09:58,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:58,006 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-24 13:09:58,015 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:58,018 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-24 13:09:58,018 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-24 13:09:58,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:58,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-24 13:09:58,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:58,216 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-24 13:09:58,226 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-24 13:09:58,226 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:58,229 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-24 13:09:58,229 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-24 13:09:58,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:58,620 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-24 13:09:58,624 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:58,629 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-24 13:09:58,639 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-24 13:09:58,639 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:09:58,642 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-24 13:09:58,642 [ scc.git] DEBUG package.json | 2 +-
2024-07-24 13:09:58,642 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-24 13:09:59,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:09:59,020 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:09:59,056 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:09:59,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:09:59,060 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:09:59,094 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:09:59,100 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb183cd4f0> has no local changes
2024-07-24 13:09:59,100 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:09:59,108 [ scc.git] DEBUG [detached HEAD a1de158] merge master -Dorg -Ssuccess-only
2024-07-24 13:09:59,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:09:59,108 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:09:59,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-24 13:09:59,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-24 13:10:00,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-24 13:10:01,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:10:01,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-24 13:10:01,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:10:01,957 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-24 13:10:01,957 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:10:01,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-24 13:10:01,957 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:01,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:01,962 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:10:01,967 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:10:01,967 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:10:01,972 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:10:01,977 [ scc.git] DEBUG Already up to date.
2024-07-24 13:10:01,977 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-24 13:10:02,346 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-24 13:10:02,346 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-24 13:10:02,349 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:10:02,350 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:02,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:02,354 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-24 13:10:02,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:02,363 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-24 13:10:02,371 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:10:02,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:02,542 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:10:02,577 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:02,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:02,581 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:02,616 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:02,621 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb194b5f40> has no local changes
2024-07-24 13:10:02,621 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Generated by OMERO-plugins-push#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:02,628 [ scc.git] DEBUG [detached HEAD 2d83bea] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:02,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:02,628 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:10:03,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-24 13:10:03,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-24 13:10:04,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-24 13:10:04,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-24 13:10:05,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-24 13:10:05,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:10:05,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-24 13:10:06,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:10:06,419 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-24 13:10:06,419 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:10:06,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-24 13:10:06,419 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:06,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:06,424 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:10:06,428 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:10:06,429 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:10:06,433 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:10:06,438 [ scc.git] DEBUG Already up to date.
2024-07-24 13:10:06,439 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-24 13:10:06,827 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-24 13:10:06,828 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-24 13:10:06,831 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:10:06,831 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:06,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:06,835 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-24 13:10:06,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:06,845 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-24 13:10:06,854 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-24 13:10:06,854 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:10:06,856 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-24 13:10:06,856 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-24 13:10:07,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:07,045 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:10:07,080 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:07,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:07,084 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:07,119 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:07,124 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb18402bb0> has no local changes
2024-07-24 13:10:07,124 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:07,131 [ scc.git] DEBUG [detached HEAD 90492a0] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:07,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:07,132 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:10:07,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-24 13:10:08,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-24 13:10:08,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-24 13:10:09,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-24 13:10:09,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:10:10,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-24 13:10:10,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:10:10,683 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-24 13:10:10,684 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:10:10,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-24 13:10:10,684 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:10,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:10,689 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:10:10,693 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:10:10,694 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:10:10,698 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:10:10,703 [ scc.git] DEBUG Already up to date.
2024-07-24 13:10:10,703 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-24 13:10:11,086 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-24 13:10:11,086 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-24 13:10:11,089 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:10:11,089 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:11,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:11,094 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-24 13:10:11,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:11,103 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-24 13:10:11,113 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-24 13:10:11,113 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-24 13:10:11,113 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-24 13:10:11,113 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-24 13:10:11,113 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-24 13:10:11,113 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-24 13:10:11,113 [ scc.git] DEBUG Auto-merging setup.py
2024-07-24 13:10:11,113 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-24 13:10:11,113 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 13:10:11,114 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 13:10:11,118 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-24 13:10:11,124 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-24 13:10:11,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:11,300 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-24 13:10:11,305 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-24 13:10:11,309 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#134](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-07-24 13:10:11,314 [ scc.config] DEBUG Found github.token
2024-07-24 13:10:11,314 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-24 13:10:11,314 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:10:11,349 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:11,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:11,353 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:11,388 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:11,393 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb183f1700> has no local changes
2024-07-24 13:10:11,393 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:11,400 [ scc.git] DEBUG [detached HEAD dee3d09] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:11,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:11,401 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:10:11,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-24 13:10:12,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-24 13:10:12,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-24 13:10:13,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-24 13:10:13,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:10:14,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-24 13:10:14,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:10:14,798 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-24 13:10:14,798 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:10:14,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-24 13:10:14,798 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:14,798 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:14,803 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:10:14,808 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:10:14,808 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:10:14,813 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:10:14,818 [ scc.git] DEBUG Already up to date.
2024-07-24 13:10:14,818 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-24 13:10:15,229 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-24 13:10:15,229 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-24 13:10:15,232 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:10:15,233 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:15,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:15,237 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-24 13:10:15,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:15,248 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-07-24 13:10:15,260 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 13:10:15,262 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-24 13:10:15,262 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-24 13:10:15,262 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-24 13:10:15,262 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-24 13:10:15,262 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-24 13:10:15,262 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-24 13:10:15,262 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-24 13:10:15,264 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-24 13:10:15,264 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-24 13:10:15,264 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-24 13:10:15,264 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-24 13:10:15,264 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-24 13:10:15,264 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-24 13:10:15,264 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-24 13:10:15,264 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-24 13:10:15,264 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-24 13:10:15,265 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-24 13:10:15,265 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-24 13:10:15,265 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-24 13:10:15,265 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-24 13:10:15,265 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-24 13:10:15,265 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-24 13:10:15,265 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-24 13:10:15,265 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-24 13:10:15,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:15,431 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:10:15,466 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:15,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:15,470 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:15,504 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:15,510 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb183bc610> has no local changes
2024-07-24 13:10:15,510 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:15,518 [ scc.git] DEBUG [detached HEAD fdc6177] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:15,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:15,519 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:10:15,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-24 13:10:15,870 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:10:15,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-24 13:10:15,870 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:15,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:15,874 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:10:15,879 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:10:15,879 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:10:15,883 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:10:15,888 [ scc.git] DEBUG Already up to date.
2024-07-24 13:10:15,888 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:10:15,889 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:15,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:15,893 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:10:15,927 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:15,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:15,932 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:15,968 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:15,973 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb1835afd0> has no local changes
2024-07-24 13:10:15,973 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:15,981 [ scc.git] DEBUG [detached HEAD 5f0d58f] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:15,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:15,981 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:10:16,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-24 13:10:16,355 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:10:16,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-24 13:10:16,355 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:16,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:16,360 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:10:16,364 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:10:16,364 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:10:16,369 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:10:16,373 [ scc.git] DEBUG Already up to date.
2024-07-24 13:10:16,374 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:10:16,374 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:16,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:16,378 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:10:16,413 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:16,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:16,417 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:16,454 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:16,459 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb183b9d00> has no local changes
2024-07-24 13:10:16,459 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:16,466 [ scc.git] DEBUG [detached HEAD d67d172] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:16,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:16,467 [ scc.git] INFO Overriding base-branch from master to main
2024-07-24 13:10:16,467 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:10:16,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-24 13:10:17,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-24 13:10:17,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-24 13:10:18,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-24 13:10:18,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-24 13:10:19,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:10:19,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 13:10:20,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-24 13:10:20,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:10:20,860 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-24 13:10:20,860 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:10:20,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-24 13:10:20,860 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:20,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:20,865 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-24 13:10:20,870 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:10:20,870 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-24 13:10:20,874 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-24 13:10:20,879 [ scc.git] DEBUG Already up to date.
2024-07-24 13:10:20,879 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-24 13:10:21,247 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-24 13:10:21,247 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-24 13:10:21,251 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:10:21,251 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:21,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:21,256 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-24 13:10:21,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:21,265 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-24 13:10:21,273 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-24 13:10:21,274 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-24 13:10:21,274 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 13:10:21,274 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 13:10:21,279 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-24 13:10:21,284 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-24 13:10:21,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:21,468 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-24 13:10:21,473 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-24 13:10:21,477 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#134](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-24 13:10:21,482 [ scc.config] DEBUG Found github.token
2024-07-24 13:10:21,482 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-24 13:10:21,482 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:10:21,517 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:21,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:21,522 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:21,556 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:21,562 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb183adf10> has no local changes
2024-07-24 13:10:21,562 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:21,569 [ scc.git] DEBUG [detached HEAD 6357330] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:21,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:21,570 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:10:21,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-24 13:10:21,916 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:10:21,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-24 13:10:21,916 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:21,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:21,920 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:10:21,924 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:10:21,925 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:10:21,929 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:10:21,934 [ scc.git] DEBUG Already up to date.
2024-07-24 13:10:21,934 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:10:21,934 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:21,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:21,938 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:10:21,973 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:21,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:21,978 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:22,012 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:22,017 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb183b7700> has no local changes
2024-07-24 13:10:22,017 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:22,024 [ scc.git] DEBUG [detached HEAD 0731a11] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:22,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:22,025 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:10:22,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-24 13:10:22,361 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:10:22,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-24 13:10:22,361 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:22,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:22,365 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:10:22,370 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:10:22,370 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:10:22,375 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:10:22,379 [ scc.git] DEBUG Already up to date.
2024-07-24 13:10:22,380 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:10:22,380 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:22,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:22,384 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:10:22,419 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:22,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:22,423 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:22,458 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:22,463 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb183804f0> has no local changes
2024-07-24 13:10:22,463 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:22,470 [ scc.git] DEBUG [detached HEAD 4ba3518] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:22,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:22,471 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:10:22,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-24 13:10:23,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-24 13:10:23,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-24 13:10:24,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-24 13:10:24,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:10:25,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-24 13:10:25,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:10:25,740 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-24 13:10:25,740 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:10:25,740 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-24 13:10:25,740 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:25,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:25,745 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 13:10:25,750 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:10:25,750 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 13:10:25,755 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 13:10:25,760 [ scc.git] DEBUG Already up to date.
2024-07-24 13:10:25,760 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-24 13:10:26,116 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-24 13:10:26,116 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-24 13:10:26,119 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:10:26,119 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:26,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:26,124 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-24 13:10:26,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:26,133 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-24 13:10:26,143 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-24 13:10:26,143 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-24 13:10:26,143 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 13:10:26,143 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 13:10:26,148 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-24 13:10:26,154 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-24 13:10:26,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:26,336 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-24 13:10:26,340 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-24 13:10:26,345 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#134](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-24 13:10:26,349 [ scc.config] DEBUG Found github.token
2024-07-24 13:10:26,350 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-24 13:10:26,350 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:10:26,385 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:26,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:26,389 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:26,424 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:26,429 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb183238b0> has no local changes
2024-07-24 13:10:26,429 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:26,437 [ scc.git] DEBUG [detached HEAD 8305395] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:26,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:26,438 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-24 13:10:26,438 [ scc.repo] DEBUG ## PRs found:
2024-07-24 13:10:27,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-24 13:10:27,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-24 13:10:28,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-24 13:10:28,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-24 13:10:29,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-24 13:10:29,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-24 13:10:30,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-24 13:10:30,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-24 13:10:31,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 13:10:31,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-24 13:10:32,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-24 13:10:32,169 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-24 13:10:32,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-24 13:10:33,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-24 13:10:33,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-24 13:10:34,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-24 13:10:34,318 [ scc.repo] DEBUG ## Branches found:
2024-07-24 13:10:34,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-24 13:10:34,318 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:34,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:34,324 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-24 13:10:34,328 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 13:10:34,328 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-24 13:10:34,333 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-24 13:10:34,338 [ scc.git] DEBUG Already up to date.
2024-07-24 13:10:34,339 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-24 13:10:34,722 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-24 13:10:34,722 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-24 13:10:34,726 [ scc.git] DEBUG ## Unique users: []
2024-07-24 13:10:34,726 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:34,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:34,730 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-24 13:10:34,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:34,741 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-24 13:10:34,751 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-24 13:10:34,751 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-24 13:10:34,751 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 13:10:34,752 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 13:10:34,756 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-24 13:10:34,762 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-24 13:10:34,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:34,939 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-24 13:10:34,946 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-24 13:10:34,951 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#134](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-24 13:10:34,955 [ scc.config] DEBUG Found github.token
2024-07-24 13:10:34,955 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-24 13:10:34,955 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 13:10:34,990 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 13:10:34,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 13:10:34,995 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:35,029 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:35,035 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb18323580> has no local changes
2024-07-24 13:10:35,035 [ 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#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:35,044 [ scc.git] DEBUG [detached HEAD e49492b] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:35,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:35,044 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 13:10:35,112 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-24 13:10:35,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:35,361 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-24 13:10:35,365 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-24 13:10:35,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:35,786 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-24 13:10:35,790 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-24 13:10:36,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:36,205 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-24 13:10:36,209 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-24 13:10:36,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:36,631 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-24 13:10:37,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:37,163 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-24 13:10:37,167 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-24 13:10:37,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:37,594 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-24 13:10:37,598 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-24 13:10:38,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:38,009 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-24 13:10:38,013 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-24 13:10:38,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:38,429 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-24 13:10:38,434 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-24 13:10:38,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:38,848 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-24 13:10:38,852 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-24 13:10:39,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:39,271 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-24 13:10:39,275 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-24 13:10:39,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:39,697 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-24 13:10:39,701 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-24 13:10:40,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:40,117 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-24 13:10:40,121 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-24 13:10:40,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:40,546 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-24 13:10:40,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:40,972 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-24 13:10:41,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:41,403 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-24 13:10:41,407 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-24 13:10:41,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:41,835 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-24 13:10:42,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:42,231 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-24 13:10:42,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:42,653 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-24 13:10:42,657 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-24 13:10:43,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:43,083 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-24 13:10:43,087 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-24 13:10:43,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:43,510 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-24 13:10:43,514 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-24 13:10:43,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:43,937 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-24 13:10:43,941 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-24 13:10:44,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 13:10:44,392 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-24 13:10:44,392 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 13:10:44,465 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffb1c975460> has local changes
2024-07-24 13:10:44,466 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 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 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#134 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/134/)'
2024-07-24 13:10:44,478 [ scc.git] DEBUG [detached HEAD f67ef2e] merge master -Dorg -Ssuccess-only
2024-07-24 13:10:44,479 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-24 13:10:44,479 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-24 13:10:44,479 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,479 [ scc.merge] INFO
2024-07-24 13:10:44,479 [ scc.merge] INFO
2024-07-24 13:10:44,479 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-24 13:10:44,479 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,479 [ scc.merge] INFO
2024-07-24 13:10:44,479 [ scc.merge] INFO
2024-07-24 13:10:44,479 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-24 13:10:44,479 [ scc.merge] INFO Excluded PRs:
2024-07-24 13:10:44,479 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-24 13:10:44,479 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,479 [ scc.merge] INFO
2024-07-24 13:10:44,479 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,479 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-24 13:10:44,479 [ scc.merge] INFO
2024-07-24 13:10:44,479 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-24 13:10:44,479 [ scc.merge] INFO Excluded PRs:
2024-07-24 13:10:44,479 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-24 13:10:44,479 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-24 13:10:44,479 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-24 13:10:44,479 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-24 13:10:44,479 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,479 [ scc.merge] INFO
2024-07-24 13:10:44,480 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-24 13:10:44,480 [ scc.merge] INFO
2024-07-24 13:10:44,480 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-24 13:10:44,480 [ scc.merge] INFO Excluded PRs:
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-24 13:10:44,480 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,480 [ scc.merge] INFO
2024-07-24 13:10:44,480 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-24 13:10:44,480 [ scc.merge] INFO
2024-07-24 13:10:44,480 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-24 13:10:44,480 [ scc.merge] INFO
2024-07-24 13:10:44,480 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-24 13:10:44,480 [ scc.merge] INFO Excluded PRs:
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-24 13:10:44,480 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,480 [ scc.merge] INFO
2024-07-24 13:10:44,480 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-24 13:10:44,480 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-07-24 13:10:44,480 [ scc.merge] INFO
2024-07-24 13:10:44,480 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-24 13:10:44,480 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,481 [ scc.merge] INFO
2024-07-24 13:10:44,481 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-24 13:10:44,481 [ scc.merge] INFO
2024-07-24 13:10:44,481 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-24 13:10:44,481 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,481 [ scc.merge] INFO
2024-07-24 13:10:44,481 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-24 13:10:44,481 [ scc.merge] INFO
2024-07-24 13:10:44,481 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-24 13:10:44,481 [ scc.merge] INFO Excluded PRs:
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-24 13:10:44,481 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,481 [ scc.merge] INFO
2024-07-24 13:10:44,481 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-24 13:10:44,481 [ scc.merge] INFO
2024-07-24 13:10:44,481 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-24 13:10:44,481 [ scc.merge] INFO Excluded PRs:
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-24 13:10:44,481 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,481 [ scc.merge] INFO
2024-07-24 13:10:44,481 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-24 13:10:44,481 [ scc.merge] INFO
2024-07-24 13:10:44,481 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-24 13:10:44,481 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,481 [ scc.merge] INFO
2024-07-24 13:10:44,481 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-24 13:10:44,481 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-24 13:10:44,482 [ scc.merge] INFO
2024-07-24 13:10:44,482 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-24 13:10:44,482 [ scc.merge] INFO Excluded PRs:
2024-07-24 13:10:44,482 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-24 13:10:44,482 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-24 13:10:44,482 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-24 13:10:44,482 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,482 [ scc.merge] INFO
2024-07-24 13:10:44,482 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,482 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-24 13:10:44,482 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-24 13:10:44,482 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-24 13:10:44,482 [ scc.merge] INFO
2024-07-24 13:10:44,482 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-24 13:10:44,482 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,482 [ scc.merge] INFO
2024-07-24 13:10:44,482 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,482 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-24 13:10:44,482 [ scc.merge] INFO
2024-07-24 13:10:44,482 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-24 13:10:44,482 [ scc.merge] INFO Excluded PRs:
2024-07-24 13:10:44,482 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-24 13:10:44,482 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,482 [ scc.merge] INFO
2024-07-24 13:10:44,482 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,482 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-24 13:10:44,482 [ scc.merge] INFO
2024-07-24 13:10:44,482 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-24 13:10:44,482 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,482 [ scc.merge] INFO
2024-07-24 13:10:44,482 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 13:10:44,482 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-24 13:10:44,482 [ scc.merge] INFO
2024-07-24 13:10:44,482 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-24 13:10:44,482 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,482 [ scc.merge] INFO
2024-07-24 13:10:44,482 [ scc.merge] INFO Merged PRs:
2024-07-24 13:10:44,482 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-24 13:10:44,483 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-24 13:10:44,483 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-24 13:10:44,483 [ scc.merge] INFO Excluded PRs:
2024-07-24 13:10:44,483 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-24 13:10:44,483 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 13:10:44,483 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-24 13:10:44,483 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-24 13:10:44,483 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-24 13:10:44,483 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 13:10:44,483 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-24 13:10:44,483 [ scc.merge] INFO
2024-07-24 13:10:44,483 [ scc.merge] INFO Repository: ome/scripts
2024-07-24 13:10:44,483 [ scc.merge] INFO Excluded PRs:
2024-07-24 13:10:44,483 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-24 13:10:44,483 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-24 13:10:44,483 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-24 13:10:44,483 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-24 13:10:44,484 [ scc.merge] INFO Already up to date.
2024-07-24 13:10:44,484 [ scc.merge] INFO
2024-07-24 13:10:44,484 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 13:10:44,484 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-24 13:10:44,484 [ scc.merge] INFO
2024-07-24 13:10:44,484 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-24 13:10:44,484 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-24 13:10:44,488 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-24 13:10:44,493 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-24 13:10:44,498 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-24 13:10:44,502 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-24 13:10:44,507 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-24 13:10:44,511 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-24 13:10:44,516 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-24 13:10:44,520 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-24 13:10:44,525 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-24 13:10:44,529 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-24 13:10:44,534 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-24 13:10:44,538 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-24 13:10:44,543 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-24 13:10:44,547 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-24 13:10:44,552 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-24 13:10:44,557 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-24 13:10:44,561 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-24 13:10:44,566 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-24 13:10:44,570 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-24 13:10:44,575 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-24 13:10:44,579 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-24 13:10:44,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-24 13:10:44,584 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 13:10:44,588 [ 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 78ef7f6] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from fefe87cf
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from c20d273
nothing to commit, working tree clean
[detached HEAD 7a5f0c5] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-07-24 13:11:29,756 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-07-24 13:11:39,301 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-07-24 13:11:41,864 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-24 13:11:46,639 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-24 13:12:35,902 [ 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