Skipping 183 KB..
Full Log2025-03-06 00:47:31,814 [ 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 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Generated by OMERO-plugins-push#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:47:31,825 [ scc.git] DEBUG [detached HEAD efe703a] merge master -Dorg -Ssuccess-only
2025-03-06 00:47:31,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:47:31,825 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:47:31,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:32,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-03-06 00:47:32,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:32,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503 HTTP/1.1" 200 None
2025-03-06 00:47:33,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:33,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503/comments HTTP/1.1" 200 None
2025-03-06 00:47:33,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:33,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-03-06 00:47:33,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:34,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-03-06 00:47:34,255 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-06 00:47:34,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:34,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-06 00:47:35,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:35,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-06 00:47:35,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:35,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-06 00:47:36,110 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:36,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-06 00:47:36,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:36,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/45d08b7e29871ecff0386975c975dacd0865bcc4?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:47:36,896 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-06 00:47:37,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:37,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-03-06 00:47:37,375 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-06 00:47:37,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:37,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-06 00:47:38,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:38,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-06 00:47:38,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:39,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-06 00:47:39,380 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:39,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-06 00:47:39,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:40,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:47:40,115 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-06 00:47:40,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:40,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-06 00:47:40,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:41,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-06 00:47:41,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:41,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-06 00:47:41,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:42,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-06 00:47:42,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:42,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-06 00:47:42,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:43,103 [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
2025-03-06 00:47:43,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:43,590 [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
2025-03-06 00:47:43,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:44,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-06 00:47:44,315 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:44,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:47:44,491 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-06 00:47:44,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:44,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-06 00:47:45,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:45,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-06 00:47:45,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:46,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-06 00:47:46,295 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:46,516 [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
2025-03-06 00:47:46,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:47,012 [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
2025-03-06 00:47:47,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:47,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-06 00:47:47,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:47,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:47:47,920 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-06 00:47:48,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:48,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-06 00:47:48,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:48,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-06 00:47:49,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:49,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-06 00:47:49,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:49,873 [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
2025-03-06 00:47:50,129 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:50,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-06 00:47:50,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:50,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:47:50,837 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-06 00:47:50,839 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:47:50,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-06 00:47:50,840 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:47:50,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:47:50,849 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:47:50,857 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:47:50,857 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:47:50,863 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:47:50,870 [ scc.git] DEBUG Already up to date.
2025-03-06 00:47:50,870 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-06 00:47:51,290 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-06 00:47:51,290 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-06 00:47:51,296 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-06 00:47:53,485 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-06 00:47:53,485 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-06 00:47:53,491 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-06 00:47:53,902 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-06 00:47:53,902 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-06 00:47:53,908 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-06 00:47:54,204 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-06 00:47:54,204 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-06 00:47:54,210 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-06 00:47:54,497 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-06 00:47:54,498 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-06 00:47:54,503 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:47:54,504 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:47:54,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:47:54,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-06 00:47:54,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:47:54,532 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-06 00:47:54,552 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-06 00:47:54,553 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-06 00:47:54,554 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-06 00:47:54,558 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-06 00:47:54,558 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-06 00:47:54,558 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-06 00:47:54,561 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:54,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:47:54,722 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-06 00:47:54,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:47:54,738 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-06 00:47:54,943 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-06 00:47:54,944 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-06 00:47:54,944 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-06 00:47:54,944 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-06 00:47:54,944 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-06 00:47:54,951 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-06 00:47:54,951 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-06 00:47:54,951 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-06 00:47:54,951 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-06 00:47:54,951 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-06 00:47:54,951 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-06 00:47:54,952 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-06 00:47:54,952 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-06 00:47:54,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:55,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:47:55,191 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-06 00:47:55,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:47:55,209 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-06 00:47:55,226 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-06 00:47:55,227 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-06 00:47:55,231 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-06 00:47:55,231 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-06 00:47:55,231 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-06 00:47:55,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:55,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:47:55,660 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-06 00:47:55,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:47:55,680 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-06 00:47:55,703 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-06 00:47:55,714 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-06 00:47:55,715 [ scc.git] DEBUG package.json | 2 +-
2025-03-06 00:47:55,715 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-06 00:47:55,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:56,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:47:56,083 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-06 00:47:56,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:47:56,166 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-06 00:47:56,369 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-06 00:47:56,369 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-06 00:47:56,370 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-06 00:47:56,370 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-06 00:47:56,378 [ scc.git] DEBUG Calling 'git reset --hard f0be961f51323d8c13941a388e7f79012e670d8a'
2025-03-06 00:47:56,389 [ scc.git] DEBUG HEAD is now at f0be961 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-06 00:47:56,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:56,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:47:56,563 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-06 00:47:56,570 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-06 00:47:56,579 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#353](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-06 00:47:56,585 [ scc.config] DEBUG Found github.token
2025-03-06 00:47:56,585 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-06 00:47:56,586 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:47:56,634 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:47:56,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:47:56,641 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:47:56,688 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:47:56,700 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2328322520> has no local changes
2025-03-06 00:47:56,700 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- 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 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:47:56,715 [ scc.git] DEBUG [detached HEAD fd8e29f] merge master -Dorg -Ssuccess-only
2025-03-06 00:47:56,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:47:56,715 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:47:56,815 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:57,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-06 00:47:57,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:57,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-06 00:47:57,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:58,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-06 00:47:58,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:58,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-06 00:47:58,989 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:59,186 [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
2025-03-06 00:47:59,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:47:59,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-06 00:48:00,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:00,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:48:00,183 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-06 00:48:00,183 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:00,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-06 00:48:00,184 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:00,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:00,190 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:00,196 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:00,196 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:00,203 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:00,209 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:00,209 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-06 00:48:00,676 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-06 00:48:00,676 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-06 00:48:00,682 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:00,682 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:00,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:00,689 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-06 00:48:00,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:00,702 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-06 00:48:00,716 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-06 00:48:00,719 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-06 00:48:00,719 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-06 00:48:00,719 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-06 00:48:00,719 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-06 00:48:00,720 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-06 00:48:00,720 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-06 00:48:00,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:00,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:48:00,910 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:00,958 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:00,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:00,964 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:01,012 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:01,020 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f23293b2af0> has no local changes
2025-03-06 00:48:01,021 [ 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#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:01,031 [ scc.git] DEBUG [detached HEAD ab1c2c6] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:01,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:01,032 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:01,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:01,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-06 00:48:01,704 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:01,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-06 00:48:02,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:02,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-06 00:48:02,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:03,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-06 00:48:03,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:03,561 [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
2025-03-06 00:48:03,814 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:04,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-06 00:48:04,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:04,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:48:04,457 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-06 00:48:04,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:04,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-06 00:48:05,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:05,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-06 00:48:05,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:06,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-06 00:48:06,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:06,509 [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
2025-03-06 00:48:06,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:07,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-06 00:48:07,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:07,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:48:07,469 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-06 00:48:07,469 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:07,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-06 00:48:07,470 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:07,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:07,476 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:07,481 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:07,481 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:07,488 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:07,495 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:07,496 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-06 00:48:08,155 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-06 00:48:08,155 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-06 00:48:08,161 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-06 00:48:08,733 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-06 00:48:08,733 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-06 00:48:08,738 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:08,738 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:08,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:08,745 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-06 00:48:08,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:08,760 [ 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'
2025-03-06 00:48:08,963 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-06 00:48:08,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-06 00:48:08,963 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-06 00:48:08,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-06 00:48:08,964 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-06 00:48:08,965 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-06 00:48:08,971 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-06 00:48:08,980 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-06 00:48:08,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:09,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:48:09,146 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-06 00:48:09,157 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-06 00:48:09,223 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#353](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-03-06 00:48:09,230 [ scc.config] DEBUG Found github.token
2025-03-06 00:48:09,230 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-06 00:48:09,230 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-06 00:48:09,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:09,245 [ 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'
2025-03-06 00:48:09,390 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-06 00:48:09,390 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-06 00:48:09,390 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-06 00:48:09,390 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-06 00:48:09,391 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-06 00:48:09,398 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-06 00:48:09,406 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-06 00:48:09,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:09,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:48:09,573 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-06 00:48:09,581 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-06 00:48:09,589 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#353](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/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
2025-03-06 00:48:09,595 [ scc.config] DEBUG Found github.token
2025-03-06 00:48:09,596 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-06 00:48:09,596 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:09,645 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:09,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:09,652 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:09,700 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:09,710 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2328365fa0> has no local changes
2025-03-06 00:48:09,710 [ 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#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:09,723 [ scc.git] DEBUG [detached HEAD baebac7] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:09,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:09,724 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:09,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:10,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-06 00:48:10,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:10,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-06 00:48:10,671 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-06 00:48:10,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:11,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-06 00:48:11,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:11,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-06 00:48:12,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:12,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-06 00:48:12,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:12,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-06 00:48:13,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:13,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:48:13,283 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-06 00:48:13,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:13,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-06 00:48:14,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:14,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-06 00:48:14,519 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:14,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-06 00:48:15,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:15,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-06 00:48:15,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:15,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-06 00:48:16,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:16,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-06 00:48:16,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:16,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-06 00:48:16,800 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:16,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-06 00:48:16,800 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:16,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:16,808 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:16,814 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:16,814 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:16,822 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:16,829 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:16,830 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-06 00:48:17,189 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-06 00:48:17,189 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-06 00:48:17,194 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:17,194 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:17,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:17,202 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-06 00:48:17,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:17,218 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-06 00:48:17,231 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-06 00:48:17,235 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-06 00:48:17,235 [ scc.git] DEBUG package.json | 2 +-
2025-03-06 00:48:17,235 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-06 00:48:17,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:17,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:48:17,406 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:17,457 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:17,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:17,464 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:17,514 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:17,522 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f232836c880> has no local changes
2025-03-06 00:48:17,523 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- 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 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Generated by OMERO-plugins-push#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:17,535 [ scc.git] DEBUG [detached HEAD db7684c] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:17,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:17,536 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:17,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:17,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-06 00:48:17,840 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:17,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-06 00:48:17,841 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:17,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:17,848 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:17,855 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:17,855 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:17,863 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:17,872 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:17,872 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:17,872 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:17,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:17,879 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:17,931 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:17,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:17,938 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:17,989 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:17,997 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f232835d220> has no local changes
2025-03-06 00:48:17,997 [ 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.
Generated by OMERO-plugins-push#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:18,008 [ scc.git] DEBUG [detached HEAD 63c5d28] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:18,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:18,009 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:18,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:18,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-06 00:48:18,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:18,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-06 00:48:19,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:19,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-06 00:48:19,346 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:19,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-06 00:48:19,346 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:19,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:19,354 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:19,362 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:19,362 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:19,371 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:19,379 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:19,379 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:19,379 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:19,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:19,386 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:19,438 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:19,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:19,446 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:19,500 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:19,508 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2328365af0> has no local changes
2025-03-06 00:48:19,508 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:19,519 [ scc.git] DEBUG [detached HEAD e2c16a4] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:19,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:19,520 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:19,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:19,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-06 00:48:20,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:20,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-06 00:48:20,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:20,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-06 00:48:21,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:21,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-06 00:48:21,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:22,016 [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
2025-03-06 00:48:22,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:22,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-06 00:48:22,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:23,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:48:23,026 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-06 00:48:23,026 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:23,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-06 00:48:23,026 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:23,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:23,033 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:23,040 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:23,040 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:23,048 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:23,057 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:23,057 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-06 00:48:23,478 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-06 00:48:23,479 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-06 00:48:23,484 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:23,485 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:23,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:23,492 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-06 00:48:23,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:23,507 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-06 00:48:23,730 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-06 00:48:23,730 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-06 00:48:23,730 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-06 00:48:23,731 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-06 00:48:23,731 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-06 00:48:23,731 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-06 00:48:23,731 [ scc.git] DEBUG Auto-merging setup.py
2025-03-06 00:48:23,731 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-06 00:48:23,731 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-06 00:48:23,731 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-06 00:48:23,739 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-06 00:48:23,750 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-06 00:48:23,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:23,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:48:23,916 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-06 00:48:23,924 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-06 00:48:23,985 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#353](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
--conflicts
2025-03-06 00:48:23,992 [ scc.config] DEBUG Found github.token
2025-03-06 00:48:23,993 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-06 00:48:23,993 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:24,048 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:24,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:24,055 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:24,106 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:24,114 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2328315fd0> has no local changes
2025-03-06 00:48:24,115 [ 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#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:24,126 [ scc.git] DEBUG [detached HEAD 82e45d0] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:24,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:24,127 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:24,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:24,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-06 00:48:24,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:24,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-06 00:48:25,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:25,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-06 00:48:25,705 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:25,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-06 00:48:26,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:26,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-06 00:48:26,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:26,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-06 00:48:27,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:27,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-06 00:48:27,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:27,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-06 00:48:28,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:28,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-06 00:48:28,705 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:28,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-06 00:48:29,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:29,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-06 00:48:29,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:29,945 [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
2025-03-06 00:48:30,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:30,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-06 00:48:30,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:30,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:48:30,964 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-06 00:48:30,965 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:30,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-06 00:48:30,965 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:30,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:30,972 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:30,978 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:30,978 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:30,984 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:30,991 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:30,991 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-06 00:48:31,459 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-06 00:48:31,459 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-06 00:48:31,465 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:31,465 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:31,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:31,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-06 00:48:31,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:31,489 [ 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'
2025-03-06 00:48:31,566 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-06 00:48:31,571 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-06 00:48:31,571 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-06 00:48:31,571 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-06 00:48:31,571 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-06 00:48:31,571 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-06 00:48:31,572 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-06 00:48:31,572 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-06 00:48:31,573 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-06 00:48:31,573 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-06 00:48:31,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-06 00:48:31,575 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-06 00:48:31,575 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-06 00:48:31,575 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-06 00:48:31,575 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-06 00:48:31,575 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-06 00:48:31,575 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-06 00:48:31,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-06 00:48:31,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-06 00:48:31,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-06 00:48:31,576 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-06 00:48:31,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:48:31,744 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:31,794 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:31,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:31,801 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:31,854 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:31,865 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2328365ca0> has no local changes
2025-03-06 00:48:31,866 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:31,880 [ scc.git] DEBUG [detached HEAD 8cb2b38] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:31,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:31,881 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:31,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:32,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-06 00:48:32,217 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:32,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-06 00:48:32,217 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:32,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:32,224 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:32,229 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:32,229 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:32,235 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:32,243 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:32,243 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:32,244 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:32,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:32,251 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:32,307 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:32,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:32,315 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:32,365 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:32,373 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f23282ba250> has no local changes
2025-03-06 00:48:32,374 [ 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#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:32,384 [ scc.git] DEBUG [detached HEAD 9bb4d06] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:32,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:32,385 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:32,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:32,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-06 00:48:33,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:33,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-06 00:48:33,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:33,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-06 00:48:33,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:34,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-06 00:48:34,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:34,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-06 00:48:35,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:35,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-06 00:48:35,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:35,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-06 00:48:35,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:36,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:48:36,111 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-06 00:48:36,111 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:36,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-06 00:48:36,111 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:36,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:36,118 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:36,124 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:36,125 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:36,131 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:36,138 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:36,138 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-06 00:48:36,904 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-06 00:48:36,905 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-06 00:48:36,911 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:36,911 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:36,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:36,918 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-06 00:48:36,924 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:36,930 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-06 00:48:36,943 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-06 00:48:36,946 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-06 00:48:36,946 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-06 00:48:36,946 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-06 00:48:36,947 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-06 00:48:36,947 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-06 00:48:36,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:37,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:48:37,108 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:37,160 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:37,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:37,167 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:37,215 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:37,223 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2328365d30> has no local changes
2025-03-06 00:48:37,223 [ 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.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:37,234 [ scc.git] DEBUG [detached HEAD a28eee2] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:37,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:37,235 [ scc.git] INFO Overriding base-branch from master to main
2025-03-06 00:48:37,235 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:37,360 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:37,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-06 00:48:37,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:38,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-06 00:48:38,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:38,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-06 00:48:38,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:39,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-06 00:48:39,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:39,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-06 00:48:39,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:40,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-06 00:48:40,433 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:40,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-06 00:48:40,908 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:41,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-06 00:48:41,389 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:41,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-06 00:48:41,860 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:42,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-06 00:48:42,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:42,658 [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
2025-03-06 00:48:42,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:43,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-06 00:48:43,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:43,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:48:43,654 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-06 00:48:43,655 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:43,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-06 00:48:43,655 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:43,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:43,661 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-06 00:48:43,667 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:43,667 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-06 00:48:43,673 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-06 00:48:43,680 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:43,680 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-06 00:48:43,976 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-06 00:48:43,977 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-06 00:48:43,983 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:43,983 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:43,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:43,990 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-06 00:48:43,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:44,006 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-06 00:48:44,188 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-06 00:48:44,188 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-06 00:48:44,188 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-06 00:48:44,189 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-06 00:48:44,196 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-06 00:48:44,204 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-06 00:48:44,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:44,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:48:44,367 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-06 00:48:44,376 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-06 00:48:44,386 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#353](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-06 00:48:44,393 [ scc.config] DEBUG Found github.token
2025-03-06 00:48:44,393 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-06 00:48:44,393 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:44,446 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:44,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:44,454 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:44,505 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:44,513 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f23282b8100> has no local changes
2025-03-06 00:48:44,513 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- 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#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:44,525 [ scc.git] DEBUG [detached HEAD 696a768] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:44,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:44,526 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:44,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:44,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-06 00:48:44,798 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:44,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-06 00:48:44,798 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:44,798 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:44,805 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:44,810 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:44,811 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:44,817 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:44,823 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:44,824 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:44,824 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:44,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:44,830 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:44,876 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:44,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:44,882 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:44,926 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:44,933 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f23282045b0> has no local changes
2025-03-06 00:48:44,934 [ 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#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:44,943 [ scc.git] DEBUG [detached HEAD 0fc43cf] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:44,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:44,944 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:45,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:45,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-06 00:48:45,243 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:45,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-06 00:48:45,243 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:45,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:45,251 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:45,257 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:45,257 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:45,263 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:45,270 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:45,270 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:45,270 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:45,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:45,276 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:45,321 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:45,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:45,326 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:45,374 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:45,382 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f23282d5520> has no local changes
2025-03-06 00:48:45,382 [ 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#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:45,393 [ scc.git] DEBUG [detached HEAD d01ef33] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:45,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:45,393 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:45,496 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:45,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-06 00:48:46,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:46,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-06 00:48:46,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:46,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-06 00:48:46,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:47,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-06 00:48:47,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:47,719 [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
2025-03-06 00:48:47,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:48,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-06 00:48:48,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:48,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:48:48,591 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-06 00:48:48,592 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:48,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-06 00:48:48,592 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:48,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:48,599 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-06 00:48:48,605 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:48,605 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-06 00:48:48,612 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-06 00:48:48,619 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:48,620 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-06 00:48:49,130 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-06 00:48:49,130 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-06 00:48:49,135 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:49,135 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:49,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:49,143 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-06 00:48:49,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:49,156 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-06 00:48:49,305 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-06 00:48:49,306 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-06 00:48:49,306 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-06 00:48:49,306 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-06 00:48:49,315 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-06 00:48:49,324 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-06 00:48:49,327 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:49,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:48:49,482 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-06 00:48:49,490 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-06 00:48:49,497 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#353](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-06 00:48:49,503 [ scc.config] DEBUG Found github.token
2025-03-06 00:48:49,504 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-06 00:48:49,504 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:49,554 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:49,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:49,562 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:49,609 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:49,617 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2328204610> has no local changes
2025-03-06 00:48:49,617 [ 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#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:49,629 [ scc.git] DEBUG [detached HEAD 7cda697] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:49,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:49,630 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-06 00:48:49,630 [ scc.repo] DEBUG ## PRs found:
2025-03-06 00:48:49,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:49,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-06 00:48:50,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:50,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-06 00:48:50,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:50,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-06 00:48:51,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:51,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-06 00:48:51,665 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:51,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-06 00:48:52,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:52,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-06 00:48:52,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:52,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-06 00:48:53,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:53,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:48:53,310 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-06 00:48:53,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:53,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-06 00:48:54,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:54,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-06 00:48:54,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:54,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-06 00:48:54,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:55,213 [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
2025-03-06 00:48:55,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:55,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-06 00:48:55,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:56,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-03-06 00:48:56,097 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-06 00:48:56,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:56,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-06 00:48:56,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:57,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-06 00:48:57,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:57,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-06 00:48:57,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:58,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-06 00:48:58,187 [ scc.repo] DEBUG ## Branches found:
2025-03-06 00:48:58,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-06 00:48:58,188 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:58,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:58,195 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-06 00:48:58,201 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-06 00:48:58,201 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-06 00:48:58,208 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-06 00:48:58,216 [ scc.git] DEBUG Already up to date.
2025-03-06 00:48:58,216 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-06 00:48:58,662 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-06 00:48:58,662 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-06 00:48:58,668 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-06 00:48:58,959 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-06 00:48:58,959 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-06 00:48:58,965 [ scc.git] DEBUG ## Unique users: []
2025-03-06 00:48:58,965 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:58,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:58,971 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-06 00:48:58,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:58,987 [ 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'
2025-03-06 00:48:59,091 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-03-06 00:48:59,091 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-06 00:48:59,092 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-06 00:48:59,098 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-06 00:48:59,105 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-06 00:48:59,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:59,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:48:59,280 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-06 00:48:59,290 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-06 00:48:59,298 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#353](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-06 00:48:59,305 [ scc.config] DEBUG Found github.token
2025-03-06 00:48:59,305 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-06 00:48:59,305 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-06 00:48:59,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:59,320 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-06 00:48:59,334 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-06 00:48:59,337 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-06 00:48:59,337 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-06 00:48:59,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:48:59,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:48:59,696 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-06 00:48:59,743 [ scc.git] DEBUG Get sha1 of %s
2025-03-06 00:48:59,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-06 00:48:59,750 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:59,793 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:48:59,800 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2328254ac0> has no local changes
2025-03-06 00:48:59,801 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- 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.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:48:59,811 [ scc.git] DEBUG [detached HEAD ca2479e] merge master -Dorg -Ssuccess-only
2025-03-06 00:48:59,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:48:59,811 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-06 00:48:59,899 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-06 00:48:59,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:00,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:00,121 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-06 00:49:00,126 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-06 00:49:00,360 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:00,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:00,541 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-06 00:49:00,546 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-06 00:49:00,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:00,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:00,967 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-06 00:49:00,974 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-06 00:49:01,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:01,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:01,391 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-06 00:49:01,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:01,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:01,806 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-06 00:49:01,812 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-06 00:49:02,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:02,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:02,227 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-06 00:49:02,234 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-06 00:49:02,465 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:02,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:02,654 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-06 00:49:02,661 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-06 00:49:02,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:03,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:03,085 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-06 00:49:03,091 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-06 00:49:03,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:03,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:03,502 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-06 00:49:03,507 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-06 00:49:03,740 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:03,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:03,921 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-06 00:49:03,927 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-06 00:49:04,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:04,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:04,339 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-06 00:49:04,344 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-06 00:49:04,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:04,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:04,761 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-06 00:49:04,767 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-06 00:49:05,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:05,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:05,183 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-06 00:49:05,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:05,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:05,624 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-06 00:49:05,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:06,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:06,080 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-06 00:49:06,086 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-06 00:49:06,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:06,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:06,510 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-06 00:49:06,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:06,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:06,924 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-06 00:49:07,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:07,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:07,344 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-06 00:49:07,350 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-06 00:49:07,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:07,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:07,761 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-06 00:49:07,766 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-06 00:49:08,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:08,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:08,178 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-06 00:49:08,183 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-06 00:49:08,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:08,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:08,596 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-06 00:49:08,601 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-06 00:49:08,837 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-06 00:49:09,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-06 00:49:09,024 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-06 00:49:09,025 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-06 00:49:09,125 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f232a745ca0> has local changes
2025-03-06 00:49:09,125 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
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.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 600 Rdornier 'Label on rois' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
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 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- 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 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
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 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- 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 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
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
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
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.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- 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 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.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#353 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/353/)'
2025-03-06 00:49:09,142 [ scc.git] DEBUG [detached HEAD 3445efb] merge master -Dorg -Ssuccess-only
2025-03-06 00:49:09,143 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-06 00:49:09,143 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-06 00:49:09,143 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,143 [ scc.merge] INFO
2025-03-06 00:49:09,143 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,143 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-06 00:49:09,143 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-06 00:49:09,143 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-06 00:49:09,143 [ scc.merge] INFO
2025-03-06 00:49:09,143 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-06 00:49:09,143 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,143 [ scc.merge] INFO
2025-03-06 00:49:09,143 [ scc.merge] INFO
2025-03-06 00:49:09,143 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-06 00:49:09,143 [ scc.merge] INFO Excluded PRs:
2025-03-06 00:49:09,143 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-06 00:49:09,144 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,144 [ scc.merge] INFO
2025-03-06 00:49:09,144 [ scc.merge] INFO
2025-03-06 00:49:09,144 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-06 00:49:09,144 [ scc.merge] INFO Excluded PRs:
2025-03-06 00:49:09,144 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-06 00:49:09,144 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-06 00:49:09,144 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,144 [ scc.merge] INFO
2025-03-06 00:49:09,144 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,144 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-06 00:49:09,144 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-06 00:49:09,144 [ scc.merge] INFO
2025-03-06 00:49:09,144 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-06 00:49:09,144 [ scc.merge] INFO Excluded PRs:
2025-03-06 00:49:09,144 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-03-06 00:49:09,144 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-06 00:49:09,144 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-06 00:49:09,144 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,144 [ scc.merge] INFO
2025-03-06 00:49:09,144 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,144 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-06 00:49:09,144 [ scc.merge] INFO
2025-03-06 00:49:09,144 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-06 00:49:09,144 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-06 00:49:09,144 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-06 00:49:09,144 [ scc.merge] INFO
2025-03-06 00:49:09,144 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-06 00:49:09,144 [ scc.merge] INFO Excluded PRs:
2025-03-06 00:49:09,144 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-06 00:49:09,145 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,145 [ scc.merge] INFO
2025-03-06 00:49:09,145 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-06 00:49:09,145 [ scc.merge] INFO
2025-03-06 00:49:09,145 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-06 00:49:09,145 [ scc.merge] INFO
2025-03-06 00:49:09,145 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-06 00:49:09,145 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,145 [ scc.merge] INFO
2025-03-06 00:49:09,145 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-06 00:49:09,145 [ scc.merge] INFO
2025-03-06 00:49:09,145 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-06 00:49:09,145 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,145 [ scc.merge] INFO
2025-03-06 00:49:09,145 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-06 00:49:09,145 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-06 00:49:09,145 [ scc.merge] INFO
2025-03-06 00:49:09,145 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-06 00:49:09,146 [ scc.merge] INFO
2025-03-06 00:49:09,146 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-06 00:49:09,146 [ scc.merge] INFO Excluded PRs:
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-06 00:49:09,146 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,146 [ scc.merge] INFO
2025-03-06 00:49:09,146 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-06 00:49:09,146 [ scc.merge] INFO
2025-03-06 00:49:09,146 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-06 00:49:09,146 [ scc.merge] INFO
2025-03-06 00:49:09,146 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-06 00:49:09,146 [ scc.merge] INFO Excluded PRs:
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-06 00:49:09,146 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,146 [ scc.merge] INFO
2025-03-06 00:49:09,146 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,146 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-06 00:49:09,146 [ scc.merge] INFO
2025-03-06 00:49:09,147 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-06 00:49:09,147 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,147 [ scc.merge] INFO
2025-03-06 00:49:09,147 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-06 00:49:09,147 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-06 00:49:09,147 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-06 00:49:09,147 [ scc.merge] INFO
2025-03-06 00:49:09,147 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-06 00:49:09,147 [ scc.merge] INFO Excluded PRs:
2025-03-06 00:49:09,147 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-06 00:49:09,147 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-06 00:49:09,147 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-06 00:49:09,147 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-06 00:49:09,147 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,147 [ scc.merge] INFO
2025-03-06 00:49:09,147 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,147 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-06 00:49:09,147 [ scc.merge] INFO
2025-03-06 00:49:09,147 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-06 00:49:09,147 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,147 [ scc.merge] INFO
2025-03-06 00:49:09,147 [ scc.merge] INFO
2025-03-06 00:49:09,147 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-06 00:49:09,147 [ scc.merge] INFO Excluded PRs:
2025-03-06 00:49:09,147 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-06 00:49:09,147 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-06 00:49:09,147 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,147 [ scc.merge] INFO
2025-03-06 00:49:09,147 [ scc.merge] INFO
2025-03-06 00:49:09,147 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-06 00:49:09,148 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,148 [ scc.merge] INFO
2025-03-06 00:49:09,148 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-06 00:49:09,148 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-06 00:49:09,148 [ scc.merge] INFO
2025-03-06 00:49:09,148 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-06 00:49:09,148 [ scc.merge] INFO Excluded PRs:
2025-03-06 00:49:09,148 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-06 00:49:09,148 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-06 00:49:09,148 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-06 00:49:09,148 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,148 [ scc.merge] INFO
2025-03-06 00:49:09,148 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,148 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-06 00:49:09,148 [ scc.merge] INFO
2025-03-06 00:49:09,148 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-06 00:49:09,148 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,148 [ scc.merge] INFO
2025-03-06 00:49:09,148 [ scc.merge] INFO
2025-03-06 00:49:09,148 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-06 00:49:09,148 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,148 [ scc.merge] INFO
2025-03-06 00:49:09,148 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,148 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-06 00:49:09,148 [ scc.merge] INFO
2025-03-06 00:49:09,148 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-06 00:49:09,148 [ scc.merge] INFO Excluded PRs:
2025-03-06 00:49:09,148 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-06 00:49:09,148 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-06 00:49:09,148 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,149 [ scc.merge] INFO
2025-03-06 00:49:09,149 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-06 00:49:09,149 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-06 00:49:09,149 [ scc.merge] INFO
2025-03-06 00:49:09,149 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-06 00:49:09,149 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,149 [ scc.merge] INFO
2025-03-06 00:49:09,149 [ scc.merge] INFO
2025-03-06 00:49:09,149 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-06 00:49:09,149 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,149 [ scc.merge] INFO
2025-03-06 00:49:09,149 [ scc.merge] INFO
2025-03-06 00:49:09,149 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-06 00:49:09,149 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,149 [ scc.merge] INFO
2025-03-06 00:49:09,149 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-06 00:49:09,149 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-06 00:49:09,149 [ scc.merge] INFO
2025-03-06 00:49:09,149 [ scc.merge] INFO Repository: ome/scripts
2025-03-06 00:49:09,149 [ scc.merge] INFO Excluded PRs:
2025-03-06 00:49:09,149 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-06 00:49:09,149 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-06 00:49:09,149 [ scc.merge] INFO Already up to date.
2025-03-06 00:49:09,149 [ scc.merge] INFO
2025-03-06 00:49:09,149 [ scc.merge] INFO Merged PRs:
2025-03-06 00:49:09,149 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-06 00:49:09,149 [ scc.merge] INFO
2025-03-06 00:49:09,149 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-06 00:49:09,149 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-06 00:49:09,149 [ scc.merge] INFO
2025-03-06 00:49:09,150 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-06 00:49:09,150 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-06 00:49:09,156 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,160 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-06 00:49:09,161 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-06 00:49:09,166 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-06 00:49:09,171 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-06 00:49:09,176 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-06 00:49:09,181 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,186 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-06 00:49:09,187 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-06 00:49:09,192 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-06 00:49:09,197 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-06 00:49:09,204 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-06 00:49:09,210 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-06 00:49:09,215 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-06 00:49:09,220 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-06 00:49:09,225 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-06 00:49:09,230 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-06 00:49:09,235 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-06 00:49:09,240 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-06 00:49:09,246 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-06 00:49:09,251 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-06 00:49:09,256 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-06 00:49:09,261 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,265 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-06 00:49:09,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-06 00:49:09,266 [ scc.git] DEBUG Calling 'git remote'
2025-03-06 00:49:09,271 [ 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.10.0 to 5.10.1-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 c8504ad] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
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 9cc36cde
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7a798ce
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
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 100f6ae
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 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD 13f7e0b] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-03-06 00:49:59,888 [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
2025-03-06 00:50:09,636 [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
2025-03-06 00:50:12,167 [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
2025-03-06 00:50:17,029 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-06 00:50:58,402 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/3d58bc78/images/svgs/logo.svg){kind=logo}
