Skipping 192 KB..
Full Log2025-03-22 00:48:36,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-22 00:48:36,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:36,779 [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-22 00:48:37,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:37,304 [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-22 00:48:37,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:37,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-22 00:48:38,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:38,311 [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-22 00:48:38,312 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-22 00:48:38,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:38,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-22 00:48:39,039 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:39,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-22 00:48:39,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:39,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-22 00:48:40,055 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:40,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-22 00:48:40,581 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:40,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-22 00:48:41,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:41,313 [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-22 00:48:41,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:41,789 [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-22 00:48:42,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:42,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-22 00:48:42,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:42,680 [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-22 00:48:42,681 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-22 00:48:42,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:43,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-22 00:48:43,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:43,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-22 00:48:43,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:44,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-22 00:48:44,484 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:44,759 [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-22 00:48:45,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:45,249 [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-22 00:48:45,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:45,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-22 00:48:45,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:46,124 [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-22 00:48:46,125 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-22 00:48:46,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:46,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-22 00:48:46,870 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:47,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-22 00:48:47,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:47,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-22 00:48:47,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:48,126 [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-22 00:48:48,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:48,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-22 00:48:48,834 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:48,999 [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-22 00:48:49,000 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-22 00:48:49,000 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:48:49,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-22 00:48:49,001 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:48:49,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:49,007 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:48:49,012 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:48:49,012 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:48:49,018 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:48:49,024 [ scc.git] DEBUG Already up to date.
2025-03-22 00:48:49,025 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-22 00:48:49,362 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-22 00:48:49,364 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-22 00:48:49,368 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-22 00:48:49,660 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-22 00:48:49,660 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-22 00:48:49,665 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-22 00:48:49,958 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-22 00:48:49,958 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-22 00:48:49,964 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-22 00:48:50,259 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-22 00:48:50,260 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-22 00:48:50,265 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-22 00:48:50,584 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-22 00:48:50,585 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-22 00:48:50,590 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:48:50,590 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:48:50,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:50,597 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-22 00:48:50,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:50,611 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-22 00:48:50,630 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-22 00:48:50,630 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-22 00:48:50,631 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-22 00:48:50,635 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-22 00:48:50,635 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-22 00:48:50,635 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-22 00:48:50,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:50,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:48:50,828 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-22 00:48:50,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:50,846 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-22 00:48:50,872 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-22 00:48:50,872 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-22 00:48:50,872 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-22 00:48:50,872 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-22 00:48:50,873 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-22 00:48:50,878 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-22 00:48:50,878 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-22 00:48:50,878 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-22 00:48:50,878 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-22 00:48:50,878 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-22 00:48:50,878 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-22 00:48:50,878 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-22 00:48:50,878 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-22 00:48:51,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:51,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:48:51,261 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-22 00:48:51,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:51,278 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-22 00:48:51,296 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-22 00:48:51,297 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-22 00:48:51,301 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-22 00:48:51,301 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-22 00:48:51,301 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-22 00:48:51,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:51,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:48:51,688 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-22 00:48:51,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:51,706 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-22 00:48:51,735 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-22 00:48:51,745 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-22 00:48:51,745 [ scc.git] DEBUG package.json | 2 +-
2025-03-22 00:48:51,745 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-22 00:48:51,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:52,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:48:52,117 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-22 00:48:52,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:52,133 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-22 00:48:52,175 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-22 00:48:52,175 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-22 00:48:52,176 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-22 00:48:52,176 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-22 00:48:52,184 [ scc.git] DEBUG Calling 'git reset --hard d71aebce6df2cf44a73200cb4ab79b8ec1b1a771'
2025-03-22 00:48:52,195 [ scc.git] DEBUG HEAD is now at d71aebc merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-22 00:48:52,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:52,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:48:52,536 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-22 00:48:52,543 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-22 00:48:52,551 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#363](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-22 00:48:52,557 [ scc.config] DEBUG Found github.token
2025-03-22 00:48:52,557 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-22 00:48:52,557 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:48:52,606 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:48:52,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:52,614 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:48:52,663 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:48:52,675 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec4725520> has no local changes
2025-03-22 00:48:52,675 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:48:52,689 [ scc.git] DEBUG [detached HEAD 32211fc] merge master -Dorg -Ssuccess-only
2025-03-22 00:48:52,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:48:52,690 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:48:52,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:53,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-22 00:48:53,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:53,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-22 00:48:53,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:54,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-22 00:48:54,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:54,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-22 00:48:54,889 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:55,121 [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-22 00:48:55,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:55,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-22 00:48:55,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:56,117 [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-22 00:48:56,118 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-22 00:48:56,118 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:48:56,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-22 00:48:56,119 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:48:56,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:56,125 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:48:56,130 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:48:56,130 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:48:56,136 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:48:56,142 [ scc.git] DEBUG Already up to date.
2025-03-22 00:48:56,142 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-22 00:48:56,458 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-22 00:48:56,458 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-22 00:48:56,464 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:48:56,464 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:48:56,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:56,470 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-22 00:48:56,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:56,482 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-22 00:48:56,494 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-22 00:48:56,497 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-22 00:48:56,498 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-22 00:48:56,498 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-22 00:48:56,498 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-22 00:48:56,498 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-22 00:48:56,498 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-22 00:48:56,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:56,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:48:56,669 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:48:56,716 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:48:56,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:48:56,723 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:48:56,768 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:48:56,776 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec47a7af0> has no local changes
2025-03-22 00:48:56,776 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:48:56,786 [ scc.git] DEBUG [detached HEAD c9ff98b] merge master -Dorg -Ssuccess-only
2025-03-22 00:48:56,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:48:56,787 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:48:56,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:57,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-22 00:48:57,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:57,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-22 00:48:57,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:58,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-22 00:48:58,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:58,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-22 00:48:58,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:59,243 [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-22 00:48:59,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:48:59,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-22 00:49:00,061 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:00,228 [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-22 00:49:00,229 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-22 00:49:00,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:00,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-22 00:49:00,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:01,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-22 00:49:01,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:01,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-22 00:49:01,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:02,187 [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-22 00:49:02,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:02,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-22 00:49:02,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:03,103 [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-22 00:49:03,104 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-22 00:49:03,104 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:03,104 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-22 00:49:03,104 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:03,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:03,111 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:49:03,116 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:03,116 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:49:03,122 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:49:03,129 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:03,129 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-22 00:49:03,527 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-22 00:49:03,527 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-22 00:49:03,532 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-22 00:49:03,858 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-22 00:49:03,858 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-22 00:49:03,863 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:03,863 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:03,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:03,872 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-22 00:49:03,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:03,889 [ 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-22 00:49:03,906 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-22 00:49:03,906 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-22 00:49:03,906 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-22 00:49:03,906 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-22 00:49:03,907 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-22 00:49:03,908 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-22 00:49:03,915 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-22 00:49:03,924 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-22 00:49:03,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:04,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:04,086 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-22 00:49:04,095 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-22 00:49:04,101 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#363](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-22 00:49:04,106 [ scc.config] DEBUG Found github.token
2025-03-22 00:49:04,107 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-22 00:49:04,107 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-22 00:49:04,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:04,120 [ 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-22 00:49:04,138 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-22 00:49:04,138 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-22 00:49:04,138 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-22 00:49:04,138 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-22 00:49:04,139 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-22 00:49:04,146 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-22 00:49:04,155 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-22 00:49:04,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:04,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:04,526 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-22 00:49:04,537 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-22 00:49:04,544 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#363](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/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-22 00:49:04,549 [ scc.config] DEBUG Found github.token
2025-03-22 00:49:04,549 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-22 00:49:04,549 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:04,597 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:04,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:04,604 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:04,652 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:04,660 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec4766a90> has no local changes
2025-03-22 00:49:04,661 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:04,672 [ scc.git] DEBUG [detached HEAD 893f6e9] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:04,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:04,673 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:04,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:05,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-22 00:49:05,351 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:05,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-22 00:49:05,644 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-22 00:49:05,895 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:06,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-22 00:49:06,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:06,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-22 00:49:06,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:07,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-22 00:49:07,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:07,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-22 00:49:08,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:08,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-03-22 00:49:08,373 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-22 00:49:08,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:08,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-22 00:49:08,857 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-22 00:49:09,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:09,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-22 00:49:09,670 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:09,957 [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-22 00:49:10,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:10,456 [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-22 00:49:10,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:11,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-22 00:49:11,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:11,455 [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-22 00:49:11,456 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-22 00:49:11,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:11,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-22 00:49:12,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:12,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-22 00:49:12,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:12,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-22 00:49:13,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:13,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-22 00:49:13,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:13,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-22 00:49:14,154 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:14,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-22 00:49:14,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:14,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-22 00:49:14,891 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:14,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-22 00:49:14,891 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:14,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:14,904 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:49:14,911 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:14,911 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:49:14,919 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:49:14,928 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:14,929 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-22 00:49:15,243 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-22 00:49:15,244 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-22 00:49:15,249 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-22 00:49:15,551 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-22 00:49:15,552 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-22 00:49:15,557 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:15,557 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:15,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:15,564 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-22 00:49:15,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:15,575 [ 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-22 00:49:15,587 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-22 00:49:15,591 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-22 00:49:15,591 [ scc.git] DEBUG package.json | 2 +-
2025-03-22 00:49:15,591 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-22 00:49:15,594 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:15,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:15,770 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-22 00:49:15,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:15,783 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-03-22 00:49:15,796 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-22 00:49:15,796 [ scc.git] DEBUG Auto-merging package.json
2025-03-22 00:49:15,798 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-22 00:49:15,801 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-22 00:49:15,802 [ scc.git] DEBUG package.json | 2 +-
2025-03-22 00:49:15,802 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-22 00:49:16,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:16,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:16,190 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:16,235 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:16,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:16,242 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:16,286 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:16,294 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec473f880> has no local changes
2025-03-22 00:49:16,295 [ 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'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Generated by OMERO-plugins-push#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:16,305 [ scc.git] DEBUG [detached HEAD f11e209] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:16,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:16,305 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:16,442 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:16,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-22 00:49:16,648 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:16,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-22 00:49:16,648 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:16,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:16,655 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:49:16,660 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:16,661 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:49:16,667 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:49:16,675 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:16,675 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:16,675 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:16,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:16,681 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:16,726 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:16,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:16,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:16,776 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:16,785 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec4763220> has no local changes
2025-03-22 00:49:16,786 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:16,798 [ scc.git] DEBUG [detached HEAD cbfd3db] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:16,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:16,799 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:16,900 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:17,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-22 00:49:17,490 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:17,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-22 00:49:17,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:18,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-22 00:49:18,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:18,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-22 00:49:18,728 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:18,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-22 00:49:18,728 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:18,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:18,735 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:49:18,740 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:18,740 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:49:18,747 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:49:18,753 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:18,754 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:18,754 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:18,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:18,759 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:18,807 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:18,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:18,814 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:18,861 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:18,869 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec4766fa0> has no local changes
2025-03-22 00:49:18,869 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:18,880 [ scc.git] DEBUG [detached HEAD 73848c9] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:18,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:18,881 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:18,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:19,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-22 00:49:19,484 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:19,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-22 00:49:19,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:20,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-22 00:49:20,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:20,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-22 00:49:20,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:21,179 [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-22 00:49:21,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:21,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-22 00:49:21,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:22,161 [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-22 00:49:22,162 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-22 00:49:22,162 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:22,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-22 00:49:22,162 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:22,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:22,170 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:49:22,177 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:22,177 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:49:22,184 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:49:22,191 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:22,191 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-22 00:49:22,517 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-22 00:49:22,517 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-22 00:49:22,523 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:22,523 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:22,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:22,533 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-22 00:49:22,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:22,546 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-22 00:49:22,560 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-22 00:49:22,560 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-22 00:49:22,560 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-22 00:49:22,560 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-22 00:49:22,560 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-22 00:49:22,560 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-22 00:49:22,560 [ scc.git] DEBUG Auto-merging setup.py
2025-03-22 00:49:22,560 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-22 00:49:22,560 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-22 00:49:22,561 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-22 00:49:22,567 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-22 00:49:22,575 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-22 00:49:22,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:22,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:22,746 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-22 00:49:22,754 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-22 00:49:22,761 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#363](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2025-03-22 00:49:22,768 [ scc.config] DEBUG Found github.token
2025-03-22 00:49:22,768 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-22 00:49:22,768 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:22,815 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:22,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:22,821 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:22,864 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:22,872 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec4703fd0> has no local changes
2025-03-22 00:49:22,872 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:22,883 [ scc.git] DEBUG [detached HEAD a9641b4] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:22,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:22,883 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:22,998 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:23,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-22 00:49:23,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:23,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-22 00:49:24,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:24,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-22 00:49:24,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:24,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-22 00:49:25,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:25,317 [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-22 00:49:25,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:25,792 [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-22 00:49:26,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:26,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-22 00:49:26,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:26,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-22 00:49:26,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:27,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-22 00:49:27,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:27,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-22 00:49:27,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:28,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-22 00:49:28,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:28,713 [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-22 00:49:28,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:29,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-22 00:49:29,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:29,595 [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-22 00:49:29,596 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-22 00:49:29,596 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:29,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-22 00:49:29,596 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:29,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:29,603 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:49:29,609 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:29,610 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:49:29,616 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:49:29,622 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:29,622 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-22 00:49:29,952 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-22 00:49:29,952 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-22 00:49:29,958 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:29,958 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:29,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:29,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-22 00:49:29,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:29,978 [ 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-22 00:49:29,997 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-22 00:49:30,001 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-22 00:49:30,001 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-22 00:49:30,001 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-22 00:49:30,001 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-22 00:49:30,001 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-22 00:49:30,001 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-22 00:49:30,001 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-22 00:49:30,001 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-22 00:49:30,002 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-22 00:49:30,002 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-22 00:49:30,003 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-22 00:49:30,003 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-22 00:49:30,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:30,005 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-22 00:49:30,005 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-22 00:49:30,005 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-22 00:49:30,005 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-22 00:49:30,005 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-22 00:49:30,005 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-22 00:49:30,005 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-22 00:49:30,005 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-22 00:49:30,005 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-22 00:49:30,005 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-22 00:49:30,005 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-22 00:49:30,005 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-22 00:49:30,005 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-22 00:49:30,005 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-22 00:49:30,005 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-22 00:49:30,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-22 00:49:30,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-22 00:49:30,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-22 00:49:30,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-22 00:49:30,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-22 00:49:30,006 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-22 00:49:30,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:30,181 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:30,230 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:30,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:30,237 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:30,283 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:30,294 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec4766d90> has no local changes
2025-03-22 00:49:30,294 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:30,306 [ scc.git] DEBUG [detached HEAD eed8dfa] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:30,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:30,307 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:30,433 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:30,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-22 00:49:30,618 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:30,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-22 00:49:30,618 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:30,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:30,625 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:49:30,631 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:30,631 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:49:30,637 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:49:30,644 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:30,644 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:30,644 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:30,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:30,650 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:30,695 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:30,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:30,702 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:30,748 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:30,756 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec46eb250> has no local changes
2025-03-22 00:49:30,756 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:30,766 [ scc.git] DEBUG [detached HEAD 6161356] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:30,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:30,767 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:30,870 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:31,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-22 00:49:31,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:31,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-22 00:49:31,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:32,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-22 00:49:32,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:32,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-22 00:49:32,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:33,107 [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-22 00:49:33,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:33,569 [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-22 00:49:33,821 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:34,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-22 00:49:34,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:34,447 [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-22 00:49:34,448 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-22 00:49:34,448 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:34,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-22 00:49:34,448 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:34,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:34,455 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:49:34,460 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:34,461 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:49:34,467 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:49:34,473 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:34,473 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-22 00:49:34,773 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-22 00:49:34,774 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-22 00:49:34,779 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:34,779 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:34,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:34,786 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-22 00:49:34,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:34,799 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-22 00:49:34,811 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-22 00:49:34,813 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-22 00:49:34,813 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-22 00:49:34,813 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-22 00:49:34,813 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-22 00:49:34,813 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-22 00:49:34,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:34,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:34,975 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:35,025 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:35,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:35,031 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:35,076 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:35,084 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec4766d60> has no local changes
2025-03-22 00:49:35,084 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:35,093 [ scc.git] DEBUG [detached HEAD 03290cb] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:35,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:35,094 [ scc.git] INFO Overriding base-branch from master to main
2025-03-22 00:49:35,094 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:35,227 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:35,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-22 00:49:35,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:36,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-22 00:49:36,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:36,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-22 00:49:36,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:37,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-22 00:49:37,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:37,530 [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-22 00:49:37,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:38,047 [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-22 00:49:38,299 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:38,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-22 00:49:38,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:39,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-22 00:49:39,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:39,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-22 00:49:39,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:40,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-22 00:49:40,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:40,526 [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-22 00:49:40,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:41,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-22 00:49:41,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:41,483 [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-22 00:49:41,484 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-22 00:49:41,485 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:41,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-22 00:49:41,485 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:41,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:41,492 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-22 00:49:41,498 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:41,498 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-22 00:49:41,505 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-22 00:49:41,511 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:41,512 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-22 00:49:41,920 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-22 00:49:41,920 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-22 00:49:41,925 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:41,925 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:41,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:41,932 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-22 00:49:41,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:41,944 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-22 00:49:41,958 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-22 00:49:41,959 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-22 00:49:41,959 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-22 00:49:41,959 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-22 00:49:41,966 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-22 00:49:41,973 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-22 00:49:41,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:42,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:42,150 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-22 00:49:42,157 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-22 00:49:42,163 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#363](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-22 00:49:42,168 [ scc.config] DEBUG Found github.token
2025-03-22 00:49:42,168 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-22 00:49:42,168 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:42,215 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:42,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:42,221 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:42,267 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:42,275 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec46f6100> has no local changes
2025-03-22 00:49:42,275 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:42,286 [ scc.git] DEBUG [detached HEAD 14af7ad] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:42,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:42,286 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:42,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:42,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-22 00:49:42,604 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:42,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-22 00:49:42,605 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:42,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:42,612 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:49:42,618 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:42,618 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:49:42,625 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:49:42,632 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:42,632 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:42,632 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:42,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:42,637 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:42,685 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:42,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:42,692 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:42,739 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:42,747 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec46055b0> has no local changes
2025-03-22 00:49:42,747 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:42,776 [ scc.git] DEBUG [detached HEAD bcd7780] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:42,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:42,777 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:42,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:43,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-22 00:49:43,046 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:43,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-22 00:49:43,046 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:43,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:43,054 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:49:43,061 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:43,061 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:49:43,068 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:49:43,074 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:43,075 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:43,075 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:43,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:43,080 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:43,126 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:43,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:43,133 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:43,177 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:43,184 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec46e0520> has no local changes
2025-03-22 00:49:43,184 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:43,194 [ scc.git] DEBUG [detached HEAD 9b757c2] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:43,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:43,195 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:43,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:43,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-22 00:49:43,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:44,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-22 00:49:44,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:44,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-22 00:49:44,723 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:45,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-22 00:49:45,274 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:45,495 [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-22 00:49:45,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:45,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-22 00:49:46,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:46,414 [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-22 00:49:46,415 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-22 00:49:46,415 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:46,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-22 00:49:46,415 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:46,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:46,422 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-22 00:49:46,428 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:46,428 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-22 00:49:46,435 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-22 00:49:46,441 [ scc.git] DEBUG Already up to date.
2025-03-22 00:49:46,442 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-22 00:49:46,766 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-22 00:49:46,766 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-22 00:49:46,771 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:46,772 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:46,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:46,778 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-22 00:49:46,783 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:46,790 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-22 00:49:46,804 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-22 00:49:46,804 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-22 00:49:46,804 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-22 00:49:46,805 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-22 00:49:46,812 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-22 00:49:46,821 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-22 00:49:46,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:46,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:46,984 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-22 00:49:46,991 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-22 00:49:46,997 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#363](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-22 00:49:47,003 [ scc.config] DEBUG Found github.token
2025-03-22 00:49:47,003 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-22 00:49:47,003 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:47,051 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:47,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:47,058 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:47,103 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:47,113 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec4605610> has no local changes
2025-03-22 00:49:47,114 [ 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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:47,124 [ scc.git] DEBUG [detached HEAD ed3d570] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:47,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:47,125 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-22 00:49:47,125 [ scc.repo] DEBUG ## PRs found:
2025-03-22 00:49:47,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:47,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-22 00:49:47,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:48,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-22 00:49:48,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:48,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-22 00:49:48,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:49,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-22 00:49:49,385 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:49,595 [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-22 00:49:49,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:50,067 [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-22 00:49:50,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:50,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-22 00:49:50,790 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:50,955 [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-22 00:49:50,956 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-22 00:49:51,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:51,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-22 00:49:51,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:51,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-22 00:49:52,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:52,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-22 00:49:52,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:52,861 [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-22 00:49:53,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:53,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-22 00:49:53,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:53,809 [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-22 00:49:53,810 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-22 00:49:54,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:54,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-22 00:49:54,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:54,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-22 00:49:55,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:55,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-22 00:49:55,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:55,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-22 00:49:55,858 [ scc.repo] DEBUG ## Branches found:
2025-03-22 00:49:55,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-22 00:49:55,858 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:55,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:55,865 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-22 00:49:55,871 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-22 00:49:55,871 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-22 00:49:55,878 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-22 00:49:55,891 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-03-22 00:49:56,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:56,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-03-22 00:49:56,455 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-22 00:49:56,789 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-22 00:49:56,789 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-22 00:49:56,794 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-22 00:49:57,116 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-22 00:49:57,116 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-22 00:49:57,122 [ scc.git] DEBUG ## Unique users: []
2025-03-22 00:49:57,122 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:57,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:57,129 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-22 00:49:57,138 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:57,145 [ 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-22 00:49:57,159 [ 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-22 00:49:57,160 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-22 00:49:57,160 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-22 00:49:57,167 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-22 00:49:57,175 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-03-22 00:49:57,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:57,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:57,339 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-22 00:49:57,350 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-22 00:49:57,359 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#363](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-22 00:49:57,369 [ scc.config] DEBUG Found github.token
2025-03-22 00:49:57,370 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-22 00:49:57,370 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-22 00:49:57,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:57,386 [ 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-22 00:49:57,400 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-22 00:49:57,404 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-22 00:49:57,404 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-22 00:49:57,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:57,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:57,759 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-22 00:49:57,807 [ scc.git] DEBUG Get sha1 of %s
2025-03-22 00:49:57,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-22 00:49:57,814 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:57,855 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:49:57,862 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec463e580> has no local changes
2025-03-22 00:49:57,863 [ 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)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:49:57,872 [ scc.git] DEBUG [detached HEAD 131fdb9] merge master -Dorg -Ssuccess-only
2025-03-22 00:49:57,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:49:57,873 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-22 00:49:57,958 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-22 00:49:58,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:58,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:58,195 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-22 00:49:58,200 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-22 00:49:58,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:58,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:58,617 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-22 00:49:58,623 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-22 00:49:58,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:59,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:59,028 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-22 00:49:59,033 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-22 00:49:59,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:59,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:59,459 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-22 00:49:59,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:49:59,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:49:59,868 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-22 00:49:59,873 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-22 00:50:00,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:00,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:00,282 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-22 00:50:00,287 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-22 00:50:00,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:00,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:00,701 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-22 00:50:00,707 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-22 00:50:00,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:01,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:01,122 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-22 00:50:01,128 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-22 00:50:01,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:01,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:01,545 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-22 00:50:01,551 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-22 00:50:01,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:01,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:01,958 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-22 00:50:01,964 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-22 00:50:02,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:02,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:02,373 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-22 00:50:02,380 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-22 00:50:02,613 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:02,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:02,789 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-22 00:50:02,795 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-22 00:50:03,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:03,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:03,220 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-22 00:50:03,453 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:03,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:03,670 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-22 00:50:03,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:04,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:04,082 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-22 00:50:04,088 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-22 00:50:04,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:04,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:04,502 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-22 00:50:04,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:04,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:04,936 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-22 00:50:05,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:05,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:05,354 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-22 00:50:05,358 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-22 00:50:05,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:05,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:05,784 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-22 00:50:05,789 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-22 00:50:06,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:06,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:06,223 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-22 00:50:06,228 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-22 00:50:06,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:06,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:06,635 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-22 00:50:06,643 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-22 00:50:06,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-22 00:50:07,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-22 00:50:07,076 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-22 00:50:07,076 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-22 00:50:07,171 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8ec5b44ca0> has local changes
2025-03-22 00:50:07,172 [ 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 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'
- PR 167 dominikl 'Add extinfo command'
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'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
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)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
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#363 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/363/)'
2025-03-22 00:50:07,189 [ scc.git] DEBUG [detached HEAD ee4f20b] merge master -Dorg -Ssuccess-only
2025-03-22 00:50:07,190 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-22 00:50:07,190 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-22 00:50:07,190 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,190 [ scc.merge] INFO
2025-03-22 00:50:07,190 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,190 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-22 00:50:07,190 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-22 00:50:07,190 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-22 00:50:07,190 [ scc.merge] INFO
2025-03-22 00:50:07,190 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-22 00:50:07,190 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,190 [ scc.merge] INFO
2025-03-22 00:50:07,190 [ scc.merge] INFO
2025-03-22 00:50:07,190 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-22 00:50:07,190 [ scc.merge] INFO Excluded PRs:
2025-03-22 00:50:07,190 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-22 00:50:07,190 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,191 [ scc.merge] INFO
2025-03-22 00:50:07,191 [ scc.merge] INFO
2025-03-22 00:50:07,191 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-22 00:50:07,191 [ scc.merge] INFO Excluded PRs:
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-22 00:50:07,191 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,191 [ scc.merge] INFO
2025-03-22 00:50:07,191 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-22 00:50:07,191 [ scc.merge] INFO
2025-03-22 00:50:07,191 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-22 00:50:07,191 [ scc.merge] INFO Excluded PRs:
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-22 00:50:07,191 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,191 [ scc.merge] INFO
2025-03-22 00:50:07,191 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-22 00:50:07,191 [ scc.merge] INFO
2025-03-22 00:50:07,191 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-22 00:50:07,191 [ scc.merge] INFO
2025-03-22 00:50:07,191 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-22 00:50:07,191 [ scc.merge] INFO Excluded PRs:
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-22 00:50:07,191 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-22 00:50:07,192 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,192 [ scc.merge] INFO
2025-03-22 00:50:07,192 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-22 00:50:07,192 [ scc.merge] INFO
2025-03-22 00:50:07,192 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-22 00:50:07,192 [ scc.merge] INFO
2025-03-22 00:50:07,192 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-22 00:50:07,192 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,192 [ scc.merge] INFO
2025-03-22 00:50:07,192 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-22 00:50:07,192 [ scc.merge] INFO
2025-03-22 00:50:07,192 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-22 00:50:07,192 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,192 [ scc.merge] INFO
2025-03-22 00:50:07,192 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-22 00:50:07,192 [ scc.merge] INFO
2025-03-22 00:50:07,192 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-22 00:50:07,192 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-22 00:50:07,192 [ scc.merge] INFO
2025-03-22 00:50:07,192 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-22 00:50:07,192 [ scc.merge] INFO Excluded PRs:
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-22 00:50:07,193 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,193 [ scc.merge] INFO
2025-03-22 00:50:07,193 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-22 00:50:07,193 [ scc.merge] INFO
2025-03-22 00:50:07,193 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-22 00:50:07,193 [ scc.merge] INFO
2025-03-22 00:50:07,193 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-22 00:50:07,193 [ scc.merge] INFO Excluded PRs:
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-22 00:50:07,193 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,193 [ scc.merge] INFO
2025-03-22 00:50:07,193 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-22 00:50:07,193 [ scc.merge] INFO
2025-03-22 00:50:07,193 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-22 00:50:07,193 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,193 [ scc.merge] INFO
2025-03-22 00:50:07,193 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-22 00:50:07,193 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-22 00:50:07,193 [ scc.merge] INFO
2025-03-22 00:50:07,193 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-22 00:50:07,193 [ scc.merge] INFO Excluded PRs:
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-22 00:50:07,194 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,194 [ scc.merge] INFO
2025-03-22 00:50:07,194 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-22 00:50:07,194 [ scc.merge] INFO
2025-03-22 00:50:07,194 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-22 00:50:07,194 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,194 [ scc.merge] INFO
2025-03-22 00:50:07,194 [ scc.merge] INFO
2025-03-22 00:50:07,194 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-22 00:50:07,194 [ scc.merge] INFO Excluded PRs:
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-22 00:50:07,194 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,194 [ scc.merge] INFO
2025-03-22 00:50:07,194 [ scc.merge] INFO
2025-03-22 00:50:07,194 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-22 00:50:07,194 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,194 [ scc.merge] INFO
2025-03-22 00:50:07,194 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-22 00:50:07,194 [ scc.merge] INFO
2025-03-22 00:50:07,194 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-22 00:50:07,194 [ scc.merge] INFO Excluded PRs:
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-22 00:50:07,194 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-22 00:50:07,194 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,195 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-22 00:50:07,195 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-22 00:50:07,195 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,195 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-22 00:50:07,195 [ scc.merge] INFO Excluded PRs:
2025-03-22 00:50:07,195 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-22 00:50:07,195 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-22 00:50:07,195 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-22 00:50:07,195 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-22 00:50:07,195 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-22 00:50:07,195 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO
2025-03-22 00:50:07,195 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-22 00:50:07,195 [ scc.merge] INFO Already up to date.
2025-03-22 00:50:07,196 [ scc.merge] INFO
2025-03-22 00:50:07,196 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-22 00:50:07,196 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-22 00:50:07,196 [ scc.merge] INFO
2025-03-22 00:50:07,196 [ scc.merge] INFO Repository: ome/scripts
2025-03-22 00:50:07,196 [ scc.merge] INFO Excluded PRs:
2025-03-22 00:50:07,196 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-22 00:50:07,196 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-22 00:50:07,196 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-03-22 00:50:07,196 [ scc.merge] INFO Previously merged:
2025-03-22 00:50:07,196 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-03-22 00:50:07,196 [ scc.merge] INFO
2025-03-22 00:50:07,196 [ scc.merge] INFO Merged PRs:
2025-03-22 00:50:07,196 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-22 00:50:07,196 [ scc.merge] INFO
2025-03-22 00:50:07,196 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-22 00:50:07,196 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-22 00:50:07,196 [ scc.merge] INFO
2025-03-22 00:50:07,196 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-22 00:50:07,196 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-22 00:50:07,202 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-22 00:50:07,207 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-22 00:50:07,212 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-22 00:50:07,217 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-22 00:50:07,222 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-22 00:50:07,227 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-22 00:50:07,232 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-22 00:50:07,237 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-22 00:50:07,243 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-22 00:50:07,248 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-22 00:50:07,253 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-22 00:50:07,258 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-22 00:50:07,263 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-22 00:50:07,268 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-22 00:50:07,273 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-22 00:50:07,278 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-22 00:50:07,283 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-22 00:50:07,288 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-22 00:50:07,293 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-22 00:50:07,298 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-22 00:50:07,303 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-22 00:50:07,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-22 00:50:07,308 [ scc.git] DEBUG Calling 'git remote'
2025-03-22 00:50:07,313 [ 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.2-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD e2cb369] 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 4f2b031] 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-22 00:50:54,329 [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-22 00:51:03,739 [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-22 00:51:06,278 [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-22 00:51:11,075 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-22 00:51:50,748 [ 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/316c2b55/images/svgs/logo.svg){kind=logo}
